diff options
| author | Eric Andersen | 1999-10-13 22:56:11 +0000 |
|---|---|---|
| committer | Eric Andersen | 1999-10-13 22:56:11 +0000 |
| commit | 2c1030177e0a6f849ba557400e3e4867de455ce9 (patch) | |
| tree | 87b7b66e7adc5ca32cd2f323bbd252599b422045 | |
| parent | f6be944a6ae612c70ce010582d9c3cdd72f7144f (diff) | |
| download | busybox-2c1030177e0a6f849ba557400e3e4867de455ce9.zip busybox-2c1030177e0a6f849ba557400e3e4867de455ce9.tar.gz | |
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") # Comment out the following to make a debuggable build # Leave this off for production use. -#DODEBUG=true +DODEBUG=true #This will choke on a non-debian system ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'` @@ -41,7 +41,7 @@ links: - ./busybox.mkll | sort >busybox.links clean: - - rm -f busybox busybox.links *~ *.o + - rm -f busybox busybox.links *~ *.o core distclean: clean - rm -f busybox diff --git a/busybox.def.h b/busybox.def.h index e011bf9..a236520 100644 --- a/busybox.def.h +++ b/busybox.def.h @@ -19,7 +19,7 @@ #define BB_FIND #define BB_GREP ////#define BB_HALT -//#define BB_INIT +#define BB_INIT #define BB_KILL ////#define BB_LENGTH #define BB_LN diff --git a/coreutils/ls.c b/coreutils/ls.c index 99cedf5..7a1b0f3 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -667,11 +667,11 @@ ls_main(int argc, char * * argv) while (argi < argc) i |= list_item(argv[argi++]); newline(); - return i; + exit( i); print_usage_message: fprintf(stderr, "Usage: %s\n", ls_usage); - return 1; + exit( FALSE); } #endif @@ -249,7 +249,7 @@ void configure_terminals( int serial_cons ); extern int -init_main(struct FileInfo * i, int argc, char * * argv) +init_main(int argc, char * * argv) { static const char * const rc = "etc/rc"; const char * arguments[100]; @@ -370,8 +370,10 @@ Read the instructions in the install.html file. } arguments[j] = 0; - if ( run_rc ) + if ( run_rc ) { + printf("running %s\n",rc); waitfor(run(rc, arguments, console, 0)); + } if ( 0 == create_swap) { if (unlink("/etc/swappartition")) { diff --git a/init/init.c b/init/init.c index 4771722..2860272 100644 --- a/init/init.c +++ b/init/init.c @@ -249,7 +249,7 @@ void configure_terminals( int serial_cons ); extern int -init_main(struct FileInfo * i, int argc, char * * argv) +init_main(int argc, char * * argv) { static const char * const rc = "etc/rc"; const char * arguments[100]; @@ -370,8 +370,10 @@ Read the instructions in the install.html file. } arguments[j] = 0; - if ( run_rc ) + if ( run_rc ) { + printf("running %s\n",rc); waitfor(run(rc, arguments, console, 0)); + } if ( 0 == create_swap) { if (unlink("/etc/swappartition")) { @@ -667,11 +667,11 @@ ls_main(int argc, char * * argv) while (argi < argc) i |= list_item(argv[argi++]); newline(); - return i; + exit( i); print_usage_message: fprintf(stderr, "Usage: %s\n", ls_usage); - return 1; + exit( FALSE); } #endif |