X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cat.c;h=80044346048acdbd8c76030976f823c1feef5dce;hb=e714bce003a1b0e2c49e58fe14af86abc8b31f23;hp=da91d1db9dd63abd5b573505c0ce6149140e4650;hpb=887991c78a1e62beee123d58f6a47f93278f03c9;p=oweals%2Fbusybox.git

diff --git a/cat.c b/cat.c
index da91d1db9..800443460 100644
--- a/cat.c
+++ b/cat.c
@@ -1,8 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini Cat implementation for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.
- * Written by Erik Andersen <andersee@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,39 +25,49 @@
 #include <stdio.h>
 
 
-static void print_file( FILE *file) 
+static void print_file(FILE * file)
 {
-    int c;
-    while ((c = getc(file)) != EOF)
-	putc(c, stdout);
-    fclose(file);
-    fflush(stdout);
+	int c;
+
+	while ((c = getc(file)) != EOF)
+		putc(c, stdout);
+	fclose(file);
+	fflush(stdout);
 }
 
 extern int cat_main(int argc, char **argv)
 {
-    FILE *file;
-
-    if (argc==1) {
-	print_file( stdin);
-	exit( TRUE);
-    }
-
-    if ( **(argv+1) == '-' ) {
-	usage ("cat [file ...]\n");
-    }
-    argc--;
-    argv++;
-
-    while (argc-- > 0) {
-	file = fopen(*argv, "r");
-	if (file == NULL) {
-	    perror(*argv);
-	    exit(FALSE);
+	FILE *file;
+
+	if (argc == 1) {
+		print_file(stdin);
+		exit(TRUE);
+	}
+
+	if (**(argv + 1) == '-') {
+		usage("cat [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+				"\nConcatenates FILE(s) and prints them to the standard output.\n"
+#endif
+				);
 	}
-	print_file( file);
 	argc--;
-	argv++;
-    }
-    exit(TRUE);
+
+	while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv)) {
+		file = fopen(*argv, "r");
+		if (file == NULL) {
+			perror(*argv);
+			exit(FALSE);
+		}
+		print_file(file);
+	}
+	return(TRUE);
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/