aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2015-05-06 16:21:19 -0500
committerRob Landley <rob@landley.net>2015-05-06 16:21:19 -0500
commitef55374b9d5e6ea1325f2888fdbb0425e5e73d18 (patch)
treea2a955fd027d93dd85b3479d5749c17c1c2c86ac
parent8565668d785d25f6dfd2dd19cece502cedf178b6 (diff)
downloadtoybox-ef55374b9d5e6ea1325f2888fdbb0425e5e73d18.tar.gz
Re-enable catv command now that flag infrastructure is updated.
-rw-r--r--toys/posix/cat.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/toys/posix/cat.c b/toys/posix/cat.c
index 07de0746..01134a72 100644
--- a/toys/posix/cat.c
+++ b/toys/posix/cat.c
@@ -8,7 +8,7 @@
* http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz
USE_CAT(NEWTOY(cat, "u"USE_CAT_V("vte"), TOYFLAG_BIN))
-#USE_CATV(NEWTOY(catv, USE_CATV("vte"), TOYFLAG_USR|TOYFLAG_BIN))
+USE_CATV(NEWTOY(catv, USE_CATV("vte"), TOYFLAG_USR|TOYFLAG_BIN))
config CAT
bool "cat"
@@ -23,7 +23,7 @@ config CAT
config CAT_V
bool "cat -etv"
- default y
+ default n
depends on CAT
help
usage: cat [-evt]
@@ -32,15 +32,10 @@ config CAT_V
-t Show tabs as ^I
-v Display nonprinting characters as escape sequences. Use M-x for
high ascii characters (>127), and ^x for other nonprinting chars.
-*/
-
-/*
-todo:
config CATV
bool "catv"
default y
- depends on !CAT_V
help
usage: catv [-evt] [filename...]
@@ -53,6 +48,7 @@ config CATV
*/
#define FOR_cat
+#define FORCE_FLAGS
#include "toys.h"
static void do_cat(int fd, char *name)
@@ -63,7 +59,7 @@ static void do_cat(int fd, char *name)
len = read(fd, toybuf, size);
if (len < 0) toys.exitval = EXIT_FAILURE;
if (len < 1) break;
- if (CFG_CAT_V && (toys.optflags&~FLAG_u)) {
+ if ((CFG_CAT_V || CFG_CATV) && (toys.optflags&~FLAG_u)) {
for (i=0; i<len; i++) {
char c=toybuf[i];
@@ -96,14 +92,8 @@ void cat_main(void)
loopfiles(toys.optargs, do_cat);
}
-//todo:
-//void catv_main(void)
-//{
-// toys.optflags ^= FLAG_v;
-// loopfiles(toys.optargs, do_catv);
-//}
-
-// The common infrastructure is testing FLAG_h which is only defined in cat
-// context (not catv), but catv can't use cat's flag context if cat is disabled
-// and its flags are zero. Need to upgrade flag parsing infrastructure so
-// defining FORCE_FLAGS along with FOR_command doesn't zero unused flag macros.
+void catv_main(void)
+{
+ toys.optflags ^= FLAG_v;
+ loopfiles(toys.optargs, do_cat);
+}