Merge branch 'busybox' into merge

1 files changed, 74 insertions, 241 deletions

diff --git a/Config.in b/Config.in
index f9f6a3735..594b16b76 100644
--- a/Config.in
+++ b/Config.in
@@ -25,15 +25,18 @@ endchoice
 
 menu "Busybox Settings"
 
-menu "General Configuration"
-
 config DESKTOP
         bool "Enable options for full-blown desktop systems"
         default y
         help
           Enable options and features which are not essential.
-          Select this only if you plan to use busybox on full-blown
-          desktop machine with common Linux distro, not on an embedded box.
+          Select this if you plan to use busybox on full-blown desktop machine
+          with common Linux distro, which needs higher level of command-line
+          compatibility.
+
+          If you are preparing your build to be used on an embedded box
+          where you have tighter control over the entire set of userspace
+          tools, you can unselect this option for smaller code size. 
 
 config EXTRA_COMPAT
         bool "Provide compatible behavior for rare corner cases (bigger code)"
@@ -72,30 +75,6 @@ config PLATFORM_LINUX
           Answering 'N' here will disable such applets and hide the
           corresponding configuration options.
 
-choice
-        prompt "Buffer allocation policy"
-        default FEATURE_BUFFERS_USE_MALLOC
-        help
-          There are 3 ways BusyBox can handle buffer allocations:
-          - Use malloc. This costs code size for the call to xmalloc.
-          - Put them on stack. For some very small machines with limited stack
-            space, this can be deadly. For most folks, this works just fine.
-          - Put them in 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.
-
-config FEATURE_BUFFERS_USE_MALLOC
-        bool "Allocate with Malloc"
-
-config FEATURE_BUFFERS_GO_ON_STACK
-        bool "Allocate on the Stack"
-
-config FEATURE_BUFFERS_GO_IN_BSS
-        bool "Allocate in the .bss section"
-
-endchoice
-
 config SHOW_USAGE
         bool "Show applet usage messages"
         default y
@@ -158,131 +137,6 @@ config INSTALL_NO_USR
           will install applets only to /bin and /sbin,
           never to /usr/bin or /usr/sbin.
 
-config LOCALE_SUPPORT
-        bool "Enable locale support (system needs locale for this to work)"
-        default n
-        help
-          Enable this if your system has locale support and you would like
-          busybox to support locale settings.
-
-config UNICODE_SUPPORT
-        bool "Support Unicode"
-        default y
-        help
-          This makes various applets aware that one byte is not
-          one character on screen.
-
-          Busybox aims to eventually work correctly with Unicode displays.
-          Any older encodings are not guaranteed to work.
-          Probably by the time when busybox will be fully Unicode-clean,
-          other encodings will be mainly of historic interest.
-
-config UNICODE_USING_LOCALE
-        bool "Use libc routines for Unicode (else uses internal ones)"
-        default n
-        depends on UNICODE_SUPPORT && LOCALE_SUPPORT
-        help
-          With this option on, Unicode support is implemented using libc
-          routines. Otherwise, internal implementation is used.
-          Internal implementation is smaller.
-
-config FEATURE_CHECK_UNICODE_IN_ENV
-        bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
-        default n
-        depends on UNICODE_SUPPORT && !UNICODE_USING_LOCALE
-        help
-          With this option on, Unicode support is activated
-          only if locale-related variables have the value of the form
-          "xxxx.utf8"
-
-          Otherwise, Unicode support will be always enabled and active.
-
-config SUBST_WCHAR
-        int "Character code to substitute unprintable characters with"
-        depends on UNICODE_SUPPORT
-        default 63
-        help
-          Typical values are 63 for '?' (works with any output device),
-          30 for ASCII substitute control code,
-          65533 (0xfffd) for Unicode replacement character.
-
-config LAST_SUPPORTED_WCHAR
-        int "Range of supported Unicode characters"
-        depends on UNICODE_SUPPORT
-        default 767
-        help
-          Any character with Unicode value bigger than this is assumed
-          to be non-printable on output device. Many applets replace
-          such chars with substitution character.
-
-          The idea is that many valid printable Unicode chars are
-          nevertheless are not displayed correctly. Think about
-          combining charachers, double-wide hieroglyphs, obscure
-          characters in dozens of ancient scripts...
-          Many terminals, terminal emulators, xterms etc will fail
-          to handle them correctly. Choose the smallest value
-          which suits your needs.
-
-          Typical values are:
-          126 - ASCII only
-          767 (0x2ff) - there are no combining chars in [0..767] range
-                        (the range includes Latin 1, Latin Ext. A and B),
-                        code is ~700 bytes smaller for this case.
-          4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
-                        code is ~300 bytes smaller for this case.
-          12799 (0x31ff) - nearly all non-ideographic characters are
-                        available in [0..12799] range, including
-                        East Asian scripts like katakana, hiragana, hangul,
-                        bopomofo...
-          0 - off, any valid printable Unicode character will be printed.
-
-config UNICODE_COMBINING_WCHARS
-        bool "Allow zero-width Unicode characters on output"
-        default n
-        depends on UNICODE_SUPPORT
-        help
-          With this option off, any Unicode char with width of 0
-          is substituted on output.
-
-config UNICODE_WIDE_WCHARS
-        bool "Allow wide Unicode characters on output"
-        default n
-        depends on UNICODE_SUPPORT
-        help
-          With this option off, any Unicode char with width > 1
-          is substituted on output.
-
-config UNICODE_BIDI_SUPPORT
-        bool "Bidirectional character-aware line input"
-        default n
-        depends on UNICODE_SUPPORT && !UNICODE_USING_LOCALE
-        help
-          With this option on, right-to-left Unicode characters
-          are treated differently on input (e.g. cursor movement).
-
-config UNICODE_NEUTRAL_TABLE
-        bool "In bidi input, support non-ASCII neutral chars too"
-        default n
-        depends on UNICODE_BIDI_SUPPORT
-        help
-          In most cases it's enough to treat only ASCII non-letters
-          (i.e. punctuation, numbers and space) as characters
-          with neutral directionality.
-          With this option on, more extensive (and bigger) table
-          of neutral chars will be used.
-
-config UNICODE_PRESERVE_BROKEN
-        bool "Make it possible to enter sequences of chars which are not Unicode"
-        default n
-        depends on UNICODE_SUPPORT
-        help
-          With this option on, on line-editing input (such as used by shells)
-          invalid UTF-8 bytes are not substituted with the selected
-          substitution character.
-          For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
-          at shell prompt will list file named 0xff (single char name
-          with char value 255), not file named '?'.
-
 config PAM
         bool "Support for PAM (Pluggable Authentication Modules)"
         default n
@@ -290,19 +144,6 @@ config PAM
           Use PAM in some busybox applets (currently login and httpd) instead
           of direct access to password database.
 
-config FEATURE_USE_SENDFILE
-        bool "Use sendfile system call"
-        default y
-        select PLATFORM_LINUX
-        help
-          When enabled, busybox will use the kernel sendfile() function
-          instead of read/write loops to copy data between file descriptors
-          (for example, cp command does this a lot).
-          If sendfile() doesn't work, copying code falls back to read/write
-          loop. sendfile() was originally implemented for faster I/O
-          from files to sockets, but since Linux 2.6.33 it was extended
-          to work for many more file types.
-
 config LONG_OPTS
         bool "Support for --long-options"
         default y
@@ -511,9 +352,7 @@ config FEATURE_HAVE_RPC
         #  This is automatically selected if any of enabled applets need it.
         #  You do not need to select it manually.
 
-endmenu
-
-menu 'Build Options'
+comment 'Build Options'
 
 config STATIC
         bool "Build BusyBox as a static binary (no shared libs)"
@@ -710,9 +549,73 @@ config EXTRA_LDLIBS
         help
           Additional LDLIBS to pass to the linker with -l.
 
-endmenu
+comment 'Installation Options ("make install" behavior)'
+
+choice
+        prompt "What kind of applet links to install"
+        default INSTALL_APPLET_SYMLINKS
+        help
+          Choose what kind of links to applets are created by "make install".
+
+config INSTALL_APPLET_SYMLINKS
+        bool "as soft-links"
+        help
+          Install applets as soft-links to the busybox binary. This needs some
+          free inodes on the filesystem, but might help with filesystem
+          generators that can't cope with hard-links.
+
+config INSTALL_APPLET_HARDLINKS
+        bool "as hard-links"
+        help
+          Install applets as hard-links to the busybox binary. This might
+          count on a filesystem with few inodes.
+
+config INSTALL_APPLET_SCRIPT_WRAPPERS
+        bool "as script wrappers"
+        help
+          Install applets as script wrappers that call the busybox binary.
+
+config INSTALL_APPLET_DONT
+        bool "not installed"
+        help
+          Do not install applet links. Useful when you plan to use
+          busybox --install for installing links, or plan to use
+          a standalone shell and thus don't need applet links.
+
+endchoice
+
+choice
+        prompt "/bin/sh applet link"
+        default INSTALL_SH_APPLET_SYMLINK
+        depends on INSTALL_APPLET_SCRIPT_WRAPPERS
+        help
+          Choose how you install /bin/sh applet link.
+
+config INSTALL_SH_APPLET_SYMLINK
+        bool "as soft-link"
+        help
+          Install /bin/sh applet as soft-link to the busybox binary.
 
-menu 'Debugging Options'
+config INSTALL_SH_APPLET_HARDLINK
+        bool "as hard-link"
+        help
+          Install /bin/sh applet as hard-link to the busybox binary.
+
+config INSTALL_SH_APPLET_SCRIPT_WRAPPER
+        bool "as script wrapper"
+        help
+          Install /bin/sh applet as script wrapper that calls
+          the busybox binary.
+
+endchoice
+
+config PREFIX
+        string "BusyBox installation prefix"
+        default "./_install"
+        help
+          Define your directory to install BusyBox files/subdirs in.
+
+comment 'Debugging Options'
 
 config DEBUG
         bool "Build BusyBox with extra Debugging symbols"
@@ -806,78 +709,8 @@ endchoice
 
 endmenu
 
-menu 'Installation Options ("make install" behavior)'
-
-choice
-        prompt "What kind of applet links to install"
-        default INSTALL_APPLET_SYMLINKS
-        help
-          Choose what kind of links to applets are created by "make install".
-
-config INSTALL_APPLET_SYMLINKS
-        bool "as soft-links"
-        help
-          Install applets as soft-links to the busybox binary. This needs some
-          free inodes on the filesystem, but might help with filesystem
-          generators that can't cope with hard-links.
-
-config INSTALL_APPLET_HARDLINKS
-        bool "as hard-links"
-        help
-          Install applets as hard-links to the busybox binary. This might
-          count on a filesystem with few inodes.
-
-config INSTALL_APPLET_SCRIPT_WRAPPERS
-        bool "as script wrappers"
-        help
-          Install applets as script wrappers that call the busybox binary.
-
-config INSTALL_APPLET_DONT
-        bool "not installed"
-        help
-          Do not install applet links. Useful when you plan to use
-          busybox --install for installing links, or plan to use
-          a standalone shell and thus don't need applet links.
-
-endchoice
-
-choice
-        prompt "/bin/sh applet link"
-        default INSTALL_SH_APPLET_SYMLINK
-        depends on INSTALL_APPLET_SCRIPT_WRAPPERS
-        help
-          Choose how you install /bin/sh applet link.
-
-config INSTALL_SH_APPLET_SYMLINK
-        bool "as soft-link"
-        help
-          Install /bin/sh applet as soft-link to the busybox binary.
-
-config INSTALL_SH_APPLET_HARDLINK
-        bool "as hard-link"
-        help
-          Install /bin/sh applet as hard-link to the busybox binary.
-
-config INSTALL_SH_APPLET_SCRIPT_WRAPPER
-        bool "as script wrapper"
-        help
-          Install /bin/sh applet as script wrapper that calls
-          the busybox binary.
-
-endchoice
-
-config PREFIX
-        string "BusyBox installation prefix"
-        default "./_install"
-        help
-          Define your directory to install BusyBox files/subdirs in.
-
-endmenu
-
 source libbb/Config.in
 
-endmenu
-
 comment "Applets"
 
 source archival/Config.in