aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen <andersen@codepoet.org>2000-05-13 05:36:13 +0000
committerErik Andersen <andersen@codepoet.org>2000-05-13 05:36:13 +0000
commit73c8c9cf9a61286a109a8785b8e4782828d6fe99 (patch)
tree9a06b75f8564759dcf64cbc492026012c8986342
parent23dea9b712daf0f29bdbb0e6adce1d697f53cefc (diff)
downloadbusybox-w32-73c8c9cf9a61286a109a8785b8e4782828d6fe99.tar.gz
busybox-w32-73c8c9cf9a61286a109a8785b8e4782828d6fe99.tar.bz2
busybox-w32-73c8c9cf9a61286a109a8785b8e4782828d6fe99.zip
More doc updates
-Erik
Diffstat
-rw-r--r--Changelog16
-rw-r--r--busybox.def.h2
-rw-r--r--coreutils/id.c1
-rw-r--r--docs/busybox.pod61
-rw-r--r--id.c1
5 files changed, 62 insertions, 19 deletions
diff --git a/Changelog b/Changelog
index 54ec8d62e..db2dc4494 100644
--- a/Changelog
+++ b/Changelog
@@ -1,11 +1,13 @@
10.44 10.44
2 * added the -v option (inverted search) to grep, 2 * Added BB_FEATURE_TRIVIAL_HELP which compiles out most all of the
3 updated docs/busybox.pod accordingly. -beppu 3 help messages (i.e --help). Saves 17k over a full compile.
4 * Added mktemp, contributed by Daniel Jacobowitz <dan@debian.org> 4 * Added mktemp, contributed by Daniel Jacobowitz <dan@debian.org>
5 * Added setkeycodes, for those that have wierd keyboard buttons. 5 * Added setkeycodes, for those that have wierd keyboard buttons.
6 * Added cut and tr from minix, since due to the license change, 6 * Added cut and tr from minix, since due to the license change,
7 we can now use minix code. Minix tr saves 4k. 7 we can now use minix code. Minix tr saves 4k.
8 * Fix for ping warnings from Sascha Ziemann <szi@aibon.ping.de> 8 * Added the -v option (inverted search) to grep,
9 updated docs/busybox.pod accordingly. -beppu
10 * Fixed ping warnings -- fix from Sascha Ziemann <szi@aibon.ping.de>
9 * Fixed update segfault 11 * Fixed update segfault
10 * Fixed mknod -- minor number was always 0 12 * Fixed mknod -- minor number was always 0
11 * Fixed tar option parsing. In an attempt to accomodate the whiners 13 * Fixed tar option parsing. In an attempt to accomodate the whiners
@@ -13,8 +15,7 @@
13 I broke creation of tarballs. I reverted the change (so tar needs 15 I broke creation of tarballs. I reverted the change (so tar needs
14 the "-" for all options). 16 the "-" for all options).
15 * Several contributions from Randolph Chung <tausq@debian.org>. 17 * Several contributions from Randolph Chung <tausq@debian.org>.
16 * cp/mv now accepts (and ignores) the -f flag, since it always 18 * cp/mv now accepts the -f flag
17 does force anyway
18 * tail can now accept -<num> commands (e.g. -10) for better 19 * tail can now accept -<num> commands (e.g. -10) for better
19 compatibility with the standard tail command 20 compatibility with the standard tail command
20 * added a simple id implementation; doesn't support sup. groups yet 21 * added a simple id implementation; doesn't support sup. groups yet
@@ -25,12 +26,11 @@
25 * Changed 'umount -l' to mean "Do not free loop device". 26 * Changed 'umount -l' to mean "Do not free loop device".
26 * Fixed basename to support stripping of suffixes. Patch thanks 27 * Fixed basename to support stripping of suffixes. Patch thanks
27 to xiong jianxin <jxiong@uiuc.edu> 28 to xiong jianxin <jxiong@uiuc.edu>
28 * More doc updates
29 * cp -fa now works as expected for symlinks (it didn't before) 29 * cp -fa now works as expected for symlinks (it didn't before)
30 * zcat now works (wasn't working since option parsing was broken) 30 * zcat now works (wasn't working since option parsing was broken)
31 * Renamed "mnc" to the more correct "nc". 31 * Renamed "mnc" to the more correct "nc".
32 * Added BB_FEATURE_TRIVIAL_HELP which compiles out most all of the 32 * Makefile intelligence updates
33 help messages (i.e --help). Saves 17k over a full compile. 33 * More doc updates
34 34
35 35
36 -Erik 36 -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 @@
135// 135//
136// This compiles out everything but the most 136// This compiles out everything but the most
137// trivial --help usage information (i.e. reduces binary size) 137// trivial --help usage information (i.e. reduces binary size)
138#define BB_FEATURE_TRIVIAL_HELP 138//#define BB_FEATURE_TRIVIAL_HELP
139// 139//
140// Use termios to manipulate the screen ('more' is prettier with this on) 140// Use termios to manipulate the screen ('more' is prettier with this on)
141//#define BB_FEATURE_USE_TERMIOS 141//#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[] =
32 "id [OPTIONS]... [USERNAME]\n" 32 "id [OPTIONS]... [USERNAME]\n"
33#ifndef BB_FEATURE_TRIVIAL_HELP 33#ifndef BB_FEATURE_TRIVIAL_HELP
34 "\nPrint information for USERNAME or the current user\n\n" 34 "\nPrint information for USERNAME or the current user\n\n"
35 "Options:\n"
35 "\t-g\tprints only the group ID\n" 36 "\t-g\tprints only the group ID\n"
36 "\t-u\tprints only the user ID\n" 37 "\t-u\tprints only the user ID\n"
37 "\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n" 38 "\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.
55 55
56Currently defined functions include: 56Currently defined functions include:
57 57
58basename, cat, chgrp, chmod, chown, chroot, clear, chvt, cp, date, dd, df, 58basename, cat, chgrp, chmod, chown, chroot, clear, chvt, cp, cut, date, dd, df,
59dirname, dmesg, du, dutmp, echo, false, fbset, fdflush, find, free, 59dirname, dmesg, du, dutmp, echo, false, fbset, fdflush, find, free,
60freeramdisk, deallocvt, fsck.minix, grep, gunzip, gzip, halt, head, hostid, 60freeramdisk, deallocvt, fsck.minix, grep, gunzip, gzip, halt, head, hostid,
61hostname, init, kill, killall, length, ln, loadacm, loadfont, loadkmap, logger, 61hostname, id, init, kill, killall, length, ln, loadacm, loadfont, loadkmap,
62logname, ls, lsmod, makedevs, math, mkdir, mkfifo, mkfs.minix, mknod, mkswap, 62logger, logname, ls, lsmod, makedevs, math, mkdir, mkfifo, mkfs.minix, mknod,
63mktemp, mnc, more, mount, mt, mv, nslookup, ping, poweroff, printf, ps, pwd, 63mkswap, mktemp, nc, more, mount, mt, mv, nslookup, ping, poweroff, printf, ps,
64reboot, rm, rmdir, rmmod, sed, setkeycodes, sh, sfdisk, sleep, sort, sync, 64pwd, reboot, rm, rmdir, rmmod, sed, setkeycodes, sh, sfdisk, sleep, sort, sync,
65syslogd, swapon, swapoff, tail, tar, test, tee, touch, tr, true, tty, umount, 65syslogd, swapon, swapoff, tail, tar, test, tee, touch, tr, true, tty, umount,
66uname, uniq, update, uptime, usleep, wc, whoami, yes, zcat, [ 66uname, uniq, update, uptime, usleep, wc, whoami, yes, zcat, [
67 67
@@ -251,6 +251,30 @@ Options:
251 251
252------------------------------- 252-------------------------------
253 253
254=item cut
255
256Usage: cut [OPTION]... [FILE]...
257
258Prints selected fields from each input FILE to standard output.
259
260Options:
261
262 -b LIST Output only bytes from LIST
263 -c LIST Output only characters from LIST
264 -d DELIM Use DELIM instead of tab as the field delimiter
265 -f N Print only these fields
266 -n Ignored
267
268Example:
269
270 $ echo "Hello world" | cut -f 1 -d ' '
271 Hello
272 $ echo "Hello world" | cut -f 2 -d ' '
273 world
274
275
276-------------------------------
277
254=item date 278=item date
255 279
256Usage: date [OPTION]... [+FORMAT] 280Usage: date [OPTION]... [+FORMAT]
@@ -665,6 +689,23 @@ Example:
665 689
666------------------------------- 690-------------------------------
667 691
692=item id
693
694Print information for USERNAME or the current user
695
696Options:
697
698 -g prints only the group ID
699 -u prints only the user ID
700 -r prints the real user ID instead of the effective ID (with -ug)
701
702Example:
703
704 $ id
705 uid=1000(andersen) gid=1000(andersen)
706
707-------------------------------
708
668=item init 709=item init
669 710
670Usage: init 711Usage: init
@@ -1076,15 +1117,15 @@ Example:
1076 1117
1077------------------------------- 1118-------------------------------
1078 1119
1079=item mnc 1120=item nc
1080 1121
1081Usage: mnc [IP] [port] 1122Usage: nc [IP] [port]
1082 1123
1083mini-netcat opens a pipe to IP:port 1124Netcat opens a pipe to IP:port
1084 1125
1085Example: 1126Example:
1086 1127
1087 $ mnc foobar.somedomain.com 25 1128 $ nc foobar.somedomain.com 25
1088 220 foobar ESMTP Exim 3.12 #1 Sat, 15 Apr 2000 00:03:02 -0600 1129 220 foobar ESMTP Exim 3.12 #1 Sat, 15 Apr 2000 00:03:02 -0600
1089 help 1130 help
1090 214-Commands supported: 1131 214-Commands supported:
@@ -1881,4 +1922,4 @@ Enrique Zanardi <ezanardi@ull.es>
1881 1922
1882=cut 1923=cut
1883 1924
1884# $Id: busybox.pod,v 1.30 2000/05/12 19:41:47 erik Exp $ 1925# $Id: busybox.pod,v 1.31 2000/05/13 05:36:13 erik Exp $
diff --git a/id.c b/id.c
index 542f86566..16cf083e1 100644
--- a/id.c
+++ b/id.c
@@ -32,6 +32,7 @@ static const char id_usage[] =
32 "id [OPTIONS]... [USERNAME]\n" 32 "id [OPTIONS]... [USERNAME]\n"
33#ifndef BB_FEATURE_TRIVIAL_HELP 33#ifndef BB_FEATURE_TRIVIAL_HELP
34 "\nPrint information for USERNAME or the current user\n\n" 34 "\nPrint information for USERNAME or the current user\n\n"
35 "Options:\n"
35 "\t-g\tprints only the group ID\n" 36 "\t-g\tprints only the group ID\n"
36 "\t-u\tprints only the user ID\n" 37 "\t-u\tprints only the user ID\n"
37 "\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n" 38 "\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 05:59:39 +0000