emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

defconfig: update

Browse Source 
appletli.c: add vda's (C)
top: fixlet for incorrect display of "0"
Makefile: reduce stack size from 20k to 16k
This commit is contained in:
Denis Vlasenko 2007-12-24 12:16:24 +00:00
parent e4bc603f0b
commit fcfb5c04bb
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.flags
View File

@ -97,4 +97,5 @@ endif
# Busybox is a stack-fatty so make sure we increase default size # Busybox is a stack-fatty so make sure we increase default size
# TODO: use "make stksizes" to find & fix big stack users # TODO: use "make stksizes" to find & fix big stack users
# (we stole scripts/checkstack.pl from the kernel... thanks guys!) # (we stole scripts/checkstack.pl from the kernel... thanks guys!)
FLTFLAGS += -s 20000 # Reduced from 20k to 16k in 1.9.0.
FLTFLAGS += -s 16000

10
libbb/appletlib.c
View File

@ -575,17 +575,19 @@ static int busybox_main(char **argv)
output_width -= sizeof("start-stop-daemon, ") + 8; output_width -= sizeof("start-stop-daemon, ") + 8;
printf("%s multi-call binary\n", bb_banner); /* reuse const string... */ printf("%s multi-call binary\n", bb_banner); /* reuse const string... */
printf("Copyright (C) 1998-2006 Erik Andersen, Rob Landley, and others.\n" printf("Copyright (C) 1998-2007 Erik Andersen, Rob Landley, Denys Vlasenko\n"
"Licensed under GPLv2. See source distribution for full notice.\n" "and others. Licensed under GPLv2.\n"
"See source distribution for full notice.\n"
"\n" "\n"
"Usage: busybox [function] [arguments]...\n" "Usage: busybox [function] [arguments]...\n"
" or: [function] [arguments]...\n" " or: function [arguments]...\n"
"\n" "\n"
"\tBusyBox is a multi-call binary that combines many common Unix\n" "\tBusyBox is a multi-call binary that combines many common Unix\n"
"\tutilities into a single executable. Most people will create a\n" "\tutilities into a single executable. Most people will create a\n"
"\tlink to busybox for each function they wish to use and BusyBox\n" "\tlink to busybox for each function they wish to use and BusyBox\n"
"\twill act like whatever it was invoked as!\n" "\twill act like whatever it was invoked as!\n"
"\nCurrently defined functions:\n"); "\n"
"Currently defined functions:\n");
col = 0; col = 0;
a = applet_names; a = applet_names;
while (*a) { while (*a) {

2
procps/top.c
View File

@ -636,7 +636,7 @@ static void display_topmem_header(int scr_width)
} }
fclose(fp); fclose(fp);
#define S(s) (s ? s : "0") #define S(s) (s ? s : "0 ")
snprintf(linebuf, sizeof(linebuf), snprintf(linebuf, sizeof(linebuf),
"Mem %stotal %sanon %smap %sfree", "Mem %stotal %sanon %smap %sfree",
S(total), S(anon), S(map), S(mfree)); S(total), S(anon), S(map), S(mfree));

9
scripts/defconfig
View File

@ -80,6 +80,7 @@ CONFIG_FEATURE_EDITING_HISTORY=15
CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_TAB_COMPLETION=y
# CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_USERNAME_COMPLETION is not set
# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
CONFIG_FEATURE_COPYBUF_KB=4
# CONFIG_MONOTONIC_SYSCALL is not set # CONFIG_MONOTONIC_SYSCALL is not set
CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_IOCTL_HEX2STR_ERROR=y
@ -306,6 +307,7 @@ CONFIG_PATCH=y
CONFIG_SED=y CONFIG_SED=y
CONFIG_VI=y CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_MAX_LEN=4096
# CONFIG_FEATURE_VI_8BIT is not set
CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y CONFIG_FEATURE_VI_SEARCH=y
@ -537,8 +539,8 @@ CONFIG_RUNLEVEL=y
CONFIG_RX=y CONFIG_RX=y
CONFIG_STRINGS=y CONFIG_STRINGS=y
CONFIG_SETSID=y CONFIG_SETSID=y
CONFIG_TASKSET=y # CONFIG_TASKSET is not set
CONFIG_FEATURE_TASKSET_FANCY=y # CONFIG_FEATURE_TASKSET_FANCY is not set
CONFIG_TIME=y CONFIG_TIME=y
CONFIG_TTYSIZE=y CONFIG_TTYSIZE=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
@ -552,7 +554,7 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
CONFIG_ARP=y CONFIG_ARP=y
CONFIG_ARPING=y CONFIG_ARPING=y
CONFIG_DNSD=y CONFIG_DNSD=y
CONFIG_ETHER_WAKE=y # CONFIG_ETHER_WAKE is not set
CONFIG_FAKEIDENTD=y CONFIG_FAKEIDENTD=y
CONFIG_FTPGET=y CONFIG_FTPGET=y
CONFIG_FTPPUT=y CONFIG_FTPPUT=y
@ -645,6 +647,7 @@ CONFIG_APP_UDHCPC=y
CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_ARPING=y
# CONFIG_FEATURE_UDHCP_DEBUG is not set # CONFIG_FEATURE_UDHCP_DEBUG is not set
CONFIG_FEATURE_RFC3397=y CONFIG_FEATURE_RFC3397=y
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_VCONFIG=y CONFIG_VCONFIG=y
CONFIG_WGET=y CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_STATUSBAR=y