Another update from Larry:

[oweals/busybox.git] / Config.h

diff --git a/Config.h b/Config.h
index 11f2150cb02f36f495cc516e03a3b78c93d0b1ed..57760bec6b458173c24fde61a2c37e3cab3416b9 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
@@ -112,6 +116,7 @@
 //#define BB_TR
 #define BB_TRUE_FALSE
 #define BB_TTY
+//#define BB_UNIX2DOS
 //#define BB_UUENCODE
 //#define BB_UUDECODE
 #define BB_UMOUNT
@@ -143,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
@@ -222,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
 //
@@ -234,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
@@ -388,36 +398,10 @@
        #undef BB_FEATURE_LINUXRC
 #endif
 //
-#ifdef BB_GZIP
-       #ifndef BB_GUNZIP
-               #define BB_GUNZIP
-       #endif
-#endif
-//
-#ifdef BB_DPKG
-       #ifndef BB_DPKG_DEB
-               #define BB_DPKG_DEB
-       #endif
-#endif
-//
-#ifdef BB_DPKG_DEB
-       #ifndef BB_TAR
-               #define BB_TAR
-       #endif 
-#endif
-//
 #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
        #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
@@ -435,7 +419,3 @@
                #define BB_LOGREAD
        #endif
 #endif
-//
-#if defined BB_DOS2UNIX 
-       #define BB_UNIX2DOS
-#endif