[PATCH] Add -z option to show-files

This adds NUL-terminated output (-z) to show-files.  This is necessary
for merge-trees script to deal with filenames with embedded newlines.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/show-files.c b/show-files.c
index 7d3797f27e7d022d4504e6847b0deea22bac8063..c9027cc4167530fab7053b424c38068bf60bb69b 100644 (file)
--- a/show-files.c
+++ b/show-files.c
@@ -14,6 +14,7 @@ static int show_deleted = 0;
 static int show_cached = 0;
 static int show_others = 0;
 static int show_ignored = 0;
 static int show_cached = 0;
 static int show_others = 0;
 static int show_ignored = 0;

+static int line_terminator = '\n';

 
 static const char **dir;
 static int nr_dir;
 
 static const char **dir;
 static int nr_dir;


@@ -105,12 +106,12 @@ static void show_files(void)
        }
        if (show_others) {
                for (i = 0; i < nr_dir; i++)
        }
        if (show_others) {
                for (i = 0; i < nr_dir; i++)

-                       printf("%s\n", dir[i]);
+                       printf("%s%c", dir[i], line_terminator);

        }
        if (show_cached) {
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];
        }
        if (show_cached) {
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];

-                       printf("%s\n", ce->name);
+                       printf("%s%c", ce->name, line_terminator);

                }
        }
        if (show_deleted) {
                }
        }
        if (show_deleted) {


@@ -119,7 +120,7 @@ static void show_files(void)
                        struct stat st;
                        if (!stat(ce->name, &st))
                                continue;
                        struct stat st;
                        if (!stat(ce->name, &st))
                                continue;

-                       printf("%s\n", ce->name);
+                       printf("%s%c", ce->name, line_terminator);

                }
        }
        if (show_ignored) {
                }
        }
        if (show_ignored) {


@@ -134,6 +135,11 @@ int main(int argc, char **argv)
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];
 
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];
 

+               if (!strcmp(arg, "-z")) {
+                       line_terminator = 0;
+                       continue;
+               }
+

                if (!strcmp(arg, "--cached")) {
                        show_cached = 1;
                        continue;
                if (!strcmp(arg, "--cached")) {
                        show_cached = 1;
                        continue;