More stuff

diff --git a/Makefile b/Makefile
index 6c36b8fa49d1c6807d1316f6d2d83bc88f543510..59d648512d088317616fd9318ce4366a4a8cb0ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 e011bf9fc98c6f377242bc130f8d5b6a83306b83..a236520c17c37cf5c4670f1384ff2c10b4677a94 100644 (file)
--- 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 99cedf5f0ec7a84639051ca9da8b68693602669d..7a1b0f3d09db190bc1f8b83a9b84ac18ce936b99 100644 (file)
--- 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

diff --git a/init.c b/init.c
index 4771722b9a5b2ce2cc6fc06108b3c66015107b0a..2860272f9c6e8e7251175d487afee635dba005c4 100644 (file)
--- a/init.c
+++ b/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")) {

diff --git a/init/init.c b/init/init.c
index 4771722b9a5b2ce2cc6fc06108b3c66015107b0a..2860272f9c6e8e7251175d487afee635dba005c4 100644 (file)
--- 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")) {

diff --git a/ls.c b/ls.c
index 99cedf5f0ec7a84639051ca9da8b68693602669d..7a1b0f3d09db190bc1f8b83a9b84ac18ce936b99 100644 (file)
--- a/ls.c
+++ b/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