diff options
| author | Rob Landley | 2006-05-31 19:36:04 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-05-31 19:36:04 +0000 |
| commit | 8abbee474c4eff45bdc2cacb59047f466e1d6ae1 (patch) | |
| tree | 35f25489cf48f7a80e3545472a84d534ef9915a3 /include | |
| parent | 9a5686b605a4dfe2f24660940e309bb444fe5f3f (diff) | |
| download | busybox-8abbee474c4eff45bdc2cacb59047f466e1d6ae1.zip busybox-8abbee474c4eff45bdc2cacb59047f466e1d6ae1.tar.gz | |
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.h | 1 | ||||
| -rw-r--r-- | include/usage.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index bbff772..ab2a6c5 100644 --- a/include/applets.h +++ b/include/applets.h @@ -63,6 +63,7 @@ APPLET_NOUSAGE(busybox, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE) USE_BUNZIP2(APPLET(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_CAL(APPLET(cal, cal, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_CAT(APPLET(cat, cat, _BB_DIR_BIN, _BB_SUID_NEVER)) +USE_CATV(APPLET(catv, catv, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_CHATTR(APPLET(chattr, chattr, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_CHGRP(APPLET(chgrp, chgrp, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_CHMOD(APPLET(chmod, chmod, _BB_DIR_BIN, _BB_SUID_NEVER)) diff --git a/include/usage.h b/include/usage.h index 3f894c5..1d143e6 100644 --- a/include/usage.h +++ b/include/usage.h @@ -136,6 +136,13 @@ "$ cat /proc/uptime\n" \ "110716.72 17.67" +#define catv_trivial_usage \ + "[-etv] [FILE]..." +#define catv_full_usage \ + "Display nonprinting characters as ^x or M-x.\n\n"\ + "\t-e\tEnd each line with $\n" \ + "\t-t\tShow tabs as ^I\n" \ + "\t-v\tDon't use ^x or M-x escapes." #define chattr_trivial_usage \ "[-R] [-+=AacDdijsStTu] [-v version] files..." #define chattr_full_usage \ |