diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-10-24 05:00:29 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-10-24 05:00:29 +0000 |
commit | bdfd0d78bc44e73d693510e70087857785b3b521 (patch) | |
tree | 153a573095afac8d8d0ea857759ecabd77fb28b7 /applets | |
parent | 9260fc5552a3ee52eb95823aa6689d52a1ffd33c (diff) | |
download | busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.tar.gz busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.tar.bz2 busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.zip |
Major rework of the directory structure and the entire build system.
-Erik
Diffstat (limited to 'applets')
-rw-r--r-- | applets/busybox.c | 14 | ||||
-rwxr-xr-x | applets/busybox.sh | 4 | ||||
-rw-r--r-- | applets/usage.h | 54 |
3 files changed, 36 insertions, 36 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 33efb5d84..e6e5eca2d 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
@@ -5,14 +5,14 @@ | |||
5 | #include <errno.h> | 5 | #include <errno.h> |
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include "busybox.h" | 7 | #include "busybox.h" |
8 | #ifdef BB_LOCALE_SUPPORT | 8 | #ifdef CONFIG_LOCALE_SUPPORT |
9 | #include <locale.h> | 9 | #include <locale.h> |
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | int been_there_done_that = 0; /* Also used in applets.c */ | 12 | int been_there_done_that = 0; /* Also used in applets.c */ |
13 | const char *applet_name; | 13 | const char *applet_name; |
14 | 14 | ||
15 | #ifdef BB_FEATURE_INSTALLER | 15 | #ifdef CONFIG_FEATURE_INSTALLER |
16 | /* | 16 | /* |
17 | * directory table | 17 | * directory table |
18 | * this should be consistent w/ the enum, busybox.h::Location, | 18 | * this should be consistent w/ the enum, busybox.h::Location, |
@@ -63,7 +63,7 @@ static void install_links(const char *busybox, int use_symbolic_links) | |||
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
66 | #endif /* BB_FEATURE_INSTALLER */ | 66 | #endif /* CONFIG_FEATURE_INSTALLER */ |
67 | 67 | ||
68 | int main(int argc, char **argv) | 68 | int main(int argc, char **argv) |
69 | { | 69 | { |
@@ -79,8 +79,8 @@ int main(int argc, char **argv) | |||
79 | applet_name = s; | 79 | applet_name = s; |
80 | } | 80 | } |
81 | 81 | ||
82 | #ifdef BB_LOCALE_SUPPORT | 82 | #ifdef CONFIG_LOCALE_SUPPORT |
83 | #ifdef BB_INIT | 83 | #ifdef CONFIG_INIT |
84 | if(getpid()!=1) /* Do not set locale for `init' */ | 84 | if(getpid()!=1) /* Do not set locale for `init' */ |
85 | #endif | 85 | #endif |
86 | { | 86 | { |
@@ -97,7 +97,7 @@ int busybox_main(int argc, char **argv) | |||
97 | { | 97 | { |
98 | int col = 0, len, i; | 98 | int col = 0, len, i; |
99 | 99 | ||
100 | #ifdef BB_FEATURE_INSTALLER | 100 | #ifdef CONFIG_FEATURE_INSTALLER |
101 | /* | 101 | /* |
102 | * This style of argument parsing doesn't scale well | 102 | * This style of argument parsing doesn't scale well |
103 | * in the event that busybox starts wanting more --options. | 103 | * in the event that busybox starts wanting more --options. |
@@ -125,7 +125,7 @@ int busybox_main(int argc, char **argv) | |||
125 | } | 125 | } |
126 | return rc; | 126 | return rc; |
127 | } | 127 | } |
128 | #endif /* BB_FEATURE_INSTALLER */ | 128 | #endif /* CONFIG_FEATURE_INSTALLER */ |
129 | 129 | ||
130 | argc--; | 130 | argc--; |
131 | 131 | ||
diff --git a/applets/busybox.sh b/applets/busybox.sh index 9ab0f4bdb..6ac4e8043 100755 --- a/applets/busybox.sh +++ b/applets/busybox.sh | |||
@@ -5,11 +5,11 @@ export LC_CTYPE=POSIX | |||
5 | 5 | ||
6 | RAW=` \ | 6 | RAW=` \ |
7 | $CC -E -dM ${1:-Config.h} | \ | 7 | $CC -E -dM ${1:-Config.h} | \ |
8 | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \ | 8 | sed -n -e '/^.*CONFIG_FEATURE.*$/d;s/^#define.*\<CONFIG_\(.*\)\>/\1.c/gp;' \ |
9 | | tr A-Z a-z | sort | 9 | | tr A-Z a-z | sort |
10 | ` | 10 | ` |
11 | test "${RAW}" != "" || exit | 11 | test "${RAW}" != "" || exit |
12 | if [ -d "$BB_SRC_DIR" ]; then cd $BB_SRC_DIR; fi | 12 | if [ -d "$CONFIG_SRC_DIR" ]; then cd $CONFIG_SRC_DIR; fi |
13 | # By running $RAW through "ls", we avoid listing | 13 | # By running $RAW through "ls", we avoid listing |
14 | # source files that don't exist. | 14 | # source files that don't exist. |
15 | ls $RAW 2>/dev/null | tr '\n' ' ' | 15 | ls $RAW 2>/dev/null | tr '\n' ' ' |
diff --git a/applets/usage.h b/applets/usage.h index 5e514274a..1de29666e 100644 --- a/applets/usage.h +++ b/applets/usage.h | |||
@@ -247,7 +247,7 @@ | |||
247 | #define deluser_full_usage \ | 247 | #define deluser_full_usage \ |
248 | "Deletes user USER from the system" | 248 | "Deletes user USER from the system" |
249 | 249 | ||
250 | #ifdef BB_FEATURE_HUMAN_READABLE | 250 | #ifdef CONFIG_FEATURE_HUMAN_READABLE |
251 | #define USAGE_HUMAN_READABLE(a) a | 251 | #define USAGE_HUMAN_READABLE(a) a |
252 | #define USAGE_NOT_HUMAN_READABLE(a) | 252 | #define USAGE_NOT_HUMAN_READABLE(a) |
253 | #else | 253 | #else |
@@ -464,17 +464,17 @@ | |||
464 | #define fdflush_full_usage \ | 464 | #define fdflush_full_usage \ |
465 | "Forces floppy disk drive to detect disk change" | 465 | "Forces floppy disk drive to detect disk change" |
466 | 466 | ||
467 | #ifdef BB_FEATURE_FIND_TYPE | 467 | #ifdef CONFIG_FEATURE_FIND_TYPE |
468 | #define USAGE_FIND_TYPE(a) a | 468 | #define USAGE_FIND_TYPE(a) a |
469 | #else | 469 | #else |
470 | #define USAGE_FIND_TYPE(a) | 470 | #define USAGE_FIND_TYPE(a) |
471 | #endif | 471 | #endif |
472 | #ifdef BB_FEATURE_FIND_PERM | 472 | #ifdef CONFIG_FEATURE_FIND_PERM |
473 | #define USAGE_FIND_PERM(a) a | 473 | #define USAGE_FIND_PERM(a) a |
474 | #else | 474 | #else |
475 | #define USAGE_FIND_PERM(a) | 475 | #define USAGE_FIND_PERM(a) |
476 | #endif | 476 | #endif |
477 | #ifdef BB_FEATURE_FIND_MTIME | 477 | #ifdef CONFIG_FEATURE_FIND_MTIME |
478 | #define USAGE_FIND_MTIME(a) a | 478 | #define USAGE_FIND_MTIME(a) a |
479 | #else | 479 | #else |
480 | #define USAGE_FIND_MTIME(a) | 480 | #define USAGE_FIND_MTIME(a) |
@@ -678,22 +678,22 @@ | |||
678 | "$ id\n" \ | 678 | "$ id\n" \ |
679 | "uid=1000(andersen) gid=1000(andersen)\n" | 679 | "uid=1000(andersen) gid=1000(andersen)\n" |
680 | 680 | ||
681 | #ifdef BB_FEATURE_IFCONFIG_SLIP | 681 | #ifdef CONFIG_FEATURE_IFCONFIG_SLIP |
682 | #define USAGE_SIOCSKEEPALIVE(a) a | 682 | #define USAGE_SIOCSKEEPALIVE(a) a |
683 | #else | 683 | #else |
684 | #define USAGE_SIOCSKEEPALIVE(a) | 684 | #define USAGE_SIOCSKEEPALIVE(a) |
685 | #endif | 685 | #endif |
686 | #ifdef BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ | 686 | #ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ |
687 | #define USAGE_IFCONFIG_MII(a) a | 687 | #define USAGE_IFCONFIG_MII(a) a |
688 | #else | 688 | #else |
689 | #define USAGE_IFCONFIG_MII(a) | 689 | #define USAGE_IFCONFIG_MII(a) |
690 | #endif | 690 | #endif |
691 | #ifdef BB_FEATURE_IFCONFIG_HW | 691 | #ifdef CONFIG_FEATURE_IFCONFIG_HW |
692 | #define USAGE_IFCONFIG_HW(a) a | 692 | #define USAGE_IFCONFIG_HW(a) a |
693 | #else | 693 | #else |
694 | #define USAGE_IFCONFIG_HW(a) | 694 | #define USAGE_IFCONFIG_HW(a) |
695 | #endif | 695 | #endif |
696 | #ifdef BB_FEATURE_IFCONFIG_STATUS | 696 | #ifdef CONFIG_FEATURE_IFCONFIG_STATUS |
697 | #define USAGE_IFCONFIG_OPT_A(a) a | 697 | #define USAGE_IFCONFIG_OPT_A(a) a |
698 | #else | 698 | #else |
699 | #define USAGE_IFCONFIG_OPT_A(a) | 699 | #define USAGE_IFCONFIG_OPT_A(a) |
@@ -950,32 +950,32 @@ | |||
950 | #define logread_full_usage \ | 950 | #define logread_full_usage \ |
951 | "Shows the messages from syslogd (using circular buffer)." | 951 | "Shows the messages from syslogd (using circular buffer)." |
952 | 952 | ||
953 | #ifdef BB_FEATURE_LS_TIMESTAMPS | 953 | #ifdef CONFIG_FEATURE_LS_TIMESTAMPS |
954 | #define USAGE_LS_TIMESTAMPS(a) a | 954 | #define USAGE_LS_TIMESTAMPS(a) a |
955 | #else | 955 | #else |
956 | #define USAGE_LS_TIMESTAMPS(a) | 956 | #define USAGE_LS_TIMESTAMPS(a) |
957 | #endif | 957 | #endif |
958 | #ifdef BB_FEATURE_LS_FILETYPES | 958 | #ifdef CONFIG_FEATURE_LS_FILETYPES |
959 | #define USAGE_LS_FILETYPES(a) a | 959 | #define USAGE_LS_FILETYPES(a) a |
960 | #else | 960 | #else |
961 | #define USAGE_LS_FILETYPES(a) | 961 | #define USAGE_LS_FILETYPES(a) |
962 | #endif | 962 | #endif |
963 | #ifdef BB_FEATURE_LS_FOLLOWLINKS | 963 | #ifdef CONFIG_FEATURE_LS_FOLLOWLINKS |
964 | #define USAGE_LS_FOLLOWLINKS(a) a | 964 | #define USAGE_LS_FOLLOWLINKS(a) a |
965 | #else | 965 | #else |
966 | #define USAGE_LS_FOLLOWLINKS(a) | 966 | #define USAGE_LS_FOLLOWLINKS(a) |
967 | #endif | 967 | #endif |
968 | #ifdef BB_FEATURE_LS_RECURSIVE | 968 | #ifdef CONFIG_FEATURE_LS_RECURSIVE |
969 | #define USAGE_LS_RECURSIVE(a) a | 969 | #define USAGE_LS_RECURSIVE(a) a |
970 | #else | 970 | #else |
971 | #define USAGE_LS_RECURSIVE(a) | 971 | #define USAGE_LS_RECURSIVE(a) |
972 | #endif | 972 | #endif |
973 | #ifdef BB_FEATURE_LS_SORTFILES | 973 | #ifdef CONFIG_FEATURE_LS_SORTFILES |
974 | #define USAGE_LS_SORTFILES(a) a | 974 | #define USAGE_LS_SORTFILES(a) a |
975 | #else | 975 | #else |
976 | #define USAGE_LS_SORTFILES(a) | 976 | #define USAGE_LS_SORTFILES(a) |
977 | #endif | 977 | #endif |
978 | #ifdef BB_FEATURE_AUTOWIDTH | 978 | #ifdef CONFIG_FEATURE_AUTOWIDTH |
979 | #define USAGE_AUTOWIDTH(a) a | 979 | #define USAGE_AUTOWIDTH(a) a |
980 | #else | 980 | #else |
981 | #define USAGE_AUTOWIDTH(a) | 981 | #define USAGE_AUTOWIDTH(a) |
@@ -1145,12 +1145,12 @@ | |||
1145 | #define more_example_usage \ | 1145 | #define more_example_usage \ |
1146 | "$ dmesg | more\n" | 1146 | "$ dmesg | more\n" |
1147 | 1147 | ||
1148 | #ifdef BB_FEATURE_MOUNT_LOOP | 1148 | #ifdef CONFIG_FEATURE_MOUNT_LOOP |
1149 | #define USAGE_MOUNT_LOOP(a) a | 1149 | #define USAGE_MOUNT_LOOP(a) a |
1150 | #else | 1150 | #else |
1151 | #define USAGE_MOUNT_LOOP(a) | 1151 | #define USAGE_MOUNT_LOOP(a) |
1152 | #endif | 1152 | #endif |
1153 | #ifdef BB_FEATURE_MTAB_SUPPORT | 1153 | #ifdef CONFIG_FEATURE_MTAB_SUPPORT |
1154 | #define USAGE_MTAB(a) a | 1154 | #define USAGE_MTAB(a) a |
1155 | #else | 1155 | #else |
1156 | #define USAGE_MTAB(a) | 1156 | #define USAGE_MTAB(a) |
@@ -1245,7 +1245,7 @@ | |||
1245 | "$ pidof init\n" \ | 1245 | "$ pidof init\n" \ |
1246 | "1\n" | 1246 | "1\n" |
1247 | 1247 | ||
1248 | #ifndef BB_FEATURE_FANCY_PING | 1248 | #ifndef CONFIG_FEATURE_FANCY_PING |
1249 | #define ping_trivial_usage "host" | 1249 | #define ping_trivial_usage "host" |
1250 | #define ping_full_usage "Send ICMP ECHO_REQUEST packets to network hosts" | 1250 | #define ping_full_usage "Send ICMP ECHO_REQUEST packets to network hosts" |
1251 | #else | 1251 | #else |
@@ -1431,12 +1431,12 @@ | |||
1431 | "[2 second delay results]\n" | 1431 | "[2 second delay results]\n" |
1432 | 1432 | ||
1433 | 1433 | ||
1434 | #ifdef BB_FEATURE_SORT_UNIQUE | 1434 | #ifdef CONFIG_FEATURE_SORT_UNIQUE |
1435 | #define USAGE_SORT_UNIQUE(a) a | 1435 | #define USAGE_SORT_UNIQUE(a) a |
1436 | #else | 1436 | #else |
1437 | #define USAGE_SORT_UNIQUE(a) | 1437 | #define USAGE_SORT_UNIQUE(a) |
1438 | #endif | 1438 | #endif |
1439 | #ifdef BB_FEATURE_SORT_REVERSE | 1439 | #ifdef CONFIG_FEATURE_SORT_REVERSE |
1440 | #define USAGE_SORT_REVERSE(a) a | 1440 | #define USAGE_SORT_REVERSE(a) a |
1441 | #else | 1441 | #else |
1442 | #define USAGE_SORT_REVERSE(a) | 1442 | #define USAGE_SORT_REVERSE(a) |
@@ -1503,7 +1503,7 @@ | |||
1503 | "Write all buffered filesystem blocks to disk." | 1503 | "Write all buffered filesystem blocks to disk." |
1504 | 1504 | ||
1505 | 1505 | ||
1506 | #ifdef BB_FEATURE_REMOTE_LOG | 1506 | #ifdef CONFIG_FEATURE_REMOTE_LOG |
1507 | #define USAGE_REMOTE_LOG(a) a | 1507 | #define USAGE_REMOTE_LOG(a) a |
1508 | #else | 1508 | #else |
1509 | #define USAGE_REMOTE_LOG(a) | 1509 | #define USAGE_REMOTE_LOG(a) |
@@ -1525,7 +1525,7 @@ | |||
1525 | "$ syslogd -R 192.168.1.1:601\n" | 1525 | "$ syslogd -R 192.168.1.1:601\n" |
1526 | 1526 | ||
1527 | 1527 | ||
1528 | #ifndef BB_FEATURE_FANCY_TAIL | 1528 | #ifndef CONFIG_FEATURE_FANCY_TAIL |
1529 | #define USAGE_UNSIMPLE_TAIL(a) | 1529 | #define USAGE_UNSIMPLE_TAIL(a) |
1530 | #else | 1530 | #else |
1531 | #define USAGE_UNSIMPLE_TAIL(a) a | 1531 | #define USAGE_UNSIMPLE_TAIL(a) a |
@@ -1550,12 +1550,12 @@ | |||
1550 | "$ tail -n 1 /etc/resolv.conf\n" \ | 1550 | "$ tail -n 1 /etc/resolv.conf\n" \ |
1551 | "nameserver 10.0.0.1\n" | 1551 | "nameserver 10.0.0.1\n" |
1552 | 1552 | ||
1553 | #ifdef BB_FEATURE_TAR_CREATE | 1553 | #ifdef CONFIG_FEATURE_TAR_CREATE |
1554 | #define USAGE_TAR_CREATE(a) a | 1554 | #define USAGE_TAR_CREATE(a) a |
1555 | #else | 1555 | #else |
1556 | #define USAGE_TAR_CREATE(a) | 1556 | #define USAGE_TAR_CREATE(a) |
1557 | #endif | 1557 | #endif |
1558 | #ifdef BB_FEATURE_TAR_EXCLUDE | 1558 | #ifdef CONFIG_FEATURE_TAR_EXCLUDE |
1559 | #define USAGE_TAR_EXCLUDE(a) a | 1559 | #define USAGE_TAR_EXCLUDE(a) a |
1560 | #else | 1560 | #else |
1561 | #define USAGE_TAR_EXCLUDE(a) | 1561 | #define USAGE_TAR_EXCLUDE(a) |
@@ -1619,17 +1619,17 @@ | |||
1619 | "$ echo $?\n" \ | 1619 | "$ echo $?\n" \ |
1620 | "1\n" | 1620 | "1\n" |
1621 | 1621 | ||
1622 | #ifdef BB_FEATURE_TFTP_GET | 1622 | #ifdef CONFIG_FEATURE_TFTP_GET |
1623 | #define USAGE_TFTP_GET(a) a | 1623 | #define USAGE_TFTP_GET(a) a |
1624 | #else | 1624 | #else |
1625 | #define USAGE_TFTP_GET(a) | 1625 | #define USAGE_TFTP_GET(a) |
1626 | #endif | 1626 | #endif |
1627 | #ifdef BB_FEATURE_TFTP_PUT | 1627 | #ifdef CONFIG_FEATURE_TFTP_PUT |
1628 | #define USAGE_TFTP_PUT(a) a | 1628 | #define USAGE_TFTP_PUT(a) a |
1629 | #else | 1629 | #else |
1630 | #define USAGE_TFTP_PUT(a) | 1630 | #define USAGE_TFTP_PUT(a) |
1631 | #endif | 1631 | #endif |
1632 | #ifdef BB_FEATURE_TFTP_BLOCKSIZE | 1632 | #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE |
1633 | #define USAGE_TFTP_BS(a) a | 1633 | #define USAGE_TFTP_BS(a) a |
1634 | #else | 1634 | #else |
1635 | #define USAGE_TFTP_BS(a) | 1635 | #define USAGE_TFTP_BS(a) |
@@ -1719,7 +1719,7 @@ | |||
1719 | "$ tty\n" \ | 1719 | "$ tty\n" \ |
1720 | "/dev/tty2\n" | 1720 | "/dev/tty2\n" |
1721 | 1721 | ||
1722 | #ifdef BB_FEATURE_MOUNT_FORCE | 1722 | #ifdef CONFIG_FEATURE_MOUNT_FORCE |
1723 | #define USAGE_MOUNT_FORCE(a) a | 1723 | #define USAGE_MOUNT_FORCE(a) a |
1724 | #else | 1724 | #else |
1725 | #define USAGE_MOUNT_FORCE(a) | 1725 | #define USAGE_MOUNT_FORCE(a) |