Latest and greatest

cvpcs · Dec 8, 1999 · abc0f4f · abc0f4f
1 parent 2285f36
commit abc0f4f
Show file tree

Hide file tree

Showing 20 changed files with 2,188 additions and 75 deletions.
diff --git a/Changelog b/Changelog
@@ -1,9 +1,14 @@
-0.38 
+0.39 
 	* New Apps: ping and hostname contributed by Randolph Chung
-	    <tausq@debian.org>
+	    <tausq@debian.org>.  2 items off the TODO list!
+	* I wrote free (just calls "cat /proc/meminfo").
 	* on reboot, init called 'umount -a -n', which caused errors
 	    when BB_MTAB was not enabled.  Changed to 'umount -a',
 	    which does the right thing.
+	* init will now try to run /sbin/getty if it is present (for easy
+	    integration with the about-to-be-released tinylogin.)
+	* kill now behaves itself properly, added 'kill -l' to list signals
+	* Began to add tail, butit doesn't work yet.
 
 	-Erik Andrsen
 

diff --git a/TODO b/TODO
@@ -19,7 +19,6 @@ around to it some time. If you have any good ideas, please let me know.
 * rdate
 * hwclock
 * login/getty
-* free
 * killall
 * tee
 * stty

diff --git a/applets/busybox.c b/applets/busybox.c
@@ -27,6 +27,9 @@ static const struct Applet applets[] = {
 #ifdef BB_CLEAR			//usr/bin
     {"clear", clear_main},
 #endif
+#ifdef BB_CHVT			//usr/bin
+    {"chvt", chvt_main},
+#endif
 #ifdef BB_CP			//bin
     {"cp", cp_main},
 #endif
@@ -51,8 +54,8 @@ static const struct Applet applets[] = {
 #ifdef BB_FIND			//usr/bin
     {"find", find_main},
 #endif
-#ifdef BB_CHVT			//usr/bin
-    {"chvt", chvt_main},
+#ifdef BB_FREE			//usr/bin
+    {"free", free_main},
 #endif
 #ifdef BB_DEALLOCVT			//usr/bin
     {"deallocvt", deallocvt_main},
@@ -170,6 +173,9 @@ static const struct Applet applets[] = {
     {"swapon", swap_on_off_main},
     {"swapoff", swap_on_off_main},
 #endif
+#ifdef BB_TAIL			//usr/bin
+    {"tail", tail_main},
+#endif
 #ifdef BB_TAR			//bin
     {"tar", tar_main},
 #endif

diff --git a/busybox.c b/busybox.c
@@ -27,6 +27,9 @@ static const struct Applet applets[] = {
 #ifdef BB_CLEAR			//usr/bin
     {"clear", clear_main},
 #endif
+#ifdef BB_CHVT			//usr/bin
+    {"chvt", chvt_main},
+#endif
 #ifdef BB_CP			//bin
     {"cp", cp_main},
 #endif
@@ -51,8 +54,8 @@ static const struct Applet applets[] = {
 #ifdef BB_FIND			//usr/bin
     {"find", find_main},
 #endif
-#ifdef BB_CHVT			//usr/bin
-    {"chvt", chvt_main},
+#ifdef BB_FREE			//usr/bin
+    {"free", free_main},
 #endif
 #ifdef BB_DEALLOCVT			//usr/bin
     {"deallocvt", deallocvt_main},
@@ -170,6 +173,9 @@ static const struct Applet applets[] = {
     {"swapon", swap_on_off_main},
     {"swapoff", swap_on_off_main},
 #endif
+#ifdef BB_TAIL			//usr/bin
+    {"tail", tail_main},
+#endif
 #ifdef BB_TAR			//bin
     {"tar", tar_main},
 #endif

diff --git a/busybox.def.h b/busybox.def.h
@@ -16,6 +16,7 @@
 //#define BB_DUTMP
 //#define BB_FDFLUSH
 #define BB_FIND
+#define BB_FREE
 #define BB_FSCK_MINIX
 #define BB_MKFS_MINIX
 #define BB_CHVT
@@ -58,6 +59,7 @@
 #define BB_SYNC
 #define BB_SYSLOGD
 #define BB_TAR
+#define BB_TAIL
 #define BB_TOUCH
 #define BB_TRUE_FALSE
 #define BB_UMOUNT
@@ -76,7 +78,7 @@
 // pretty/useful).
 //
 //
-// enable a second console on VT2 in init
+// enable a second console on TTY2 in init
 #define BB_FEATURE_INIT_SECOND_CONSOLE
 // enable features that use the /proc filesystem
 #define BB_FEATURE_USE_PROCFS

diff --git a/cat.c b/cat.c
@@ -46,10 +46,9 @@ extern int cat_main(int argc, char **argv)
 	usage ("cat [file ...]\n");
     }
     argc--;
-    argv++;
 
-    while (argc-- > 0) {
-	file = fopen(*(argv++), "r");
+    while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) {
+	file = fopen(*argv, "r");
 	if (file == NULL) {
 	    perror(*argv);
 	    exit(FALSE);

diff --git a/coreutils/cat.c b/coreutils/cat.c
@@ -46,10 +46,9 @@ extern int cat_main(int argc, char **argv)
 	usage ("cat [file ...]\n");
     }
     argc--;
-    argv++;
 
-    while (argc-- > 0) {
-	file = fopen(*(argv++), "r");
+    while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) {
+	file = fopen(*argv, "r");
 	if (file == NULL) {
 	    perror(*argv);
 	    exit(FALSE);