aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--applets/busybox.c2
-rwxr-xr-xapplets/install.sh1
-rw-r--r--busybox.c2
-rw-r--r--busybox.def.h8
-rwxr-xr-xinstall.sh1
-rw-r--r--utility.c10
7 files changed, 19 insertions, 7 deletions
diff --git a/TODO b/TODO
index 4d1b82874..1edd9cdb0 100644
--- a/TODO
+++ b/TODO
@@ -31,7 +31,7 @@ around to it some time. If you have any good ideas, please let me know.
31----------------------- 31-----------------------
32 32
33Add a compile option to turn off all the compiled in help 33Add a compile option to turn off all the compiled in help
34andusage information. Some folks don't need or want it... 34and usage information. Some folks don't need or want it...
35 35
36----------------------- 36-----------------------
37 37
diff --git a/applets/busybox.c b/applets/busybox.c
index 73939c55f..f4260e937 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -149,7 +149,7 @@ static const struct Applet applets[] = {
149#ifdef BB_LENGTH 149#ifdef BB_LENGTH
150 {"length", length_main, _BB_DIR_USR_BIN}, 150 {"length", length_main, _BB_DIR_USR_BIN},
151#endif 151#endif
152#ifdef BB_FEATURE_LINUXRC // 152#ifdef BB_LINUXRC
153 {"linuxrc", init_main, _BB_DIR_ROOT}, 153 {"linuxrc", init_main, _BB_DIR_ROOT},
154#endif 154#endif
155#ifdef BB_LN 155#ifdef BB_LN
diff --git a/applets/install.sh b/applets/install.sh
index 100b26bad..65190f59d 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -15,6 +15,7 @@ for i in $h ; do
15 ln -fs /bin/busybox $1$i 15 ln -fs /bin/busybox $1$i
16done 16done
17rm -f $1/bin/busybox 17rm -f $1/bin/busybox
18mkdir -p $1/bin
18install -m 755 busybox $1/bin/busybox 19install -m 755 busybox $1/bin/busybox
19 20
20exit 0 21exit 0
diff --git a/busybox.c b/busybox.c
index 73939c55f..f4260e937 100644
--- a/busybox.c
+++ b/busybox.c
@@ -149,7 +149,7 @@ static const struct Applet applets[] = {
149#ifdef BB_LENGTH 149#ifdef BB_LENGTH
150 {"length", length_main, _BB_DIR_USR_BIN}, 150 {"length", length_main, _BB_DIR_USR_BIN},
151#endif 151#endif
152#ifdef BB_FEATURE_LINUXRC // 152#ifdef BB_LINUXRC
153 {"linuxrc", init_main, _BB_DIR_ROOT}, 153 {"linuxrc", init_main, _BB_DIR_ROOT},
154#endif 154#endif
155#ifdef BB_LN 155#ifdef BB_LN
diff --git a/busybox.def.h b/busybox.def.h
index 79eef1d12..f1c7b4f13 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -211,6 +211,7 @@
211//--------------------------------------------------- 211//---------------------------------------------------
212// Nothing beyond this point should ever be touched by 212// Nothing beyond this point should ever be touched by
213// mere mortals so leave this stuff alone. 213// mere mortals so leave this stuff alone.
214//
214#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT 215#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
215#define BB_MTAB 216#define BB_MTAB
216#endif 217#endif
@@ -232,6 +233,13 @@
232#ifdef BB_FEATURE_LINUXRC 233#ifdef BB_FEATURE_LINUXRC
233#ifndef BB_INIT 234#ifndef BB_INIT
234#define BB_INIT 235#define BB_INIT
236#define BB_LINUXRC
237#endif
238#endif
239//
240#ifdef BB_GZIP
241#ifndef BB_GUNZIP
242#define BB_GUNZIP
235#endif 243#endif
236#endif 244#endif
237// 245//
diff --git a/install.sh b/install.sh
index 100b26bad..65190f59d 100755
--- a/install.sh
+++ b/install.sh
@@ -15,6 +15,7 @@ for i in $h ; do
15 ln -fs /bin/busybox $1$i 15 ln -fs /bin/busybox $1$i
16done 16done
17rm -f $1/bin/busybox 17rm -f $1/bin/busybox
18mkdir -p $1/bin
18install -m 755 busybox $1/bin/busybox 19install -m 755 busybox $1/bin/busybox
19 20
20exit 0 21exit 0
diff --git a/utility.c b/utility.c
index 90eec4e21..a49b8a0eb 100644
--- a/utility.c
+++ b/utility.c
@@ -525,10 +525,12 @@ int fullRead(int fd, char *buf, int len)
525 525
526 526
527#if defined (BB_CHMOD_CHOWN_CHGRP) \ 527#if defined (BB_CHMOD_CHOWN_CHGRP) \
528 || defined (BB_CP_MV) \ 528 || defined (BB_CP_MV) \
529 || defined (BB_FIND) \ 529 || defined (BB_FIND) \
530 || defined (BB_LS) \ 530 || defined (BB_INSMOD) \
531 || defined (BB_INSMOD) 531 || defined (BB_RM) \
532 || defined (BB_TAR)
533
532/* 534/*
533 * Walk down all the directories under the specified 535 * Walk down all the directories under the specified
534 * location, and do something (something specified 536 * location, and do something (something specified