summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-05-31 19:36:04 +0000
committerRob Landley <rob@landley.net>2006-05-31 19:36:04 +0000
commit8abbee474c4eff45bdc2cacb59047f466e1d6ae1 (patch)
tree35f25489cf48f7a80e3545472a84d534ef9915a3 /include
parent9a5686b605a4dfe2f24660940e309bb444fe5f3f (diff)
downloadbusybox-w32-8abbee474c4eff45bdc2cacb59047f466e1d6ae1.tar.gz
busybox-w32-8abbee474c4eff45bdc2cacb59047f466e1d6ae1.tar.bz2
busybox-w32-8abbee474c4eff45bdc2cacb59047f466e1d6ae1.zip
Add catv (separate applet instead of cat -v). Also cleanup cat.c comments,
the following of which (from cat.c) belongs in svn history instead of the source code: /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) * * This is a new implementation of 'cat' which aims to be SUSv3 compliant. * * Changes from the previous implementation include: * 1) Multiple '-' args are accepted as required by SUSv3. The previous * implementation would close stdin and segfault on a subsequent '-'. * 2) The '-u' options is required by SUSv3. Note that the specified * behavior for '-u' is done by default, so all we need do is accept * the option. */
Diffstat (limited to 'include')
-rw-r--r--include/applets.h1
-rw-r--r--include/usage.h7
2 files changed, 8 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h
index bbff772f0..ab2a6c5bf 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -63,6 +63,7 @@ APPLET_NOUSAGE(busybox, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE)
63USE_BUNZIP2(APPLET(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 63USE_BUNZIP2(APPLET(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
64USE_CAL(APPLET(cal, cal, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 64USE_CAL(APPLET(cal, cal, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
65USE_CAT(APPLET(cat, cat, _BB_DIR_BIN, _BB_SUID_NEVER)) 65USE_CAT(APPLET(cat, cat, _BB_DIR_BIN, _BB_SUID_NEVER))
66USE_CATV(APPLET(catv, catv, _BB_DIR_BIN, _BB_SUID_NEVER))
66USE_CHATTR(APPLET(chattr, chattr, _BB_DIR_BIN, _BB_SUID_NEVER)) 67USE_CHATTR(APPLET(chattr, chattr, _BB_DIR_BIN, _BB_SUID_NEVER))
67USE_CHGRP(APPLET(chgrp, chgrp, _BB_DIR_BIN, _BB_SUID_NEVER)) 68USE_CHGRP(APPLET(chgrp, chgrp, _BB_DIR_BIN, _BB_SUID_NEVER))
68USE_CHMOD(APPLET(chmod, chmod, _BB_DIR_BIN, _BB_SUID_NEVER)) 69USE_CHMOD(APPLET(chmod, chmod, _BB_DIR_BIN, _BB_SUID_NEVER))
diff --git a/include/usage.h b/include/usage.h
index 3f894c5b7..1d143e61e 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -136,6 +136,13 @@
136 "$ cat /proc/uptime\n" \ 136 "$ cat /proc/uptime\n" \
137 "110716.72 17.67" 137 "110716.72 17.67"
138 138
139#define catv_trivial_usage \
140 "[-etv] [FILE]..."
141#define catv_full_usage \
142 "Display nonprinting characters as ^x or M-x.\n\n"\
143 "\t-e\tEnd each line with $\n" \
144 "\t-t\tShow tabs as ^I\n" \
145 "\t-v\tDon't use ^x or M-x escapes."
139#define chattr_trivial_usage \ 146#define chattr_trivial_usage \
140 "[-R] [-+=AacDdijsStTu] [-v version] files..." 147 "[-R] [-+=AacDdijsStTu] [-v version] files..."
141#define chattr_full_usage \ 148#define chattr_full_usage \