diff options
| -rw-r--r-- | archival/Config.in | 10 | ||||
| -rw-r--r-- | findutils/Config.in | 65 | ||||
| -rw-r--r-- | libbb/Config.in | 1 | ||||
| -rw-r--r-- | libbb/inet_common.c | 2 | ||||
| -rw-r--r-- | modutils/Config.in | 3 | ||||
| -rw-r--r-- | networking/Config.in | 13 |
6 files changed, 48 insertions, 46 deletions
diff --git a/archival/Config.in b/archival/Config.in index a983e4433..1ea6f3d16 100644 --- a/archival/Config.in +++ b/archival/Config.in @@ -53,12 +53,12 @@ config AR probably say N here. config FEATURE_AR_LONG_FILENAMES - bool "Support for long filenames (not need for debs)" + bool "Support for long filenames (not needed for debs)" default n depends on AR help - By default the ar format can only store the first 15 characters of - the filename, this option removes that limitation. + By default the ar format can only store the first 15 characters + of the filename, this option removes that limitation. It supports the GNU ar long filename method which moves multiple long filenames into a the data section of a new ar entry. @@ -211,11 +211,11 @@ config FEATURE_TAR_CREATE tar archives using the `-c' option. config FEATURE_TAR_AUTODETECT - bool "Autodetect gz/bz2 compressed tarballs" + bool "Autodetect compressed tarballs" default n depends on FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA help - With this option tar can automatically detect gzip/bzip2 compressed + With this option tar can automatically detect compressed tarballs. Currently it works only on files (not pipes etc). config FEATURE_TAR_FROM diff --git a/findutils/Config.in b/findutils/Config.in index d69a2385b..2f0e3c741 100644 --- a/findutils/Config.in +++ b/findutils/Config.in @@ -12,17 +12,17 @@ config FIND find is used to search your system to find specified files. config FEATURE_FIND_PRINT0 - bool "Enable -print0 option" + bool "Enable -print0: NUL-separated output" default y depends on FIND help - Causes output names to be separated by a null character + Causes output names to be separated by a NUL character rather than a newline. This allows names that contain newlines and other whitespace to be more easily interpreted by other programs. config FEATURE_FIND_MTIME - bool "Enable modified time matching (-mtime option)" + bool "Enable -mtime: modified time matching" default y depends on FIND help @@ -30,7 +30,7 @@ config FEATURE_FIND_MTIME files, in days. config FEATURE_FIND_MMIN - bool "Enable modified time matching (-mmin option)" + bool "Enable -mmin: modified time matching by minutes" default y depends on FIND help @@ -38,14 +38,14 @@ config FEATURE_FIND_MMIN files, in minutes. config FEATURE_FIND_PERM - bool "Enable permissions matching (-perm option)" + bool "Enable -perm: permissions matching" default y depends on FIND help Enable searching based on file permissions. config FEATURE_FIND_TYPE - bool "Enable filetype matching (-type option)" + bool "Enable -type: file type matching (file/dir/link/...)" default y depends on FIND help @@ -53,21 +53,21 @@ config FEATURE_FIND_TYPE directory, socket, device, etc.). config FEATURE_FIND_XDEV - bool "Enable 'stay in filesystem' option (-xdev)" + bool "Enable -xdev: 'stay in filesystem'" default y depends on FIND help This option allows find to restrict searches to a single filesystem. config FEATURE_FIND_MAXDEPTH - bool "Enable -maxdepth N option" + bool "Enable -maxdepth N" default y depends on FIND help This option enables -maxdepth N option. config FEATURE_FIND_NEWER - bool "Enable -newer option for comparing file mtimes" + bool "Enable -newer: compare file modification times" default y depends on FIND help @@ -75,14 +75,14 @@ config FEATURE_FIND_NEWER a modified time that is more recent than the specified FILE. config FEATURE_FIND_INUM - bool "Enable inode number matching (-inum option)" + bool "Enable -inum: inode number matching" default y depends on FIND help Support the 'find -inum' option for searching by inode number. config FEATURE_FIND_EXEC - bool "Enable -exec option allowing execution of commands" + bool "Enable -exec: execute commands" default y depends on FIND help @@ -90,14 +90,14 @@ config FEATURE_FIND_EXEC the files matched. config FEATURE_FIND_USER - bool "Enable username/uid matching (-user option)" + bool "Enable -user: username/uid matching" default y depends on FIND help Support the 'find -user' option for searching by username or uid. config FEATURE_FIND_GROUP - bool "Enable group/gid matching (-group option)" + bool "Enable -group: group/gid matching" default y depends on FIND help @@ -113,7 +113,7 @@ config FEATURE_FIND_NOT the non-POSIX notation '-not'. config FEATURE_FIND_DEPTH - bool "Enable the -depth option" + bool "Enable -depth" default y depends on FIND help @@ -127,14 +127,14 @@ config FEATURE_FIND_PAREN Enable usage of parens '(' to specify logical order of arguments. config FEATURE_FIND_SIZE - bool "Enable -size option allowing matching for file size" + bool "Enable -size: file size matching" default y depends on FIND help Support the 'find -size' option for searching by file size. config FEATURE_FIND_PRUNE - bool "Enable -prune option allowing to exclude subdirectories" + bool "Enable -prune: exclude subdirectories" default y depends on FIND help @@ -142,7 +142,7 @@ config FEATURE_FIND_PRUNE exclusion .svn and CVS directories. config FEATURE_FIND_DELETE - bool "Enable -delete option allowing to delete files" + bool "Enable -delete: delete files/dirs" default n depends on FIND && FEATURE_FIND_DEPTH help @@ -151,21 +151,21 @@ config FEATURE_FIND_DELETE try to protect the user from doing stupid things. Use with care. config FEATURE_FIND_PATH - bool "Enable -path option allowing to match pathname patterns" + bool "Enable -path: match pathname with shell pattern" default y depends on FIND help The -path option matches whole pathname instead of just filename. config FEATURE_FIND_REGEX - bool "Enable -regex: match pathname to regex" + bool "Enable -regex: match pathname with regex" default y depends on FIND help The -regex option matches whole pathname against regular expression. config FEATURE_FIND_CONTEXT - bool "Enable -context option for matching security context" + bool "Enable -context: security context matching" default n depends on FIND && SELINUX help @@ -178,7 +178,7 @@ config GREP grep is used to search files for a specified pattern. config FEATURE_GREP_EGREP_ALIAS - bool "Support extended regular expressions (egrep & grep -E)" + bool "Enable extended regular expressions (egrep & grep -E)" default y depends on GREP help @@ -193,7 +193,7 @@ config FEATURE_GREP_FGREP_ALIAS help fgrep sees the search pattern as a normal string rather than regular expressions. - grep -F is always builtin, this just creates the fgrep alias. + grep -F always works, this just creates the fgrep alias. config FEATURE_GREP_CONTEXT bool "Enable before and after context flags (-A, -B and -C)" @@ -208,40 +208,39 @@ config XARGS bool "xargs" default n help - xargs is used to execute a specified command on + xargs is used to execute a specified command for every item from standard input. config FEATURE_XARGS_SUPPORT_CONFIRMATION - bool "Enable prompt and confirmation option -p" + bool "Enable -p: prompt and confirmation" default n depends on XARGS help - Support prompt the user about whether to run each command + Support -p: prompt the user whether to run each command line and read a line from the terminal. config FEATURE_XARGS_SUPPORT_QUOTES - bool "Enable support single and double quotes and backslash" + bool "Enable single and double quotes and backslash" default n depends on XARGS help - Default xargs unsupport single and double quotes - and backslash for can use aruments with spaces. + Support quoting in the input. config FEATURE_XARGS_SUPPORT_TERMOPT - bool "Enable support options -x" + bool "Enable -x: exit if -s or -n is exceeded" default n depends on XARGS help - Enable support exit if the size (see the -s or -n option) + Support -x: exit if the command size (see the -s or -n option) is exceeded. config FEATURE_XARGS_SUPPORT_ZERO_TERM - bool "Enable null terminated option -0" + bool "Enable -0: null terminated input" default n depends on XARGS help - Enable input filenames are terminated by a null character - instead of by whitespace, and the quotes and backslash + Support -0: input items are terminated by a NUL character + instead of whitespace, and the quotes and backslash are not special. endmenu diff --git a/libbb/Config.in b/libbb/Config.in index 7ced387a9..a572775c9 100644 --- a/libbb/Config.in +++ b/libbb/Config.in @@ -163,4 +163,5 @@ config FEATURE_HWIB help Support for printing infiniband addresses in network applets. + endmenu diff --git a/libbb/inet_common.c b/libbb/inet_common.c index fa4d8672f..0fc08d69d 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c @@ -193,7 +193,7 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric) if (sin6->sin6_family != AF_INET6) { #ifdef DEBUG - bb_error_msg("rresolve: unsupport address family %d!", + bb_error_msg("rresolve: unsupported address family %d!", sin6->sin6_family); #endif errno = EAFNOSUPPORT; diff --git a/modutils/Config.in b/modutils/Config.in index ef8d9692a..d2a2e04d1 100644 --- a/modutils/Config.in +++ b/modutils/Config.in @@ -91,8 +91,7 @@ config MODPROBE level. config FEATURE_MODPROBE_BLACKLIST - bool - prompt "Blacklist support" + bool "Blacklist support" default n depends on MODPROBE help diff --git a/networking/Config.in b/networking/Config.in index 6e3ed0fad..861d96346 100644 --- a/networking/Config.in +++ b/networking/Config.in @@ -17,7 +17,11 @@ config FEATURE_UNIX_LOCAL default n help Enable Unix domain socket support in all busybox networking - applets. + applets. Address of the form local:/path/to/unix/socket + will be recognized. + + This extension is almost never used in real world usage. + You most likely want to say N. config FEATURE_PREFER_IPV4_ADDRESS bool "Prefer IPv4 addresses from DNS queries" @@ -833,15 +837,14 @@ config TFTP_DEBUG default n depends on TFTP || TFTPD help - Enable debug settings for tftp. This is useful if you're running - into problems with tftp as the protocol doesn't help you much when - you run into problems. + Make tftp[d] print debugging messages on stderr. + This is useful if you are diagnosing a bug in tftp[d]. config TRACEROUTE bool "traceroute" default n help - Utility to trace the route of IP packets + Utility to trace the route of IP packets. config FEATURE_TRACEROUTE_VERBOSE bool "Enable verbose output" |