Only remove directories when removing recursively.

[oweals/busybox.git] / busybox.def.h

diff --git a/busybox.def.h b/busybox.def.h
index 4871d8a7215ef4ce6a88a0ea7bfeb026e6a43675..9d046ab73391b43d57a78897cdf0184a632d3a8d 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -23,15 +23,19 @@
 #define BB_DF
 #define BB_DIRNAME
 #define BB_DMESG
+#define BB_DOS2UNIX
 #define BB_DUTMP
 #define BB_DU
+#define BB_DUMPKMAP
 #define BB_ECHO
+#define BB_EXPR
 #define BB_FBSET
 #define BB_FDFLUSH
 #define BB_FIND
 #define BB_FREE
 #define BB_FREERAMDISK
 #define BB_FSCK_MINIX
+#define BB_GETOPT
 #define BB_GREP
 #define BB_GUNZIP
 #define BB_GZIP
@@ -71,7 +75,10 @@
 #define BB_PRINTF
 #define BB_PS
 #define BB_PWD
+#define BB_RDATE
 #define BB_REBOOT
+#define BB_RENICE
+#define BB_RESET
 #define BB_RM
 #define BB_RMDIR
 #define BB_RMMOD
@@ -92,9 +99,11 @@
 #define BB_TR
 #define BB_TRUE_FALSE
 #define BB_TTY
+#define BB_UNRPM
 #define BB_UPTIME
 #define BB_USLEEP
 #define BB_WC
+#define BB_WGET
 #define BB_WHICH
 #define BB_WHOAMI
 #define BB_UUENCODE
@@ -102,6 +111,7 @@
 #define BB_UMOUNT
 #define BB_UNIQ
 #define BB_UNAME
+#define BB_UNIX2DOS
 #define BB_UPDATE
 #define BB_YES
 // End of Applications List
@@ -121,7 +131,7 @@
 // USE_PROCFS at the same time...  NOTE:  If you enable this feature, you
 // _must_ have patched the kernel to include the devps patch that is included
 // in the busybox/kernel-patches directory.  You will also need to create some
-// device special files /dev on your embedded system:
+// device special files in /dev on your embedded system:
 //        mknod /dev/modules c 10 23
 //        mknod /dev/mtab c 10 22
 //        mknod /dev/ps c 10 21
@@ -134,12 +144,6 @@
 // at the same time...
 #define BB_FEATURE_USE_PROCFS
 //
-// Enable full regular expressions.  This adds about 
-// 4k.  When this is off, things that would normally
-// use regualr expressions (like grep) will just use
-// normal strings.
-#define BB_FEATURE_FULL_REGULAR_EXPRESSIONS
-//
 // This compiles out everything but the most 
 // trivial --help usage information (i.e. reduces binary size)
 //#define BB_FEATURE_TRIVIAL_HELP
@@ -159,6 +163,9 @@
 // enable ls -p and -F
 #define BB_FEATURE_LS_FILETYPES
 //
+// sort the file names (still a bit buggy)
+#define BB_FEATURE_LS_SORTFILES
+//
 // enable ls -R
 #define BB_FEATURE_LS_RECURSIVE
 //
@@ -169,7 +176,7 @@
 #define BB_FEATURE_USE_INITTAB
 //
 //Enable init being called as /linuxrc
-//#define BB_FEATURE_LINUXRC
+#define BB_FEATURE_LINUXRC
 //
 //Have init enable core dumping for child processes (for debugging only) 
 //#define BB_FEATURE_INIT_COREDUMPS
@@ -185,8 +192,11 @@
 //Should syslogd also provide klogd support?
 #define BB_FEATURE_KLOGD
 //
-//Simple tail implementation (2k vs 6k for the full one).  Still
-//provides 'tail -f' support -- but for only one file at a time.
+// enable syslogd -R remotehost
+#define BB_FEATURE_REMOTE_LOG
+//
+//Simple tail implementation (2.34k vs 3k for the full one).
+//Both provide 'tail -f' support (only one file at a time.)
 #define BB_FEATURE_SIMPLE_TAIL
 //
 // Enable support for loop devices in mount
@@ -195,20 +205,22 @@
 // Enable support for a real /etc/mtab file instead of /proc/mounts
 //#define BB_FEATURE_MOUNT_MTAB_SUPPORT
 //
+// Enable support for mounting remote NFS volumes
+#define BB_FEATURE_NFSMOUNT
+//
 // Enable support forced filesystem unmounting 
 // (i.e. in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
-// Enable support for mounting remote NFS volumes
-// (This does not yet work with Linux 2.[34].x kernels)
-//#define BB_FEATURE_NFSMOUNT
-//
 // Enable support for creation of tar files.
 #define BB_FEATURE_TAR_CREATE
 //
 // Enable support for "--exclude" for excluding files
 #define BB_FEATURE_TAR_EXCLUDE
 //
+// Enable support for s///p pattern matching
+#define BB_FEATURE_SED_PATTERN_SPACE
+//
 //// Enable reverse sort
 #define BB_FEATURE_SORT_REVERSE
 //
@@ -217,7 +229,7 @@
 //
 //Allow the shell to invoke all the compiled in BusyBox commands as if they
 //were shell builtins.  Nice for staticly linking an emergency rescue shell
-//amoung other thing.
+//among other thing.
 #define BB_FEATURE_SH_STANDALONE_SHELL
 //
 // Enable tab completion in the shell (not yet 
@@ -239,12 +251,20 @@
 // Support module version checking
 //#define BB_FEATURE_INSMOD_VERSION_CHECKING
 //
+// Support for Minix filesystem, version 2
+//#define BB_FEATURE_MINIX2
+//
 //
 // Enable busybox --install [-s]
 // to create links (or symlinks) for all the commands that are 
 // compiled into the binary.  (needs /proc filesystem)
 // #define BB_FEATURE_INSTALLER
 //
+// 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.
+//#define BB_FEATURE_CLEAN_UP
+//
 // End of Features List
 //
 //
@@ -260,10 +280,6 @@
 #define BB_MTAB
 #endif
 //
-#if defined BB_FEATURE_FULL_REGULAR_EXPRESSIONS && (defined BB_SED || defined BB_GREP )
-#define BB_REGEXP
-#endif
-//
 #if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
 #define BB_CMDEDIT
 #endif
@@ -277,8 +293,8 @@
 #ifdef BB_FEATURE_LINUXRC
 #ifndef BB_INIT
 #define BB_INIT
-#define BB_LINUXRC
 #endif
+#define BB_LINUXRC
 #endif
 //
 #ifdef BB_GZIP