X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=show-files.c;h=c9027cc4167530fab7053b424c38068bf60bb69b;hb=f5cabd13d814bb5c547a13af03bcc42122531141;hp=9f62e9700164e07bbbfdb7af7d1d3ba8f74ef7c7;hpb=31cedfb95e7dda1e43aead0107d32f90f85f2160;p=git.git

diff --git a/show-files.c b/show-files.c
index 9f62e970..c9027cc4 100644
--- 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 line_terminator = '\n';
 
 static const char **dir;
 static int nr_dir;
@@ -41,7 +42,7 @@ static void add_name(const char *pathname, int len)
  * handle them at all yet. Maybe that will change some day.
  *
  * Also, we currently ignore all names starting with a dot.
- * That likely will not change. 
+ * That likely will not change.
  */
 static void read_directory(const char *path, const char *base, int baselen)
 {
@@ -105,12 +106,12 @@ static void show_files(void)
 	}
 	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];
-			printf("%s\n", ce->name);
+			printf("%s%c", ce->name, line_terminator);
 		}
 	}
 	if (show_deleted) {
@@ -119,7 +120,7 @@ static void show_files(void)
 			struct stat st;
 			if (!stat(ce->name, &st))
 				continue;
-			printf("%s\n", ce->name);
+			printf("%s%c", ce->name, line_terminator);
 		}
 	}
 	if (show_ignored) {
@@ -134,6 +135,11 @@ int main(int argc, char **argv)
 	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;