More stuff

This commit is contained in:
Eric Andersen 1999-10-13 22:56:11 +00:00
parent f6be944a6a
commit 2c1030177e
6 changed files with 15 additions and 11 deletions

View File

@ -4,7 +4,7 @@ BUILDTIME=$(shell date "+%Y%m%d-%H%M")
# Comment out the following to make a debuggable build # Comment out the following to make a debuggable build
# Leave this off for production use. # Leave this off for production use.
#DODEBUG=true DODEBUG=true
#This will choke on a non-debian system #This will choke on a non-debian system
ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'` ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
@ -41,7 +41,7 @@ links:
- ./busybox.mkll | sort >busybox.links - ./busybox.mkll | sort >busybox.links
clean: clean:
- rm -f busybox busybox.links *~ *.o - rm -f busybox busybox.links *~ *.o core
distclean: clean distclean: clean
- rm -f busybox - rm -f busybox

View File

@ -19,7 +19,7 @@
#define BB_FIND #define BB_FIND
#define BB_GREP #define BB_GREP
////#define BB_HALT ////#define BB_HALT
//#define BB_INIT #define BB_INIT
#define BB_KILL #define BB_KILL
////#define BB_LENGTH ////#define BB_LENGTH
#define BB_LN #define BB_LN

View File

@ -667,11 +667,11 @@ ls_main(int argc, char * * argv)
while (argi < argc) while (argi < argc)
i |= list_item(argv[argi++]); i |= list_item(argv[argi++]);
newline(); newline();
return i; exit( i);
print_usage_message: print_usage_message:
fprintf(stderr, "Usage: %s\n", ls_usage); fprintf(stderr, "Usage: %s\n", ls_usage);
return 1; exit( FALSE);
} }
#endif #endif

6
init.c
View File

@ -249,7 +249,7 @@ void
configure_terminals( int serial_cons ); configure_terminals( int serial_cons );
extern int extern int
init_main(struct FileInfo * i, int argc, char * * argv) init_main(int argc, char * * argv)
{ {
static const char * const rc = "etc/rc"; static const char * const rc = "etc/rc";
const char * arguments[100]; const char * arguments[100];
@ -370,8 +370,10 @@ Read the instructions in the install.html file.
} }
arguments[j] = 0; arguments[j] = 0;
if ( run_rc ) if ( run_rc ) {
printf("running %s\n",rc);
waitfor(run(rc, arguments, console, 0)); waitfor(run(rc, arguments, console, 0));
}
if ( 0 == create_swap) { if ( 0 == create_swap) {
if (unlink("/etc/swappartition")) { if (unlink("/etc/swappartition")) {

View File

@ -249,7 +249,7 @@ void
configure_terminals( int serial_cons ); configure_terminals( int serial_cons );
extern int extern int
init_main(struct FileInfo * i, int argc, char * * argv) init_main(int argc, char * * argv)
{ {
static const char * const rc = "etc/rc"; static const char * const rc = "etc/rc";
const char * arguments[100]; const char * arguments[100];
@ -370,8 +370,10 @@ Read the instructions in the install.html file.
} }
arguments[j] = 0; arguments[j] = 0;
if ( run_rc ) if ( run_rc ) {
printf("running %s\n",rc);
waitfor(run(rc, arguments, console, 0)); waitfor(run(rc, arguments, console, 0));
}
if ( 0 == create_swap) { if ( 0 == create_swap) {
if (unlink("/etc/swappartition")) { if (unlink("/etc/swappartition")) {

4
ls.c
View File

@ -667,11 +667,11 @@ ls_main(int argc, char * * argv)
while (argi < argc) while (argi < argc)
i |= list_item(argv[argi++]); i |= list_item(argv[argi++]);
newline(); newline();
return i; exit( i);
print_usage_message: print_usage_message:
fprintf(stderr, "Usage: %s\n", ls_usage); fprintf(stderr, "Usage: %s\n", ls_usage);
return 1; exit( FALSE);
} }
#endif #endif