aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-08-21 21:18:52 +0000
committerEric Andersen <andersen@codepoet.org>2000-08-21 21:18:52 +0000
commitfa405d0cb284011a4f0e47937a0aa34e6ccfff0d (patch)
tree31a61d59056c80e61b153a69799aa5d007195af4
parent202995c61226d4ac4d67956007dd5b4ea3cebe23 (diff)
downloadbusybox-w32-fa405d0cb284011a4f0e47937a0aa34e6ccfff0d.tar.gz
busybox-w32-fa405d0cb284011a4f0e47937a0aa34e6ccfff0d.tar.bz2
busybox-w32-fa405d0cb284011a4f0e47937a0aa34e6ccfff0d.zip
Add in the "reset" command.
-Erik
-rw-r--r--applets/busybox.c3
-rw-r--r--applets/usage.c10
-rw-r--r--busybox.c3
-rw-r--r--busybox.def.h1
-rw-r--r--docs/busybox.pod12
-rw-r--r--docs/busybox.sgml14
-rw-r--r--internal.h2
-rw-r--r--usage.c10
8 files changed, 52 insertions, 3 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index 25bfe438d..5d13a7b98 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -229,6 +229,9 @@ const struct BB_applet applets[] = {
229#ifdef BB_RENICE 229#ifdef BB_RENICE
230 {"renice", renice_main, _BB_DIR_USR_BIN}, 230 {"renice", renice_main, _BB_DIR_USR_BIN},
231#endif 231#endif
232#ifdef BB_RESET
233 {"reset", reset_main, _BB_DIR_USR_BIN, reset_usage},
234#endif
232#ifdef BB_RM 235#ifdef BB_RM
233 {"rm", rm_main, _BB_DIR_BIN, rm_usage}, 236 {"rm", rm_main, _BB_DIR_BIN, rm_usage},
234#endif 237#endif
diff --git a/applets/usage.c b/applets/usage.c
index 5037c94d8..eaa77cc84 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -876,6 +876,16 @@ const char renice_usage[] =
876 ; 876 ;
877#endif 877#endif
878 878
879
880#if defined BB_RESET
881const char reset_usage[] =
882 "reset\n"
883#ifndef BB_FEATURE_TRIVIAL_HELP
884 "\nResets the screen.\n"
885#endif
886 ;
887#endif
888
879#if defined BB_RM 889#if defined BB_RM
880const char rm_usage[] = 890const char rm_usage[] =
881 "rm [OPTION]... FILE...\n" 891 "rm [OPTION]... FILE...\n"
diff --git a/busybox.c b/busybox.c
index 25bfe438d..5d13a7b98 100644
--- a/busybox.c
+++ b/busybox.c
@@ -229,6 +229,9 @@ const struct BB_applet applets[] = {
229#ifdef BB_RENICE 229#ifdef BB_RENICE
230 {"renice", renice_main, _BB_DIR_USR_BIN}, 230 {"renice", renice_main, _BB_DIR_USR_BIN},
231#endif 231#endif
232#ifdef BB_RESET
233 {"reset", reset_main, _BB_DIR_USR_BIN, reset_usage},
234#endif
232#ifdef BB_RM 235#ifdef BB_RM
233 {"rm", rm_main, _BB_DIR_BIN, rm_usage}, 236 {"rm", rm_main, _BB_DIR_BIN, rm_usage},
234#endif 237#endif
diff --git a/busybox.def.h b/busybox.def.h
index 78e826d9b..91ab0b3c9 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -74,6 +74,7 @@
74#define BB_PWD 74#define BB_PWD
75#define BB_REBOOT 75#define BB_REBOOT
76#define BB_RENICE 76#define BB_RENICE
77#define BB_RESET
77#define BB_RM 78#define BB_RM
78#define BB_RMDIR 79#define BB_RMDIR
79#define BB_RMMOD 80#define BB_RMMOD
diff --git a/docs/busybox.pod b/docs/busybox.pod
index cdbe3e0f0..916ccb6f0 100644
--- a/docs/busybox.pod
+++ b/docs/busybox.pod
@@ -61,7 +61,7 @@ fdflush, find, free, freeramdisk, fsck.minix, grep, gunzip, gzip, halt,
61head, hostid, hostname, id, init, insmod, kill, killall, length, ln, 61head, hostid, hostname, id, init, insmod, kill, killall, length, ln,
62loadacm, loadfont, loadkmap, logger, logname, ls, lsmod, makedevs, mkdir, 62loadacm, loadfont, loadkmap, logger, logname, ls, lsmod, makedevs, mkdir,
63mkfifo, mkfs.minix, mknod, mkswap, mktemp, more, mount, mt, mv, nc, 63mkfifo, mkfs.minix, mknod, mkswap, mktemp, more, mount, mt, mv, nc,
64nslookup, ping, poweroff, printf, ps, pwd, reboot, renice, rm, rmdir, rmmod, sed, 64nslookup, ping, poweroff, printf, ps, pwd, reboot, renice, reset, rm, rmdir, rmmod, sed,
65setkeycodes, sh, sleep, sort, swapoff, swapon, sync, syslogd, tail, 65setkeycodes, sh, sleep, sort, swapoff, swapon, sync, syslogd, tail,
66tar, tee, telnet, test, touch, tr, true, tty, umount, uname, uniq, update, 66tar, tee, telnet, test, touch, tr, true, tty, umount, uname, uniq, update,
67uptime, usleep, uudecode, uuencode, wc, which, whoami, yes, zcat, [ 67uptime, usleep, uudecode, uuencode, wc, which, whoami, yes, zcat, [
@@ -1396,6 +1396,14 @@ from 20 (the process runs only when nothing else is running) to 0
1396 1396
1397------------------------------- 1397-------------------------------
1398 1398
1399=item reset
1400
1401Usage: reset
1402
1403Resets the screen.
1404
1405-------------------------------
1406
1399=item rm 1407=item rm
1400 1408
1401Usage: rm [OPTION]... FILE... 1409Usage: rm [OPTION]... FILE...
@@ -2044,4 +2052,4 @@ Enrique Zanardi <ezanardi@ull.es>
2044 2052
2045=cut 2053=cut
2046 2054
2047# $Id: busybox.pod,v 1.60 2000/08/02 18:48:25 andersen Exp $ 2055# $Id: busybox.pod,v 1.61 2000/08/21 21:18:52 andersen Exp $
diff --git a/docs/busybox.sgml b/docs/busybox.sgml
index 560bd61f6..864dbe0ac 100644
--- a/docs/busybox.sgml
+++ b/docs/busybox.sgml
@@ -140,7 +140,7 @@
140 loadacm, loadfont, loadkmap, logger, logname, ls, lsmod, 140 loadacm, loadfont, loadkmap, logger, logname, ls, lsmod,
141 makedevs, mkdir, mkfifo, mkfs.minix, mknod, mkswap, mktemp, 141 makedevs, mkdir, mkfifo, mkfs.minix, mknod, mkswap, mktemp,
142 more, mount, mt, mv, nc, nslookup, ping, poweroff, printf, ps, 142 more, mount, mt, mv, nc, nslookup, ping, poweroff, printf, ps,
143 pwd, reboot, renice, rm, rmdir, rmmod, sed, setkeycodes, sh, sleep, 143 pwd, reboot, renice, reset, rm, rmdir, rmmod, sed, setkeycodes, sh, sleep,
144 sort, swapoff, swapon, sync, syslogd, tail, tar, tee, telnet, 144 sort, swapoff, swapon, sync, syslogd, tail, tar, tee, telnet,
145 test, touch, tr, true, tty, umount, uname, uniq, update, 145 test, touch, tr, true, tty, umount, uname, uniq, update,
146 uptime, usleep, uudecode, uuencode, wc, which, whoami, yes, 146 uptime, usleep, uudecode, uuencode, wc, which, whoami, yes,
@@ -2459,6 +2459,18 @@
2459 </para> 2459 </para>
2460 </sect1> 2460 </sect1>
2461 2461
2462 <sect1 id="reset">
2463 <title>reset</title>
2464
2465 <para>
2466 Usage: reset
2467 </para>
2468
2469 <para>
2470 Resets the screen.
2471 </para>
2472 </sect1>
2473
2462 <sect1 id="rm"> 2474 <sect1 id="rm">
2463 <title>rm</title> 2475 <title>rm</title>
2464 2476
diff --git a/internal.h b/internal.h
index 9de1c9372..a47274342 100644
--- a/internal.h
+++ b/internal.h
@@ -178,6 +178,7 @@ extern int ps_main(int argc, char** argv);
178extern int pwd_main(int argc, char** argv); 178extern int pwd_main(int argc, char** argv);
179extern int reboot_main(int argc, char** argv); 179extern int reboot_main(int argc, char** argv);
180extern int renice_main(int argc, char** argv); 180extern int renice_main(int argc, char** argv);
181extern int reset_main(int argc, char** argv);
181extern int rm_main(int argc, char** argv); 182extern int rm_main(int argc, char** argv);
182extern int rmdir_main(int argc, char **argv); 183extern int rmdir_main(int argc, char **argv);
183extern int rmmod_main(int argc, char** argv); 184extern int rmmod_main(int argc, char** argv);
@@ -283,6 +284,7 @@ extern const char ps_usage[];
283extern const char pwd_usage[]; 284extern const char pwd_usage[];
284extern const char reboot_usage[]; 285extern const char reboot_usage[];
285extern const char renice_usage[]; 286extern const char renice_usage[];
287extern const char reset_usage[];
286extern const char rm_usage[]; 288extern const char rm_usage[];
287extern const char rmdir_usage[]; 289extern const char rmdir_usage[];
288extern const char rmmod_usage[]; 290extern const char rmmod_usage[];
diff --git a/usage.c b/usage.c
index 5037c94d8..eaa77cc84 100644
--- a/usage.c
+++ b/usage.c
@@ -876,6 +876,16 @@ const char renice_usage[] =
876 ; 876 ;
877#endif 877#endif
878 878
879
880#if defined BB_RESET
881const char reset_usage[] =
882 "reset\n"
883#ifndef BB_FEATURE_TRIVIAL_HELP
884 "\nResets the screen.\n"
885#endif
886 ;
887#endif
888
879#if defined BB_RM 889#if defined BB_RM
880const char rm_usage[] = 890const char rm_usage[] =
881 "rm [OPTION]... FILE...\n" 891 "rm [OPTION]... FILE...\n"