X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Config.h;h=7d8e83d38ed06cae0f8c818d8f6c1be68c04f0f2;hb=7cf9fed83f6e7bf86eb4cac324b98734739fa861;hp=6492b893f1d86f6d65764fac66a6193e493bf0c3;hpb=53737c5421b2356ead7659249000daac7c1aea21;p=oweals%2Fbusybox.git diff --git a/Config.h b/Config.h index 6492b893f..7d8e83d38 100644 --- a/Config.h +++ b/Config.h @@ -7,6 +7,7 @@ // // // BusyBox Applications +//#define BB_ADJTIMEX //#define BB_AR #define BB_BASENAME #define BB_CAT @@ -31,6 +32,7 @@ #define BB_DU //#define BB_DUMPKMAP #define BB_ECHO +#define BB_ENV //#define BB_EXPR //#define BB_FBSET //#define BB_FDFLUSH @@ -118,6 +120,7 @@ //#define BB_UPDATE #define BB_UPTIME //#define BB_USLEEP +//#define BB_VI //#define BB_WATCHDOG #define BB_WC //#define BB_WGET @@ -152,12 +155,11 @@ // I emailed Linus and this patch will not be going into the stock kernel. //#define BB_FEATURE_USE_DEVPS_PATCH // -// This compiles out everything but the most -// trivial --help usage information (i.e. reduces binary size) -#define BB_FEATURE_TRIVIAL_HELP +// show verbose usage messages +//#define BB_FEATURE_VERBOSE_USAGE // // Use termios to manipulate the screen ('more' is prettier with this on) -#define BB_FEATURE_USE_TERMIOS +//#define BB_FEATURE_USE_TERMIOS // // calculate terminal & column widths (for more and ls) #define BB_FEATURE_AUTOWIDTH @@ -195,15 +197,11 @@ //Make sure nothing is printed to the console on boot //#define BB_FEATURE_EXTRA_QUIET // -//Should syslogd also provide klogd support? -#define BB_FEATURE_KLOGD -// // enable syslogd -R remotehost -// #define BB_FEATURE_REMOTE_LOG -// enable syslogd -C -#define BB_FEATURE_IPC_SYSLOG // +// enable syslogd -C +//#define BB_FEATURE_IPC_SYSLOG // //Simple tail implementation (2.34k vs 3k for the full one). //Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. @@ -213,7 +211,7 @@ #define BB_FEATURE_MOUNT_LOOP // // Enable support for a real /etc/mtab file instead of /proc/mounts -//#define BB_FEATURE_MOUNT_MTAB_SUPPORT +//#define BB_FEATURE_MTAB_SUPPORT // // Enable support for mounting remote NFS volumes. // You may need to mount with "-o nolock" if you are @@ -224,6 +222,9 @@ // (i.e. in case of an unreachable NFS system). #define BB_FEATURE_MOUNT_FORCE // +// use -i (interactive) flag for rm +//#define BB_FEATURE_RM_INTERACTIVE +// // Enable support for creation of tar files. #define BB_FEATURE_TAR_CREATE // @@ -237,14 +238,21 @@ #define BB_FEATURE_SORT_REVERSE // // Enable command line editing in the shell. -// Only relevant if BB_SH is enabled. -#define BB_FEATURE_SH_COMMAND_EDITING +// Only relevant if BB_SH is enabled. On by default. +#define BB_FEATURE_COMMAND_EDITING +// +// Enable tab completion in the shell. This is now working quite nicely. +// This feature adds a bit over 4k. Only relevant if BB_SH is enabled. +#define BB_FEATURE_COMMAND_TAB_COMPLETION +// +// Attempts to match usernames in a ~-prefixed path +//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION // //Allow the shell to invoke all the compiled in BusyBox applets as if they //were shell builtins. Nice for staticly linking an emergency rescue shell, -//among other things. +//among other things. Off by default. // Only relevant if BB_SH is enabled. -#define BB_FEATURE_SH_STANDALONE_SHELL +//#define BB_FEATURE_SH_STANDALONE_SHELL // //When this is enabled, busybox shell applets can be called using full path //names. This causes applets (i.e., most busybox commands) to override @@ -252,25 +260,16 @@ //will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_ //busybox. Some systems want this, others do not. Choose wisely. :-) This //only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled. -// Only relevant if BB_SH is enabled. -#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN -// -// Enable tab completion in the shell. This is now working quite nicely. -// This feature adds a bit over 4k. Only relevant if BB_SH is enabled. -//#define BB_FEATURE_SH_TAB_COMPLETION -// -// Enable a simpler shell prompt of the form "path #" -// instead of the default "[username@hostname path]#" +// Only relevant if BB_SH is enabled. Off by default. +//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN // // Some deeply embedded systems don't have usernames or even hostnames, // and the default prompt can look rather hideous on them. Uncomment // this option for a simpler, path-only prompt (which was the default until -// around BusyBox-0.48): +// around BusyBox-0.48). On by default. +// Only relevant if BB_SH is enabled. #define BB_FEATURE_SH_SIMPLE_PROMPT // -// Attempts to match usernames in a ~-prefixed path -//#define BB_FEATURE_SH_USERNAME_COMPLETION -// //Turn on extra fbset options //#define BB_FEATURE_FBSET_FANCY // @@ -309,6 +308,9 @@ // Enable a nifty progress meter in wget (adds just under 2k) #define BB_FEATURE_WGET_STATUSBAR // +// Enable HTTP authentication in wget +#define BB_FEATURE_WGET_AUTHENTICATION +// // Clean up all memory before exiting -- usually not needed // as the OS can clean up... Don't enable this unless you // have a really good reason for cleaning things up manually. @@ -329,10 +331,24 @@ // Support for the -A -B and -C context flags in grep //#define BB_FEATURE_GREP_CONTEXT // +// Support for the EGREP applet (alias to the grep applet) +//#define BB_FEATURE_GREP_EGREP_ALIAS +// // Tell tftp what commands that should be supported. #define BB_FEATURE_TFTP_PUT #define BB_FEATURE_TFTP_GET // +// features for vi +#define BB_FEATURE_VI_COLON // ":" colon commands, no "ex" mode +#define BB_FEATURE_VI_YANKMARK // Yank/Put commands and Mark cmds +#define BB_FEATURE_VI_SEARCH // search and replace cmds +#define BB_FEATURE_VI_USE_SIGNALS // catch signals +#define BB_FEATURE_VI_DOT_CMD // remember previous cmd and "." cmd +#define BB_FEATURE_VI_READONLY // vi -R and "view" mode +#define BB_FEATURE_VI_SETOPTS // set-able options, ai ic showmatch +#define BB_FEATURE_VI_SET // :set +#define BB_FEATURE_VI_WIN_RESIZE // handle window resize +// // End of Features List // // @@ -344,97 +360,93 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // -#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF -#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT -#define BB_MTAB -#endif +#if defined BB_SH + #if defined BB_FEATURE_COMMAND_EDITING + #define BB_CMDEDIT + #else + #undef BB_FEATURE_COMMAND_EDITING + #undef BB_FEATURE_COMMAND_TAB_COMPLETION + #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION + #define BB_FEATURE_SH_SIMPLE_PROMPT + #endif #else -#undef BB_MTAB -#endif -// -#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH -#define BB_CMDEDIT + #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN + #undef BB_FEATURE_SH_STANDALONE_SHELL + #undef BB_FEATURE_SH_SIMPLE_PROMPT #endif // #ifdef BB_KILLALL -#ifndef BB_KILL -#define BB_KILL -#endif + #ifndef BB_KILL + #define BB_KILL + #endif #endif // #ifndef BB_INIT -#undef BB_LINUXRC -#undef BB_FEATURE_LINUXRC + #undef BB_FEATURE_LINUXRC #endif // #ifdef BB_GZIP -#ifndef BB_GUNZIP -#define BB_GUNZIP -#endif + #ifndef BB_GUNZIP + #define BB_GUNZIP + #endif #endif // #ifdef BB_DPKG -#ifndef BB_DPKG_DEB -#define BB_DPKG_DEB -#endif + #ifndef BB_DPKG_DEB + #define BB_DPKG_DEB + #endif #endif // #ifdef BB_DPKG_DEB -#ifndef BB_AR -#define BB_AR -#endif -#ifndef BB_TAR -#define BB_TAR -#endif -#ifndef BB_FEATURE_TAR_GZIP -#define BB_FEATURE_TAR_GZIP -#endif + #ifndef BB_AR + #define BB_AR + #endif + #ifndef BB_TAR + #define BB_TAR + #endif + #ifndef BB_FEATURE_TAR_GZIP + #define BB_FEATURE_TAR_GZIP + #endif #endif // #ifdef BB_TAR -#ifdef BB_FEATURE_TAR_GZIP -#ifndef BB_GUNZIP -#define BB_GUNZIP -#endif -#endif + #ifdef BB_FEATURE_TAR_GZIP + #ifndef BB_GUNZIP + #define BB_GUNZIP + #endif + #endif #endif // #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT -#define BB_NFSMOUNT -#endif -// -#if defined BB_FEATURE_SH_COMMAND_EDITING -#ifndef BB_FEATURE_USE_TERMIOS -#define BB_FEATURE_USE_TERMIOS -#endif + #define BB_NFSMOUNT #endif // #if defined BB_IFCONFIG -#ifdef BB_FEATURE_IFCONFIG_STATUS -#define BB_INTERFACE -#endif + #ifdef BB_FEATURE_IFCONFIG_STATUS + #define BB_INTERFACE + #endif #else -#undef BB_INTERFACE + #undef BB_INTERFACE #endif // #if defined BB_FEATURE_AUTOWIDTH -#ifndef BB_FEATURE_USE_TERMIOS -#define BB_FEATURE_USE_TERMIOS -#endif + #ifndef BB_FEATURE_USE_TERMIOS + #define BB_FEATURE_USE_TERMIOS + #endif #endif // #if defined BB_INSMOD || defined BB_LSMOD -#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE -#define BB_FEATURE_NEW_MODULE_INTERFACE -#endif + #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE + #define BB_FEATURE_NEW_MODULE_INTERFACE + #endif #endif // #ifdef BB_SYSLOGD -#if defined BB_FEATURE_IPC_SYSLOG -#define BB_LOGREAD -#endif + #if defined BB_FEATURE_IPC_SYSLOG + #define BB_LOGREAD + #endif #endif // #if defined BB_DOS2UNIX -#define BB_UNIX2DOS + #define BB_UNIX2DOS #endif