randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-06-09 18:40:07 +02:00
parent 38d9072b2c
commit 2634bf366b
3 changed files with 13 additions and 6 deletions

View File

@ -16,7 +16,7 @@ lib-$(CONFIG_DPKG) += dpkg.o
lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
lib-$(CONFIG_GUNZIP) += bbunzip.o lib-$(CONFIG_GUNZIP) += bbunzip.o
lib-$(CONFIG_GZIP) += gzip.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o
lib-$(CONFIG_LZOP) += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o lib-$(CONFIG_LZOP) += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o
lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
lib-$(CONFIG_RPM) += rpm.o lib-$(CONFIG_RPM) += rpm.o

View File

@ -1730,13 +1730,13 @@ static const char defifs[] ALIGN1 = " \t\n";
/* Need to be before varinit_data[] */ /* Need to be before varinit_data[] */
#if ENABLE_LOCALE_SUPPORT #if ENABLE_LOCALE_SUPPORT
static void static void FAST_FUNC
change_lc_all(const char *value) change_lc_all(const char *value)
{ {
if (value && *value != '\0') if (value && *value != '\0')
setlocale(LC_ALL, value); setlocale(LC_ALL, value);
} }
static void static void FAST_FUNC
change_lc_ctype(const char *value) change_lc_ctype(const char *value)
{ {
if (value && *value != '\0') if (value && *value != '\0')
@ -8740,9 +8740,15 @@ static int ulimitcmd(int, char **) FAST_FUNC;
*/ */
/* Stubs for calling non-FAST_FUNC's */ /* Stubs for calling non-FAST_FUNC's */
#if ENABLE_ASH_BUILTIN_ECHO
static int FAST_FUNC echocmd(int argc, char **argv) { return echo_main(argc, argv); } static int FAST_FUNC echocmd(int argc, char **argv) { return echo_main(argc, argv); }
#endif
#if ENABLE_ASH_BUILTIN_PRINTF
static int FAST_FUNC printfcmd(int argc, char **argv) { return printf_main(argc, argv); } static int FAST_FUNC printfcmd(int argc, char **argv) { return printf_main(argc, argv); }
#endif
#if ENABLE_ASH_BUILTIN_TEST
static int FAST_FUNC testcmd(int argc, char **argv) { return test_main(argc, argv); } static int FAST_FUNC testcmd(int argc, char **argv) { return test_main(argc, argv); }
#endif
/* Keep these in proper order since it is searched via bsearch() */ /* Keep these in proper order since it is searched via bsearch() */
static const struct builtincmd builtintab[] = { static const struct builtincmd builtintab[] = {

View File

@ -36,6 +36,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
OPT_t = (1 << 4), OPT_t = (1 << 4),
}; };
#if ENABLE_GETOPT_LONG
static const char getopt_longopts[] ALIGN1 = static const char getopt_longopts[] ALIGN1 =
"append\0" No_argument "a" "append\0" No_argument "a"
"command\0" Required_argument "c" "command\0" Required_argument "c"
@ -44,8 +45,8 @@ int script_main(int argc UNUSED_PARAM, char **argv)
IF_SCRIPTREPLAY("timing\0" No_argument "t") IF_SCRIPTREPLAY("timing\0" No_argument "t")
; ;
if (ENABLE_GETOPT_LONG)
applet_long_options = getopt_longopts; applet_long_options = getopt_longopts;
#endif
opt_complementary = "?1"; /* max one arg */ opt_complementary = "?1"; /* max one arg */
opt = getopt32(argv, "ac:fq" IF_SCRIPTREPLAY("t") , &shell_arg); opt = getopt32(argv, "ac:fq" IF_SCRIPTREPLAY("t") , &shell_arg);