diff options
| -rw-r--r-- | Changelog | 16 | ||||
| -rw-r--r-- | busybox.def.h | 2 | ||||
| -rw-r--r-- | coreutils/id.c | 1 | ||||
| -rw-r--r-- | docs/busybox.pod | 61 | ||||
| -rw-r--r-- | id.c | 1 |
5 files changed, 62 insertions, 19 deletions
@@ -1,11 +1,13 @@ 0.44 - * added the -v option (inverted search) to grep, - updated docs/busybox.pod accordingly. -beppu + * Added BB_FEATURE_TRIVIAL_HELP which compiles out most all of the + help messages (i.e --help). Saves 17k over a full compile. * Added mktemp, contributed by Daniel Jacobowitz <dan@debian.org> * Added setkeycodes, for those that have wierd keyboard buttons. * Added cut and tr from minix, since due to the license change, we can now use minix code. Minix tr saves 4k. - * Fix for ping warnings from Sascha Ziemann <szi@aibon.ping.de> + * Added the -v option (inverted search) to grep, + updated docs/busybox.pod accordingly. -beppu + * Fixed ping warnings -- fix from Sascha Ziemann <szi@aibon.ping.de> * Fixed update segfault * Fixed mknod -- minor number was always 0 * Fixed tar option parsing. In an attempt to accomodate the whiners @@ -13,8 +15,7 @@ I broke creation of tarballs. I reverted the change (so tar needs the "-" for all options). * Several contributions from Randolph Chung <tausq@debian.org>. - * cp/mv now accepts (and ignores) the -f flag, since it always - does force anyway + * cp/mv now accepts the -f flag * tail can now accept -<num> commands (e.g. -10) for better compatibility with the standard tail command * added a simple id implementation; doesn't support sup. groups yet @@ -25,12 +26,11 @@ * Changed 'umount -l' to mean "Do not free loop device". * Fixed basename to support stripping of suffixes. Patch thanks to xiong jianxin <jxiong@uiuc.edu> - * More doc updates * cp -fa now works as expected for symlinks (it didn't before) * zcat now works (wasn't working since option parsing was broken) * Renamed "mnc" to the more correct "nc". - * Added BB_FEATURE_TRIVIAL_HELP which compiles out most all of the - help messages (i.e --help). Saves 17k over a full compile. + * Makefile intelligence updates + * More doc updates -Erik diff --git a/busybox.def.h b/busybox.def.h index 744db85e8..5652b4518 100644 --- a/busybox.def.h +++ b/busybox.def.h @@ -135,7 +135,7 @@ // // This compiles out everything but the most // trivial --help usage information (i.e. reduces binary size) -#define BB_FEATURE_TRIVIAL_HELP +//#define BB_FEATURE_TRIVIAL_HELP // // Use termios to manipulate the screen ('more' is prettier with this on) //#define BB_FEATURE_USE_TERMIOS diff --git a/coreutils/id.c b/coreutils/id.c index 542f86566..16cf083e1 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -32,6 +32,7 @@ static const char id_usage[] = "id [OPTIONS]... [USERNAME]\n" #ifndef BB_FEATURE_TRIVIAL_HELP "\nPrint information for USERNAME or the current user\n\n" + "Options:\n" "\t-g\tprints only the group ID\n" "\t-u\tprints only the user ID\n" "\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n" diff --git a/docs/busybox.pod b/docs/busybox.pod index 408bbfa72..d6b475c99 100644 --- a/docs/busybox.pod +++ b/docs/busybox.pod @@ -55,13 +55,13 @@ terse runtime description of their behavior. Currently defined functions include: -basename, cat, chgrp, chmod, chown, chroot, clear, chvt, cp, date, dd, df, +basename, cat, chgrp, chmod, chown, chroot, clear, chvt, cp, cut, date, dd, df, dirname, dmesg, du, dutmp, echo, false, fbset, fdflush, find, free, freeramdisk, deallocvt, fsck.minix, grep, gunzip, gzip, halt, head, hostid, -hostname, init, kill, killall, length, ln, loadacm, loadfont, loadkmap, logger, -logname, ls, lsmod, makedevs, math, mkdir, mkfifo, mkfs.minix, mknod, mkswap, -mktemp, mnc, more, mount, mt, mv, nslookup, ping, poweroff, printf, ps, pwd, -reboot, rm, rmdir, rmmod, sed, setkeycodes, sh, sfdisk, sleep, sort, sync, +hostname, id, init, kill, killall, length, ln, loadacm, loadfont, loadkmap, +logger, logname, ls, lsmod, makedevs, math, mkdir, mkfifo, mkfs.minix, mknod, +mkswap, mktemp, nc, more, mount, mt, mv, nslookup, ping, poweroff, printf, ps, +pwd, reboot, rm, rmdir, rmmod, sed, setkeycodes, sh, sfdisk, sleep, sort, sync, syslogd, swapon, swapoff, tail, tar, test, tee, touch, tr, true, tty, umount, uname, uniq, update, uptime, usleep, wc, whoami, yes, zcat, [ @@ -251,6 +251,30 @@ Options: ------------------------------- +=item cut + +Usage: cut [OPTION]... [FILE]... + +Prints selected fields from each input FILE to standard output. + +Options: + + -b LIST Output only bytes from LIST + -c LIST Output only characters from LIST + -d DELIM Use DELIM instead of tab as the field delimiter + -f N Print only these fields + -n Ignored + +Example: + + $ echo "Hello world" | cut -f 1 -d ' ' + Hello + $ echo "Hello world" | cut -f 2 -d ' ' + world + + +------------------------------- + =item date Usage: date [OPTION]... [+FORMAT] @@ -665,6 +689,23 @@ Example: ------------------------------- +=item id + +Print information for USERNAME or the current user + +Options: + + -g prints only the group ID + -u prints only the user ID + -r prints the real user ID instead of the effective ID (with -ug) + +Example: + + $ id + uid=1000(andersen) gid=1000(andersen) + +------------------------------- + =item init Usage: init @@ -1076,15 +1117,15 @@ Example: ------------------------------- -=item mnc +=item nc -Usage: mnc [IP] [port] +Usage: nc [IP] [port] -mini-netcat opens a pipe to IP:port +Netcat opens a pipe to IP:port Example: - $ mnc foobar.somedomain.com 25 + $ nc foobar.somedomain.com 25 220 foobar ESMTP Exim 3.12 #1 Sat, 15 Apr 2000 00:03:02 -0600 help 214-Commands supported: @@ -1881,4 +1922,4 @@ Enrique Zanardi <ezanardi@ull.es> =cut -# $Id: busybox.pod,v 1.30 2000/05/12 19:41:47 erik Exp $ +# $Id: busybox.pod,v 1.31 2000/05/13 05:36:13 erik Exp $ @@ -32,6 +32,7 @@ static const char id_usage[] = "id [OPTIONS]... [USERNAME]\n" #ifndef BB_FEATURE_TRIVIAL_HELP "\nPrint information for USERNAME or the current user\n\n" + "Options:\n" "\t-g\tprints only the group ID\n" "\t-u\tprints only the user ID\n" "\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n" |