Updates from both Vladimir and Larry

[oweals/busybox.git] / Config.h

diff --git a/Config.h b/Config.h
index 569b4f69cbdb721bb40aec10562ecfbbe23174f8..d35f1a4bfa165195fabaae25f52cb90dd0ad18f4 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -11,12 +11,14 @@
 //#define BB_AR
 #define BB_BASENAME
 #define BB_CAT
-#define BB_CHMOD_CHOWN_CHGRP
+#define BB_CHGRP
+#define BB_CHMOD
+#define BB_CHOWN
 #define BB_CHROOT
 #define BB_CHVT
 #define BB_CLEAR
 //#define BB_CMP
-#define BB_CP_MV
+#define BB_CP
 #define BB_CUT
 #define BB_DATE
 //#define BB_DC
@@ -55,6 +57,7 @@
 #define BB_KILL
 #define BB_KILLALL
 #define BB_KLOGD
+//#define BB_LASH
 //#define BB_LENGTH
 #define BB_LN
 //#define BB_LOADACM
@@ -76,6 +79,7 @@
 #define BB_MORE
 #define BB_MOUNT
 //#define BB_MT
+#define BB_MV
 //#define BB_NSLOOKUP
 //#define BB_PING
 //#define BB_PIVOT_ROOT
@@ -144,6 +148,11 @@
 // them put on the stack.  For some very small machines with limited stack
 // space, this can be deadly.  For most folks, this works just fine...
 //#define BB_FEATURE_BUFFERS_GO_ON_STACK
+// The third alternative for buffer allocation is to use BSS.  This works
+// beautifully for computers with a real MMU (and OS support), but wastes
+// runtime RAM for uCLinux.  This behavior was the only one available for
+// BusyBox versions 0.48 and earlier.
+//#define BB_FEATURE_BUFFERS_GO_IN_BSS
 //
 // Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
 // thereby eliminating the need for the /proc filesystem and thereby saving
@@ -183,8 +192,8 @@
 // enable ls -L
 #define BB_FEATURE_LS_FOLLOWLINKS
 //
-// Change ping implementation -- simplified, featureless, but really small.
-//#define BB_FEATURE_SIMPLE_PING
+// Disable for a smaller (but less functional) ping
+#define BB_FEATURE_FANCY_PING
 //
 // Make init use a simplified /etc/inittab file (recommended).
 #define BB_FEATURE_USE_INITTAB
@@ -204,9 +213,9 @@
 // enable syslogd -C
 //#define BB_FEATURE_IPC_SYSLOG
 //
-//Simple tail implementation (2.34k vs 3k for the full one).
+//Disable for a simple tail implementation (2.34k vs 3k for the full one).
 //Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
-#define BB_FEATURE_SIMPLE_TAIL
+#define BB_FEATURE_FANCY_TAIL
 //
 // Enable support for loop devices in mount
 #define BB_FEATURE_MOUNT_LOOP
@@ -223,9 +232,6 @@
 // (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
 //
@@ -235,9 +241,12 @@
 // Enable support for tar -z option (currently only works for inflating)
 #define BB_FEATURE_TAR_GZIP 
 //
-//// Enable reverse sort
+// Enable reverse sort
 #define BB_FEATURE_SORT_REVERSE
 //
+// Enable uniqe sort
+#define BB_FEATURE_SORT_UNIQUE
+//
 // Enable command line editing in the shell.  
 // Only relevant if BB_SH is enabled. On by default.
 #define BB_FEATURE_COMMAND_EDITING
@@ -264,12 +273,11 @@
 // 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). On by default.
+// Uncomment this option for a fancy shell prompt that includes the
+// current username and hostname.  On systems that don't have usernames
+// or hostnames, this can look hideous.
 // Only relevant if BB_SH is enabled.
-#define BB_FEATURE_SH_SIMPLE_PROMPT
+//#define BB_FEATURE_SH_FANCY_PROMPT
 //
 //Turn on extra fbset options
 //#define BB_FEATURE_FBSET_FANCY
@@ -286,6 +294,12 @@
 // Support module version checking
 //#define BB_FEATURE_INSMOD_VERSION_CHECKING
 //
+// Support for uClinux memory usage optimization, which will load the image
+// directly into the kernel memory.  This divides memory requrements by three.
+// If you are not running uClinux (i.e. your CPU has an MMU) leave this
+// disabled...
+//#define BB_FEATURE_INSMOD_LOADINKMEM
+//
 // Support for Minix filesystem, version 2
 //#define BB_FEATURE_MINIX2
 //
@@ -353,6 +367,9 @@
 // Enable a if you system have setuped locale
 //#define BB_LOCALE_SUPPORT
 //
+// Support for TELNET to pass TERM type to remote host.  Adds 384 bytes.
+#define BB_FEATURE_TELNET_TTYPE
+//
 // End of Features List
 //
 //
@@ -371,12 +388,12 @@
                #undef BB_FEATURE_COMMAND_EDITING
                #undef BB_FEATURE_COMMAND_TAB_COMPLETION
                #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
-               #define BB_FEATURE_SH_SIMPLE_PROMPT
+               #undef BB_FEATURE_SH_FANCY_PROMPT
        #endif
 #else
        #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
        #undef BB_FEATURE_SH_STANDALONE_SHELL
-       #undef BB_FEATURE_SH_SIMPLE_PROMPT
+       #undef BB_FEATURE_SH_FANCY_PROMPT
 #endif
 //
 #ifdef BB_KILLALL
@@ -393,14 +410,6 @@
        #define BB_NFSMOUNT
 #endif
 //
-#if defined BB_IFCONFIG
-       #ifdef BB_FEATURE_IFCONFIG_STATUS
-               #define BB_INTERFACE
-       #endif
-#else
-       #undef BB_INTERFACE
-#endif 
-//
 #if defined BB_FEATURE_AUTOWIDTH
        #ifndef BB_FEATURE_USE_TERMIOS
                #define BB_FEATURE_USE_TERMIOS