summaryrefslogtreecommitdiff
path: root/coreutils/cat.c
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-21 13:24:58 +0000
committerDenis Vlasenko2006-12-21 13:24:58 +0000
commite865e81d34efb96417c549e9c326fb1c46dafbc7 (patch)
tree33ba50881b34dcb0732763d0359ca9a50bdef99a /coreutils/cat.c
parentbf66fbc8e2380717c1fab860cfc60c78582839dd (diff)
downloadbusybox-e865e81d34efb96417c549e9c326fb1c46dafbc7.zip
busybox-e865e81d34efb96417c549e9c326fb1c46dafbc7.tar.gz
less: stop dying on bad regexps, quietly pipe data w/o
user interaction if stdout is not a tty. size optimizations
Diffstat (limited to 'coreutils/cat.c')
-rw-r--r--coreutils/cat.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c
index db4d33d..d828b86 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -14,9 +14,12 @@
int bb_cat(char **argv)
{
+ static char *const argv_dash[] = { "-", NULL };
FILE *f;
int retval = EXIT_SUCCESS;
+ if (!*argv) argv = (char**) &argv_dash;
+
do {
f = fopen_or_warn_stdin(*argv);
if (f) {
@@ -35,11 +38,6 @@ int bb_cat(char **argv)
int cat_main(int argc, char **argv)
{
getopt32(argc, argv, "u");
-
argv += optind;
- if (!*argv) {
- *--argv = "-";
- }
-
return bb_cat(argv);
}