X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcat.c;h=0024eb8d5e11262dd3061952043cf42a131765ed;hb=8d680b51148b9cbe7dd3afd37022f3390dd999ef;hp=cd5277819f223a2b25c0ece60ccf74dd21881633;hpb=fe7cd642b0b732f5d41403c2f6983ad676b69dd9;p=oweals%2Fbusybox.git

diff --git a/coreutils/cat.c b/coreutils/cat.c
index cd5277819..0024eb8d5 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -17,20 +17,16 @@
 
 int bb_cat(char **argv)
 {
-	static const char *const argv_dash[] = { "-", NULL };
-
 	int fd;
 	int retval = EXIT_SUCCESS;
 
 	if (!*argv)
-		argv = (char**) &argv_dash;
+		argv = (char**) &bb_argv_dash;
 
 	do {
-		fd = STDIN_FILENO;
-		if (!LONE_DASH(*argv))
-			fd = open_or_warn(*argv, O_RDONLY);
+		fd = open_or_warn_stdin(*argv);
 		if (fd >= 0) {
-			/* This is not an xfunc - never exits */
+			/* This is not a xfunc - never exits */
 			off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
 			if (fd != STDIN_FILENO)
 				close(fd);
@@ -43,8 +39,8 @@ int bb_cat(char **argv)
 	return retval;
 }
 
-int cat_main(int argc, char **argv);
-int cat_main(int argc, char **argv)
+int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cat_main(int argc UNUSED_PARAM, char **argv)
 {
 	getopt32(argv, "u");
 	argv += optind;