diff options
author | Eric Andersen <andersen@codepoet.org> | 1999-10-13 22:56:11 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 1999-10-13 22:56:11 +0000 |
commit | 2c1030177e0a6f849ba557400e3e4867de455ce9 (patch) | |
tree | 87b7b66e7adc5ca32cd2f323bbd252599b422045 | |
parent | f6be944a6ae612c70ce010582d9c3cdd72f7144f (diff) | |
download | busybox-w32-2c1030177e0a6f849ba557400e3e4867de455ce9.tar.gz busybox-w32-2c1030177e0a6f849ba557400e3e4867de455ce9.tar.bz2 busybox-w32-2c1030177e0a6f849ba557400e3e4867de455ce9.zip |
More stuff
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | busybox.def.h | 2 | ||||
-rw-r--r-- | coreutils/ls.c | 4 | ||||
-rw-r--r-- | init.c | 6 | ||||
-rw-r--r-- | init/init.c | 6 | ||||
-rw-r--r-- | ls.c | 4 |
6 files changed, 15 insertions, 11 deletions
@@ -4,7 +4,7 @@ BUILDTIME=$(shell date "+%Y%m%d-%H%M") | |||
4 | 4 | ||
5 | # Comment out the following to make a debuggable build | 5 | # Comment out the following to make a debuggable build |
6 | # Leave this off for production use. | 6 | # Leave this off for production use. |
7 | #DODEBUG=true | 7 | DODEBUG=true |
8 | 8 | ||
9 | #This will choke on a non-debian system | 9 | #This will choke on a non-debian system |
10 | ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'` | 10 | ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'` |
@@ -41,7 +41,7 @@ links: | |||
41 | - ./busybox.mkll | sort >busybox.links | 41 | - ./busybox.mkll | sort >busybox.links |
42 | 42 | ||
43 | clean: | 43 | clean: |
44 | - rm -f busybox busybox.links *~ *.o | 44 | - rm -f busybox busybox.links *~ *.o core |
45 | 45 | ||
46 | distclean: clean | 46 | distclean: clean |
47 | - rm -f busybox | 47 | - rm -f busybox |
diff --git a/busybox.def.h b/busybox.def.h index e011bf9fc..a236520c1 100644 --- a/busybox.def.h +++ b/busybox.def.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #define BB_FIND | 19 | #define BB_FIND |
20 | #define BB_GREP | 20 | #define BB_GREP |
21 | ////#define BB_HALT | 21 | ////#define BB_HALT |
22 | //#define BB_INIT | 22 | #define BB_INIT |
23 | #define BB_KILL | 23 | #define BB_KILL |
24 | ////#define BB_LENGTH | 24 | ////#define BB_LENGTH |
25 | #define BB_LN | 25 | #define BB_LN |
diff --git a/coreutils/ls.c b/coreutils/ls.c index 99cedf5f0..7a1b0f3d0 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -667,11 +667,11 @@ ls_main(int argc, char * * argv) | |||
667 | while (argi < argc) | 667 | while (argi < argc) |
668 | i |= list_item(argv[argi++]); | 668 | i |= list_item(argv[argi++]); |
669 | newline(); | 669 | newline(); |
670 | return i; | 670 | exit( i); |
671 | 671 | ||
672 | print_usage_message: | 672 | print_usage_message: |
673 | fprintf(stderr, "Usage: %s\n", ls_usage); | 673 | fprintf(stderr, "Usage: %s\n", ls_usage); |
674 | return 1; | 674 | exit( FALSE); |
675 | } | 675 | } |
676 | 676 | ||
677 | #endif | 677 | #endif |
@@ -249,7 +249,7 @@ void | |||
249 | configure_terminals( int serial_cons ); | 249 | configure_terminals( int serial_cons ); |
250 | 250 | ||
251 | extern int | 251 | extern int |
252 | init_main(struct FileInfo * i, int argc, char * * argv) | 252 | init_main(int argc, char * * argv) |
253 | { | 253 | { |
254 | static const char * const rc = "etc/rc"; | 254 | static const char * const rc = "etc/rc"; |
255 | const char * arguments[100]; | 255 | const char * arguments[100]; |
@@ -370,8 +370,10 @@ Read the instructions in the install.html file. | |||
370 | } | 370 | } |
371 | arguments[j] = 0; | 371 | arguments[j] = 0; |
372 | 372 | ||
373 | if ( run_rc ) | 373 | if ( run_rc ) { |
374 | printf("running %s\n",rc); | ||
374 | waitfor(run(rc, arguments, console, 0)); | 375 | waitfor(run(rc, arguments, console, 0)); |
376 | } | ||
375 | 377 | ||
376 | if ( 0 == create_swap) { | 378 | if ( 0 == create_swap) { |
377 | if (unlink("/etc/swappartition")) { | 379 | if (unlink("/etc/swappartition")) { |
diff --git a/init/init.c b/init/init.c index 4771722b9..2860272f9 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -249,7 +249,7 @@ void | |||
249 | configure_terminals( int serial_cons ); | 249 | configure_terminals( int serial_cons ); |
250 | 250 | ||
251 | extern int | 251 | extern int |
252 | init_main(struct FileInfo * i, int argc, char * * argv) | 252 | init_main(int argc, char * * argv) |
253 | { | 253 | { |
254 | static const char * const rc = "etc/rc"; | 254 | static const char * const rc = "etc/rc"; |
255 | const char * arguments[100]; | 255 | const char * arguments[100]; |
@@ -370,8 +370,10 @@ Read the instructions in the install.html file. | |||
370 | } | 370 | } |
371 | arguments[j] = 0; | 371 | arguments[j] = 0; |
372 | 372 | ||
373 | if ( run_rc ) | 373 | if ( run_rc ) { |
374 | printf("running %s\n",rc); | ||
374 | waitfor(run(rc, arguments, console, 0)); | 375 | waitfor(run(rc, arguments, console, 0)); |
376 | } | ||
375 | 377 | ||
376 | if ( 0 == create_swap) { | 378 | if ( 0 == create_swap) { |
377 | if (unlink("/etc/swappartition")) { | 379 | if (unlink("/etc/swappartition")) { |
@@ -667,11 +667,11 @@ ls_main(int argc, char * * argv) | |||
667 | while (argi < argc) | 667 | while (argi < argc) |
668 | i |= list_item(argv[argi++]); | 668 | i |= list_item(argv[argi++]); |
669 | newline(); | 669 | newline(); |
670 | return i; | 670 | exit( i); |
671 | 671 | ||
672 | print_usage_message: | 672 | print_usage_message: |
673 | fprintf(stderr, "Usage: %s\n", ls_usage); | 673 | fprintf(stderr, "Usage: %s\n", ls_usage); |
674 | return 1; | 674 | exit( FALSE); |
675 | } | 675 | } |
676 | 676 | ||
677 | #endif | 677 | #endif |