diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
| commit | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (patch) | |
| tree | 868c266e627e2d7f65ba5a4d5f98a1c421453181 /applets | |
| parent | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (diff) | |
| parent | da4441c44f6efccb6f7b7588404d9c6bfb7b6af8 (diff) | |
| download | busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.gz busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.bz2 busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.zip | |
Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge
Conflicts:
libbb/vfork_daemon_rexec.c
networking/wget.c
procps/ps.c
Diffstat (limited to 'applets')
| -rwxr-xr-x | applets/busybox.mkll | 2 | ||||
| -rw-r--r-- | applets/usage_pod.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/applets/busybox.mkll b/applets/busybox.mkll index 6d61f7e82..68dbf2162 100755 --- a/applets/busybox.mkll +++ b/applets/busybox.mkll | |||
| @@ -14,7 +14,7 @@ CONFIG_H=${1:-include/autoconf.h} | |||
| 14 | APPLETS_H=${2:-include/applets.h} | 14 | APPLETS_H=${2:-include/applets.h} |
| 15 | $HOSTCC -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H | | 15 | $HOSTCC -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H | |
| 16 | awk '/^[ \t]*LINK/{ | 16 | awk '/^[ \t]*LINK/{ |
| 17 | dir=substr($2,8) | 17 | dir=substr($2,7) |
| 18 | gsub("_","/",dir) | 18 | gsub("_","/",dir) |
| 19 | if(dir=="/ROOT") dir="" | 19 | if(dir=="/ROOT") dir="" |
| 20 | file=$3 | 20 | file=$3 |
diff --git a/applets/usage_pod.c b/applets/usage_pod.c index da0baefc6..0b1c4aadb 100644 --- a/applets/usage_pod.c +++ b/applets/usage_pod.c | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | #include "usage.h" | 31 | #include "usage.h" |
| 32 | #define MAKE_USAGE(aname, usage) { aname, usage }, | 32 | #define MAKE_USAGE(aname, usage) { aname, usage }, |
| 33 | static struct usage_data { | 33 | static struct usage_data { |
| 34 | const char *aname; | 34 | const char *aname; |
| 35 | const char *usage; | 35 | const char *usage; |
| 36 | } usage_array[] = { | 36 | } usage_array[] = { |
| 37 | #include "applets.h" | 37 | #include "applets.h" |
| 38 | }; | 38 | }; |