Cleanup patch from Vladimir N. Oleynik.

[oweals/busybox.git] / Config.h

diff --git a/Config.h b/Config.h
index a2e2d046966b5f2f09df83dc0298f4f91e23e2b8..3a5aa6182b62b3b69df4c2ddf2dcd1ca503d96c5 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -208,7 +208,7 @@
 #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.)
+//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
 #define BB_FEATURE_SIMPLE_TAIL
 //
 // Enable support for loop devices in mount
@@ -238,12 +238,14 @@
 //// Enable reverse sort
 #define BB_FEATURE_SORT_REVERSE
 //
-// Enable command line editing in the shell
+// Enable command line editing in the shell.  
+// Only relevant if BB_SH is enabled.
 #define BB_FEATURE_SH_COMMAND_EDITING
 //
 //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.
+// Only relevant if BB_SH is enabled.
 #define BB_FEATURE_SH_STANDALONE_SHELL
 //
 //When this is enabled, busybox shell applets can be called using full path
@@ -252,11 +254,23 @@
 //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.
 //BB_FEATURE_SH_APPLETS_ALWAYS_WIN
 //
 // Enable tab completion in the shell (not yet 
 // working very well -- so don't turn this on)
-//#define BB_FEATURE_SH_TAB_COMPLETION
+// 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]#".  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):
+#define BB_FEATURE_SH_SIMPLE_PROMPT
+//
+// Attempts to match usernames in a ~-prefixed path
+//#define BB_FEATURE_USERNAME_COMPLETION
 //
 //Turn on extra fbset options
 //#define BB_FEATURE_FBSET_FANCY
@@ -322,13 +336,9 @@
 #endif
 #endif
 //
-#if defined BB_FEATURE_LINUXRC || defined BB_LINUXRC
 #ifndef BB_INIT
-#define BB_INIT
-#endif
-#ifndef BB_LINUXRC
-#define BB_LINUXRC
-#endif
+#undef BB_LINUXRC
+#undef BB_FEATURE_LINUXRC
 #endif
 //
 #ifdef BB_GZIP