X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcat.c;h=aa8528d6ae53849930b4f7488d75cff5dadf53ef;hb=a6ce670a87ee77ccb9337ed6d87442134e1a48ed;hp=6a9204fe7bfe93bbfa7c898eaba3453a616a182f;hpb=cc8a66b113dbdf04082b6f7c9b0b58984d433028;p=oweals%2Fbusybox.git

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 6a9204fe7..aa8528d6a 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -2,7 +2,7 @@
 /*
  * Mini Cat implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -21,26 +21,27 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "busybox.h"
 
 extern int cat_main(int argc, char **argv)
 {
+	int status = EXIT_SUCCESS;
+
 	if (argc == 1) {
 		print_file(stdin);
-		exit(TRUE);
+		return status;
 	}
 
-	if (**(argv + 1) == '-')
-		usage(cat_usage);
-
 	while (--argc > 0) {
-		if (print_file_by_name(*++argv) == FALSE) {
-			perror(*argv);
-			exit(FALSE);
+		if(!(strcmp(*++argv, "-"))) {
+			print_file(stdin);
+		} else if (print_file_by_name(*argv) == FALSE) {
+			status = EXIT_FAILURE;
 		}
 	}
-	return(TRUE);
+	return status;
 }
 
 /*