Index of "); /* Guard against directories with &, > etc */ - fmt_html(QUERY_STRING); + fmt_html(location); fmt

From: jk7744.park Date: Sat, 24 Oct 2015 06:54:41 +0000 (+0900) Subject: tizen 2.4 release X-Git-Tag: accepted/tizen/2.4/mobile/20151029.040634 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F2.4%2Fmobile%2F20151029.040634;p=external%2Fbusybox.git tizen 2.4 release --- diff --git a/.gitignore b/.gitignore index 7d2cca6..0a0c65b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ Config.in # Normal output # /busybox +/busybox_old /busybox_unstripped* # diff --git a/Config.in b/Config.in index fe64f2b..2c4be2e 100644 --- a/Config.in +++ b/Config.in @@ -47,6 +47,17 @@ config USE_PORTABLE_CODE compiler other than gcc. If you do use gcc, this option may needlessly increase code size. +config PLATFORM_LINUX + bool "Enable Linux-specific applets and features" + default y + help + For the most part, busybox requires only POSIX compatibility + from the target system, but some applets and features use + Linux-specific interfaces. + + Answering 'N' here will disable such applets and hide the + corresponding configuration options. + choice prompt "Buffer allocation policy" default FEATURE_BUFFERS_USE_MALLOC @@ -72,20 +83,21 @@ config FEATURE_BUFFERS_GO_IN_BSS endchoice config SHOW_USAGE - bool "Show terse applet usage messages" + bool "Show applet usage messages" default y help - All BusyBox applets will show help messages when invoked with - wrong arguments. You can turn off printing these terse usage - messages if you say no here. - This will save you up to 7k. + Enabling this option, BusyBox applets will show terse help messages + when invoked with wrong arguments. + If you do not want to show any (helpful) usage message when + issuing wrong command syntax, you can say 'N' here, + saving approximately 7k. config FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" default y depends on SHOW_USAGE help - All BusyBox applets will show more verbose help messages when + All BusyBox applets will show verbose help messages when busybox is invoked with --help. This will add a lot of text to the busybox binary. In the default configuration, this will add about 13k, but it can add much more depending on your configuration. @@ -95,8 +107,8 @@ config FEATURE_COMPRESS_USAGE default y depends on SHOW_USAGE help - Store usage messages in compressed form, uncompress them on-the-fly - when --help is called. + Store usage messages in .bz compressed form, uncompress them + on-the-fly when --help is called. If you have a really tiny busybox with few applets enabled (and bunzip2 isn't one of them), the overhead of the decompressor might @@ -112,6 +124,14 @@ config FEATURE_INSTALLER busybox at runtime to create hard links or symlinks for all the applets that are compiled into busybox. +config INSTALL_NO_USR + bool "Don't use /usr" + default n + help + Disable use of /usr. busybox --install and "make install" + 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 @@ -141,12 +161,13 @@ config UNICODE_USING_LOCALE Internal implementation is smaller. config FEATURE_CHECK_UNICODE_IN_ENV - bool "Check $LANG environment variable" + 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 LANG variable has the value of the form "xxxx.utf8" + only if locale-related variables have the value of the form + "xxxx.utf8" Otherwise, Unicode support will be always enabled and active. @@ -229,8 +250,9 @@ config UNICODE_PRESERVE_BROKEN default n depends on UNICODE_SUPPORT help - With this option on, invalid UTF-8 bytes are not substituted - with the selected substitution character. + 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 '?'. @@ -276,7 +298,7 @@ config FEATURE_UTMP config FEATURE_WTMP bool "Support wtmp file" default y - select FEATURE_UTMP + depends on FEATURE_UTMP help The file /var/run/wtmp is used to track when users have logged into and logged out of the system. @@ -289,35 +311,69 @@ config FEATURE_PIDFILE default y help This option makes some applets (e.g. crond, syslogd, inetd) write - a pidfile in /var/run. Some applications rely on them. + a pidfile at the configured PID_FILE_PATH. It has no effect + on applets which require pidfiles to run. + +config PID_FILE_PATH + string "Path to directory for pidfile" + default "/var/run" + depends on FEATURE_PIDFILE + help + This is the default path where pidfiles are created. Applets which + allow you to set the pidfile path on the command line will override + this value. The option has no effect on applets that require you to + specify a pidfile path. config FEATURE_SUID bool "Support for SUID/SGID handling" default y help With this option you can install the busybox binary belonging - to root with the suid bit set, and it will automatically drop - priviledges for applets that don't need root access. + to root with the suid bit set, enabling some applets to perform + root-level operations even when run by ordinary users + (for example, mounting of user mounts in fstab needs this). + + Busybox will automatically drop privileges for applets + that don't need root access. If you are really paranoid and don't want to do this, build two busybox binaries with different applets in them (and the appropriate symlinks pointing to each binary), and only set the suid bit on the - one that needs it. The applets currently marked to need the suid bit - are: + one that needs it. + + The applets which require root rights (need suid bit or + to be run by root) and will refuse to execute otherwise: + crontab, login, passwd, su, vlock, wall. - crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, - traceroute, vlock. + The applets which will use root rights if they have them + (via suid bit, or because run by root), but would try to work + without root right nevertheless: + findfs, ping[6], traceroute[6], mount. + + Note that if you DONT select this option, but DO make busybox + suid root, ALL applets will run under root, which is a huge + security hole (think "cp /some/file /etc/passwd"). config FEATURE_SUID_CONFIG bool "Runtime SUID/SGID configuration via /etc/busybox.conf" - default y if FEATURE_SUID + default y depends on FEATURE_SUID help Allow the SUID / SGID state of an applet to be determined at runtime by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) The format of this file is as follows: - = [Ssx-][Ssx-][x-] (|).(|) + APPLET = [Ssx-][Ssx-][x-] [USER.GROUP] + + s: USER or GROUP is allowed to execute APPLET. + APPLET will run under USER or GROUP + (reagardless of who's running it). + S: USER or GROUP is NOT allowed to execute APPLET. + APPLET will run under USER or GROUP. + This option is not very sensical. + x: USER/GROUP/others are allowed to execute APPLET. + No UID/GID change will be done when it is run. + -: USER/GROUP/others are not allowed to execute APPLET. An example might help: @@ -327,7 +383,8 @@ config FEATURE_SUID_CONFIG su = ssx # exactly the same mount = sx- root.disk # applet mount can be run by root and members - # of group disk and runs with euid=0 + # of group disk (but not anyone else) + # and runs with euid=0 (egid is not changed) cp = --- # disable applet cp for everyone @@ -353,6 +410,7 @@ config FEATURE_SUID_CONFIG_QUIET config SELINUX bool "Support NSA Security Enhanced Linux" default n + select PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -433,7 +491,10 @@ config PIE default n depends on !STATIC help - (TODO: what is it and why/when is it useful?) + Hardened code option. PIE binaries are loaded at a different + address at each invocation. This has some overhead, + particularly on x86-32 which is short on registers. + Most people will leave this set to 'N'. config NOMMU @@ -530,7 +591,6 @@ config FEATURE_SHARED_BUSYBOX config LFS bool "Build with Large File Support (for accessing files > 2 GB)" default y - select FDISK_SUPPORT_LARGE_DISKS help If you want to build BusyBox with large file support, then enable this option. This will have no effect if your kernel or your C @@ -552,12 +612,39 @@ config CROSS_COMPILER_PREFIX Native builds leave this empty. +config SYSROOT + string "Path to sysroot" + default "" + help + If you want to build BusyBox with a cross compiler, then you + might also need to specify where /usr/include and /usr/lib + will be found. + + For example, BusyBox can be built against an installed + Android NDK, platform version 9, for ARM ABI with + + CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm + + Native builds leave this empty. + config EXTRA_CFLAGS string "Additional CFLAGS" default "" help Additional CFLAGS to pass to the compiler verbatim. +config EXTRA_LDFLAGS + string "Additional LDFLAGS" + default "" + help + Additional LDFLAGS to pass to the linker verbatim. + +config EXTRA_LDLIBS + string "Additional LDLIBS" + default "" + help + Additional LDLIBS to pass to the linker with -l. + endmenu menu 'Debugging Options' @@ -634,25 +721,15 @@ config EFENCE endchoice -### config PARSE -### bool "Uniform config file parser debugging applet: parse" - endmenu -menu 'Installation Options' - -config INSTALL_NO_USR - bool "Don't use /usr" - default n - help - Disable use of /usr. Don't activate this option if you don't know - that you really want this behaviour. +menu 'Installation Options ("make install" behavior)' choice - prompt "Applets links" + prompt "What kind of applet links to install" default INSTALL_APPLET_SYMLINKS help - Choose how you install applets links. + Choose what kind of links to applets are created by "make install". config INSTALL_APPLET_SYMLINKS bool "as soft-links" @@ -674,10 +751,10 @@ config INSTALL_APPLET_SCRIPT_WRAPPERS config INSTALL_APPLET_DONT bool "not installed" - depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE || FEATURE_PREFER_APPLETS help - Do not install applet links. Useful when using the -install feature - or a standalone shell for rescue purposes. + 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 @@ -701,8 +778,8 @@ config INSTALL_SH_APPLET_HARDLINK config INSTALL_SH_APPLET_SCRIPT_WRAPPER bool "as script wrapper" help - Install /bin/sh applet as script wrapper that call the busybox - binary. + Install /bin/sh applet as script wrapper that calls + the busybox binary. endchoice diff --git a/INSTALL b/INSTALL index ec2b028..750cfc4 100644 --- a/INSTALL +++ b/INSTALL @@ -47,8 +47,11 @@ the only commands busybox can find are the built-in ones. Note that the standalone shell requires CONFIG_BUSYBOX_EXEC_PATH to be set appropriately, depending on whether or not /proc/self/exe is -available or not. If you do not have /proc, then point that config option +available. If you do not have /proc, then point that config option to the location of your busybox binary, usually /bin/busybox. +Another solution is to patch the kernel (see +examples/linux-*_proc_self_exe.patch) to make exec("/proc/self/exe") +always work. Configuring Busybox: ==================== @@ -70,7 +73,9 @@ create a known starting point. Other starting configurations (mostly used for testing purposes) include "make allbareconfig" (enables all applets but disables all optional features), "make allyesconfig" (enables absolutely everything including debug features), -and "make randconfig" (produce a random configuration). +and "make randconfig" (produce a random configuration). The configs/ directory +contains a number of additional configuration files ending in _defconfig which +are useful in specific cases. "make help" will list them. Configuring BusyBox produces a file ".config", which can be saved for future use. Run "make oldconfig" to bring a .config file from an older version of @@ -97,7 +102,7 @@ first argument to determine which applet to behave as, for example "./busybox cat LICENSE". (Running the busybox applet with no arguments gives a list of all enabled applets.) The standalone shell can also call busybox applets without links to busybox under other names in the filesystem. You can -also configure a standaone install capability into the busybox base applet, +also configure a standalone install capability into the busybox base applet, and then install such links at runtime with one of "busybox --install" (for hardlinks) or "busybox --install -s" (for symlinks). diff --git a/LICENSE b/LICENSE index 0e32274..6f50a71 100644 --- a/LICENSE +++ b/LICENSE @@ -346,515 +346,3 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. - - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/Makefile b/Makefile index 03e9885..33d59e3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION = 1 -PATCHLEVEL = 17 +PATCHLEVEL = 22 SUBLEVEL = 1 EXTRAVERSION = NAME = Unnamed @@ -297,6 +297,7 @@ NM = $(CROSS_COMPILE)nm STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config AWK = awk GENKSYMS = scripts/genksyms/genksyms DEPMOD = /sbin/depmod @@ -433,7 +434,12 @@ ifeq ($(config-targets),1) -include $(srctree)/arch/$(ARCH)/Makefile export KBUILD_DEFCONFIG -config %config: scripts_basic outputmakefile gen_build_files FORCE +config: scripts_basic outputmakefile gen_build_files FORCE + $(Q)mkdir -p include + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease + +%config: scripts_basic outputmakefile gen_build_files FORCE $(Q)mkdir -p include $(Q)$(MAKE) $(build)=scripts/kconfig $@ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease @@ -459,7 +465,7 @@ core-y := \ libs-y := \ archival/ \ - archival/libunarchive/ \ + archival/libarchive/ \ console-tools/ \ coreutils/ \ coreutils/libcoreutils/ \ @@ -837,7 +843,7 @@ export CPPFLAGS_busybox.lds += -P -C -U$(ARCH) # Split autoconf.h into include/linux/config/* quiet_cmd_gen_bbconfigopts = GEN include/bbconfigopts.h - cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs > include/bbconfigopts.h + cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs include/bbconfigopts.h include/bbconfigopts_bz2.h quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/* cmd_split_autoconf = scripts/basic/split-include include/autoconf.h include/config #bbox# piggybacked generation of few .h files @@ -958,10 +964,14 @@ CLEAN_FILES += busybox busybox_unstripped* busybox.links \ # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 MRPROPER_FILES += .config .config.old include/asm .version .old_version \ + include/NUM_APPLETS.h \ include/autoconf.h \ include/bbconfigopts.h \ + include/bbconfigopts_bz2.h \ include/usage_compressed.h \ include/applet_tables.h \ + include/applets.h \ + include/usage.h \ applets/usage \ .kernelrelease Module.symvers tags TAGS cscope* \ busybox_old @@ -986,7 +996,7 @@ clean: archclean $(clean-dirs) PHONY += doc-clean doc-clean: rm-files := docs/busybox.pod \ - docs/BusyBox.html docs/BusyBox.1 docs/BusyBox.txt + docs/BusyBox.html docs/busybox.1 docs/BusyBox.txt doc-clean: $(call cmd,rmfiles) @@ -1003,8 +1013,8 @@ $(mrproper-dirs): mrproper: clean archmrproper $(mrproper-dirs) $(call cmd,rmdirs) $(call cmd,rmfiles) - @find -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f - @find -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f + @find . -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f + @find . -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f # distclean # @@ -1033,7 +1043,7 @@ rpm: FORCE # Brief documentation of the typical targets used # --------------------------------------------------------------------------- -boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig) +boards := $(wildcard $(srctree)/configs/*_defconfig) boards := $(notdir $(boards)) -include $(srctree)/Makefile.help @@ -1122,15 +1132,6 @@ clean: $(clean-dirs) -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ -type f -print | xargs rm -f -help: - @echo ' Building external modules.' - @echo ' Syntax: make -C path/to/kernel/src M=$$PWD target' - @echo '' - @echo ' modules - default target, build the module(s)' - @echo ' modules_install - install the module' - @echo ' clean - remove generated files in module directory only' - @echo '' - # Dummies... PHONY += prepare scripts prepare: ; @@ -1285,9 +1286,13 @@ endif $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) # Modules -/ %/: prepare scripts FORCE +%/: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) +/: prepare scripts FORCE $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) + %.ko: prepare scripts FORCE $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) $(@:.ko=.o) diff --git a/Makefile.custom b/Makefile.custom index 01d69dd..8c95ef2 100644 --- a/Makefile.custom +++ b/Makefile.custom @@ -3,7 +3,12 @@ # ========================================================================== busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h - $(Q)-$(SHELL) $^ >$@ + $(Q)-$(SHELL) $^ > $@ + +busybox.cfg.suid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h + $(Q)-SUID="yes" $(SHELL) $^ > $@ +busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h + $(Q)-SUID="DROP" $(SHELL) $^ > $@ .PHONY: install ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y) @@ -69,6 +74,10 @@ release: distclean -print \ -exec rm -r -f {} \; ; \ find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \ + -name .gitignore \ + -print \ + -exec rm -f {} \; ; \ + find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \ -name .\#* \ -print \ -exec rm -f {} \; ; \ @@ -107,7 +116,7 @@ bigdata: busybox_unstripped # Documentation Targets .PHONY: doc -doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html +doc: docs/busybox.pod docs/BusyBox.txt docs/busybox.1 docs/BusyBox.html # FIXME: Doesn't belong here cmd_doc = @@ -125,6 +134,7 @@ docs/busybox.pod: $(srctree)/docs/busybox_header.pod \ $(Q)-mkdir -p docs $(Q)-( \ cat $(srctree)/docs/busybox_header.pod; \ + echo; \ applets/usage_pod | sed 's/^[A-Za-z][A-Za-z ]*[a-z]:$$/&\n/'; \ cat $(srctree)/docs/busybox_footer.pod; \ ) > docs/busybox.pod @@ -134,10 +144,10 @@ docs/BusyBox.txt: docs/busybox.pod $(Q)-mkdir -p docs $(Q)-pod2text $< > $@ -docs/BusyBox.1: docs/busybox.pod +docs/busybox.1: docs/busybox.pod $(disp_doc) $(Q)-mkdir -p docs - $(Q)-pod2man --center=BusyBox --release="version $(KERNELVERSION)" $< > $@ + $(Q)-pod2man --center=busybox --release="version $(KERNELVERSION)" $< > $@ docs/BusyBox.html: docs/busybox.net/BusyBox.html $(disp_doc) diff --git a/Makefile.flags b/Makefile.flags index 1ffa738..307afa7 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -4,7 +4,7 @@ BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) export BB_VER -SKIP_STRIP = n +SKIP_STRIP ?= n # -std=gnu99 needed for [U]LLONG_MAX on some systems CPPFLAGS += $(call cc-option,-std=gnu99,) @@ -25,6 +25,7 @@ CFLAGS += $(call cc-option,-Wstrict-prototypes,) CFLAGS += $(call cc-option,-Wunused -Wunused-parameter,) CFLAGS += $(call cc-option,-Wunused-function -Wunused-value,) CFLAGS += $(call cc-option,-Wmissing-prototypes -Wmissing-declarations,) +CFLAGS += $(call cc-option,-Wno-format-security,) # warn about C99 declaration after statement CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) # If you want to add more -Wsomething above, make sure that it is @@ -52,20 +53,23 @@ CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-poi CFLAGS += $(call cc-option,-fno-guess-branch-probability,) CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,) CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,) +# Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary): +CFLAGS += $(call cc-option,-fno-unwind-tables,) +CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,) # FIXME: These warnings are at least partially to be concerned about and should # be fixed.. #CFLAGS += $(call cc-option,-Wconversion,) ifneq ($(CONFIG_DEBUG),y) -CFLAGS += $(call cc-option,-Os,) +CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) else CFLAGS += $(call cc-option,-g,) #CFLAGS += "-D_FORTIFY_SOURCE=2" ifeq ($(CONFIG_DEBUG_PESSIMIZE),y) CFLAGS += $(call cc-option,-O0,) else -CFLAGS += $(call cc-option,-Os,) +CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) endif endif @@ -74,6 +78,12 @@ ARCH_FPIC ?= -fpic ARCH_FPIE ?= -fpie ARCH_PIE ?= -pie +# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES)) +define pkg_check_modules +$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2)) +$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2)) +endef + ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) # on i386: 14% smaller libbusybox.so # (code itself is 9% bigger, we save on relocs/PLT/GOT) @@ -85,6 +95,7 @@ endif ifeq ($(CONFIG_STATIC),y) CFLAGS_busybox += -static +PKG_CONFIG_FLAGS += --static endif ifeq ($(CONFIG_PIE),y) @@ -97,14 +108,40 @@ CFLAGS += $(strip $(subst ",,$(CONFIG_EXTRA_CFLAGS))) #")) endif +# Note: both "" (string consisting of two quote chars) and empty string +# are possible, and should be skipped below. +ifneq ($(subst "",,$(CONFIG_SYSROOT)),) +CFLAGS += --sysroot=$(CONFIG_SYSROOT) +export SYSROOT=$(CONFIG_SYSROOT) +endif + +# Android has no separate crypt library +# gcc-4.2.1 fails if we try to feed C source on stdin: +# echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc - +# fall back to using a temp file: +CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) +ifeq ($(CRYPT_AVAILABLE),y) LDLIBS += m crypt +else +LDLIBS += m +endif ifeq ($(CONFIG_PAM),y) -LDLIBS += pam pam_misc +# libpam uses libpthread, so for static builds busybox must be linked to +# libpthread. On some platforms that requires an explicit -lpthread, so +# it should be in LDLIBS. For non-static builds, scripts/trylink will +# take care of removing -lpthread if possible. (Not bothering to check +# CONFIG_STATIC because even in a non-static build it could be that the +# only libpam available is libpam.a, so -lpthread could still be +# needed.) +LDLIBS += pam pam_misc pthread endif ifeq ($(CONFIG_SELINUX),y) -LDLIBS += selinux sepol +SELINUX_PC_MODULES = libselinux libsepol +$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) +CPPFLAGS += $(SELINUX_CFLAGS) +LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%)) endif ifeq ($(CONFIG_EFENCE),y) @@ -115,10 +152,6 @@ ifeq ($(CONFIG_DMALLOC),y) LDLIBS += dmalloc endif -ifeq ($(CONFIG_SYSLOGD),y) -LDLIBS += systemd-daemon -endif - # If a flat binary should be built, CFLAGS_busybox="-elf2flt" # env var should be set for make invocation. # Here we check whether CFLAGS_busybox indeed contains that flag. @@ -129,6 +162,16 @@ ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox))) SKIP_STRIP = y endif +ifneq ($(CONFIG_EXTRA_LDFLAGS),) +EXTRA_LDFLAGS += $(strip $(subst ",,$(CONFIG_EXTRA_LDFLAGS))) +#")) +endif + +ifneq ($(CONFIG_EXTRA_LDLIBS),) +LDLIBS += $(strip $(subst ",,$(CONFIG_EXTRA_LDLIBS))) +#")) +endif + # Busybox is a stack-fatty so make sure we increase default size # TODO: use "make stksizes" to find & fix big stack users # (we stole scripts/checkstack.pl from the kernel... thanks guys!) diff --git a/Makefile.help b/Makefile.help index 999d029..119dd6f 100644 --- a/Makefile.help +++ b/Makefile.help @@ -25,6 +25,10 @@ help: @echo ' You can use these commands if the commands on the host' @echo ' is unusable. Afterwards use it like:' @echo ' make SED="$(objtree)/sed"' + @$(if $(boards), \ + $(foreach b, $(boards), \ + printf " %-21s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \ + echo '') @echo @echo 'Installation:' @echo ' install - install busybox into CONFIG_PREFIX' diff --git a/README b/README index 3a9d849..b940e35 100644 --- a/README +++ b/README @@ -44,7 +44,7 @@ Using busybox: run (I.E. "./busybox ls -l /proc"). The "standalone shell" mode is an easy way to try out busybox; this is a - command shell that calls the builtin applets without needing them to be + command shell that calls the built-in applets without needing them to be installed in the path. (Note that this requires /proc to be mounted, if testing from a boot floppy or in a chroot environment.) @@ -80,7 +80,7 @@ Downloading the current source code: The developers also have a bug and patch tracking system (https://bugs.busybox.net) although posting a bug/patch to the mailing list is generally a faster way of getting it fixed, and the complete archive of - what happened is the subversion changelog. + what happened is the git changelog. Note: if you want to compile busybox in a busybox environment you must select CONFIG_DESKTOP. @@ -169,7 +169,7 @@ Portability: MacOS X, Solaris, Cygwin, or the BSD Fork Du Jour). This generally involves a different kernel and a different C library at the same time. While it should be possible to port the majority of the code to work in one of - these environments, don't be suprised if it doesn't work out of the box. If + these environments, don't be surprised if it doesn't work out of the box. If you're into that sort of thing, start small (selecting just a few applets) and work your way up. diff --git a/TODO b/TODO index 6f8cd8a..dcf48c2 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,8 @@ Busybox TODO Harvest patches from http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/busybox/ +https://dev.openwrt.org/browser/trunk/package/busybox/patches/ + Stuff that needs to be done. This is organized by who plans to get around to doing it eventually, but that doesn't mean they "own" the item. If you want to @@ -82,7 +84,7 @@ Rob Landley suggested this: initramfs Busybox should have a sample initramfs build script. This depends on - bbsh, mdev, and switch_root. + shell, mdev, and switch_root. mkdep Write a mkdep that doesn't segfault if there's a directory it doesn't @@ -125,20 +127,6 @@ patch And while we're at it, a new patch filename quoting format is apparently coming soon: http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 ---- -stty / catv - stty's visible() function and catv's guts are identical. Merge them into - an appropriate libbb function. ---- -struct suffix_mult - Several duplicate users of: grep -r "1024\*1024" * -B2 -A1 - Merge to a single size_suffixes[] in libbb. - Users: head tail od_bloaty hexdump and (partially as it wouldn't hurt) svlogd ---- -tail - ./busybox tail -f foo.c~ TODO - should not print fmt=header_fmt for subsequent date >> TODO; i.e. only - fmt+ if another (not the current) file did change Architectural issues: @@ -232,8 +220,6 @@ Minor stuff: See grep -r strtod Alot of duplication that wants cleanup. --- - in_ether duplicated in network/{interface,ifconfig}.c ---- unify progress_meter. wget, flash_eraseall, pipe_progress, fbsplash, setfiles. --- support start-stop-daemon -d diff --git a/applets/.gitignore b/applets/.gitignore index cc932fc..459938d 100644 --- a/applets/.gitignore +++ b/applets/.gitignore @@ -1,2 +1,3 @@ /applet_tables /usage +/usage_pod diff --git a/applets/Kbuild.src b/applets/Kbuild.src index 31fee8d..b612399 100644 --- a/applets/Kbuild.src +++ b/applets/Kbuild.src @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# Licensed under the GPL v2, see the file LICENSE in this tarball. +# Licensed under GPLv2, see file LICENSE in this source tree. obj-y := obj-y += applets.o @@ -42,3 +42,6 @@ quiet_cmd_gen_applet_tables = GEN include/applet_tables.h include/applet_tables.h: applets/applet_tables $(call cmd,gen_applet_tables) + +include/NUM_APPLETS.h: applets/applet_tables + $(call cmd,gen_applet_tables) diff --git a/applets/applet_tables.c b/applets/applet_tables.c index 338dc20..94b974e 100644 --- a/applets/applet_tables.c +++ b/applets/applet_tables.c @@ -5,15 +5,21 @@ * * Copyright (C) 2007 Denys Vlasenko * - * Licensed under GPLv2, see file License in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ - +#include +#include +#include #include #include #include +#include + +#undef ARRAY_SIZE +#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) #include "../include/autoconf.h" -#include "../include/busybox.h" +#include "../include/applet_metadata.h" struct bb_applet { const char *name; @@ -47,7 +53,7 @@ int main(int argc, char **argv) { int i; int ofs; - unsigned MAX_APPLET_NAME_LEN = 1; +// unsigned MAX_APPLET_NAME_LEN = 1; qsort(applets, NUM_APPLETS, sizeof(applets[0]), cmp_name); @@ -75,7 +81,7 @@ int main(int argc, char **argv) printf("#define NUM_APPLETS %u\n", NUM_APPLETS); if (NUM_APPLETS == 1) { printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name); - printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name); + printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].main); } printf("\n"); @@ -83,8 +89,8 @@ int main(int argc, char **argv) printf("const char applet_names[] ALIGN1 = \"\"\n"); for (i = 0; i < NUM_APPLETS; i++) { printf("\"%s\" \"\\0\"\n", applets[i].name); - if (MAX_APPLET_NAME_LEN < strlen(applets[i].name)) - MAX_APPLET_NAME_LEN = strlen(applets[i].name); +// if (MAX_APPLET_NAME_LEN < strlen(applets[i].name)) +// MAX_APPLET_NAME_LEN = strlen(applets[i].name); } printf(";\n\n"); @@ -124,8 +130,8 @@ int main(int argc, char **argv) printf("};\n"); #endif //printf("#endif /* SKIP_definitions */\n"); - printf("\n"); - printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN); +// printf("\n"); +// printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN); if (argv[2]) { char line_old[80]; diff --git a/applets/applets.c b/applets/applets.c index 6a39962..98c2b44 100644 --- a/applets/applets.c +++ b/applets/applets.c @@ -4,7 +4,7 @@ * * Copyright (C) 2007 Denys Vlasenko * - * Licensed under GPLv2, see file License in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "busybox.h" diff --git a/applets/busybox.mkll b/applets/busybox.mkll index 6d61f7e..68dbf21 100755 --- a/applets/busybox.mkll +++ b/applets/busybox.mkll @@ -14,7 +14,7 @@ CONFIG_H=${1:-include/autoconf.h} APPLETS_H=${2:-include/applets.h} $HOSTCC -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H | awk '/^[ \t]*LINK/{ - dir=substr($2,8) + dir=substr($2,7) gsub("_","/",dir) if(dir=="/ROOT") dir="" file=$3 diff --git a/applets/busybox.mksuid b/applets/busybox.mksuid new file mode 100755 index 0000000..6492c07 --- /dev/null +++ b/applets/busybox.mksuid @@ -0,0 +1,54 @@ +#!/bin/sh +# Make list of configuration variables regarding suid handling + +# input $1: full path to autoconf.h +# input $2: full path to applets.h +# input $3: full path to .config +# output (stdout): list of CONFIG_ that do or may require suid + +# If the environment variable SUID is not set or set to DROP, +# lists all config options that do not require suid permissions. +# Otherwise, lists all config options for applets that DO or MAY require +# suid permissions. + +# Maintainer: Bernhard Reutner-Fischer + +export LC_ALL=POSIX +export LC_CTYPE=POSIX + +CONFIG_H=${1:-include/autoconf.h} +APPLETS_H=${2:-include/applets.h} +DOT_CONFIG=${3:-.config} + +case ${SUID:-DROP} in +[dD][rR][oO][pP]) USE="DROP" ;; +*) USE="suid" ;; +esac + +$HOSTCC -E -DMAKE_SUID -include $CONFIG_H $APPLETS_H | + awk -v USE=${USE} ' + /^SUID[ \t]/{ + if (USE == "DROP") { + if ($2 != "BB_SUID_DROP") next + } else { + if ($2 == "BB_SUID_DROP") next + } + cfg = $NF + gsub("\"", "", cfg) + cfg = substr(cfg, 8) + s[i++] = "CONFIG_" cfg + s[i++] = "CONFIG_FEATURE_" cfg "_.*" + } + END{ + while (getline < ARGV[2]) { + for (j in s) { + if ($0 ~ "^" s[j] "=y$") { + sub(/=.*/, "") + print + if (s[j] !~ /\*$/) delete s[j] # can drop this applet now + } + } + } + } +' - $DOT_CONFIG + diff --git a/applets/individual.c b/applets/individual.c index 341f4d1..4c468df 100644 --- a/applets/individual.c +++ b/applets/individual.c @@ -2,7 +2,7 @@ * * Copyright 2005 Rob Landley $prefix$i - chmod +x $prefix/$i + rm -f "$prefix/$i" + echo "#!/bin/busybox" >"$prefix/$i" + chmod +x "$prefix/$i" fi - echo " $prefix$i" + echo " $prefix/$i" else if [ "$2" = "--hardlinks" ]; then bb_path="$prefix/bin/busybox" @@ -89,20 +92,20 @@ for i in $h; do /sbin) bb_path="../bin/busybox" ;; - /usr/bin|/usr/sbin) + /usr/bin | /usr/sbin) bb_path="../../bin/busybox" ;; *) - echo "Unknown installation directory: $appdir" - exit 1 + echo "Unknown installation directory: $appdir" + exit 1 ;; esac fi - if [ "$noclobber" = "0" ] || [ ! -e "$prefix$i" ]; then - echo " $prefix$i -> $bb_path" - ln $linkopts $bb_path $prefix$i || exit 1 + if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then + echo " $prefix/$i -> $bb_path" + ln $linkopts "$bb_path" "$prefix/$i" || exit 1 else - echo " $prefix$i already exists" + echo " $prefix/$i already exists" fi fi done diff --git a/applets/usage.c b/applets/usage.c index 46adbf4..94520ff 100644 --- a/applets/usage.c +++ b/applets/usage.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2008 Denys Vlasenko. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include #include diff --git a/applets/usage_compressed b/applets/usage_compressed index e1fd0d9..fb6e1c2 100755 --- a/applets/usage_compressed +++ b/applets/usage_compressed @@ -9,14 +9,21 @@ test -x "$loc/usage" || exit 1 test "$SED" || SED=sed test "$DD" || DD=dd +# Some people were bitten by their system lacking a (proper) od +od -v -b /dev/null +if test $? != 0; then + echo 'od tool is not installed or cannot accept "-v -b" options' + exit 1 +fi + exec >"$target.$$" echo '#define UNPACKED_USAGE "" \' -"$loc/usage" | od -v -t x1 \ +"$loc/usage" | od -v -b \ | $SED -e 's/^[^ ]*//' \ -e 's/ //g' \ -e '/^$/d' \ - -e 's/$..$/\\x\1/g' \ + -e 's/$...$/\\\1/g' \ -e 's/^/"/' \ -e 's/$/" \\/' echo '' @@ -32,11 +39,11 @@ echo '#define PACKED_USAGE \' ## -e '/^$/d' \ ## -e 's/$..$$..$/0x\2,0x\1,/g' ## -e 's/$/ \\/' -"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \ +"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -b \ | $SED -e 's/^[^ ]*//' \ -e 's/ //g' \ -e '/^$/d' \ - -e 's/$..$/0x\1,/g' \ + -e 's/$...$/0\1,/g' \ -e 's/$/ \\/' echo '' diff --git a/applets/usage_pod.c b/applets/usage_pod.c index 85a2a8e..0b1c4aa 100644 --- a/applets/usage_pod.c +++ b/applets/usage_pod.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2009 Denys Vlasenko. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include #include @@ -31,8 +31,8 @@ #include "usage.h" #define MAKE_USAGE(aname, usage) { aname, usage }, static struct usage_data { - const char *aname; - const char *usage; + const char *aname; + const char *usage; } usage_array[] = { #include "applets.h" }; diff --git a/applets_sh/README b/applets_sh/README new file mode 100644 index 0000000..9dcd38a --- /dev/null +++ b/applets_sh/README @@ -0,0 +1,5 @@ +This directory contains examples of applets implemented as shell scripts. + +So far these scripts are not hooked to the build system and are not +installed by "make install". If you want to use them, +you need to install them by hand. diff --git a/applets_sh/dos2unix b/applets_sh/dos2unix new file mode 100755 index 0000000..0fd5206 --- /dev/null +++ b/applets_sh/dos2unix @@ -0,0 +1,5 @@ +#!/bin/sh +# TODO: use getopt to avoid parsing options as filenames, +# and to support -- and --help +[ $# -ne 0 ] && DASH_I=-i +sed $DASH_I -e 's/\r$//' "$@" diff --git a/applets_sh/nologin b/applets_sh/nologin new file mode 100755 index 0000000..3768eaa --- /dev/null +++ b/applets_sh/nologin @@ -0,0 +1,4 @@ +#!/bin/sh +cat /etc/nologin.txt 2>/dev/null || echo "This account is not available" +sleep 5 +exit 1 diff --git a/applets_sh/tac b/applets_sh/tac new file mode 100755 index 0000000..c5a8e39 --- /dev/null +++ b/applets_sh/tac @@ -0,0 +1,7 @@ +#!/bin/sh +# TODO: use getopt to avoid parsing options as filenames, +# and to support -- and --help +for i in "$@" +do +sed -e '1!G;h;$!d' "$i" +done diff --git a/applets_sh/unix2dos b/applets_sh/unix2dos new file mode 100755 index 0000000..70e0429 --- /dev/null +++ b/applets_sh/unix2dos @@ -0,0 +1,5 @@ +#!/bin/sh +# TODO: use getopt to avoid parsing options as filenames, +# and to support -- and --help +[ $# -ne 0 ] && DASH_I=-i +sed $DASH_I -e 's/$/\r/' "$@" diff --git a/archival/Config.src b/archival/Config.src index 9a84fd6..76635ba 100644 --- a/archival/Config.src +++ b/archival/Config.src @@ -5,8 +5,6 @@ menu "Archival Utilities" -INSERT - config FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" default y @@ -32,348 +30,11 @@ config FEATURE_SEAMLESS_GZ Make tar, rpm, modprobe etc understand .gz data. config FEATURE_SEAMLESS_Z - bool "Make tar and gunzip understand .Z data" - default n - help - Make tar and gunzip understand .Z data. - -config AR - bool "ar" - default n # needs to be improved to be able to replace binutils ar - help - ar is an archival utility program used to create, modify, and - extract contents from archives. An archive is a single file holding - a collection of other files in a structure that makes it possible to - retrieve the original individual files (called archive members). - The original files' contents, mode (permissions), timestamp, owner, - and group are preserved in the archive, and can be restored on - extraction. - - The stored filename is limited to 15 characters. (for more information - see long filename support). - ar has 60 bytes of overheads for every stored file. - - This implementation of ar can extract archives, it cannot create or - modify them. - On an x86 system, the ar applet adds about 1K. - - Unless you have a specific application which requires ar, you should - probably say N here. - -config FEATURE_AR_LONG_FILENAMES - bool "Support for long filenames (not needed for debs)" - default y - depends on AR - help - 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. - -config FEATURE_AR_CREATE - bool "Support archive creation" - default y - depends on AR - help - This enables archive creation (-c and -r) with busybox ar. - -config BUNZIP2 - bool "bunzip2" - default y - help - bunzip2 is a compression utility using the Burrows-Wheeler block - sorting text compression algorithm, and Huffman coding. Compression - is generally considerably better than that achieved by more - conventional LZ77/LZ78-based compressors, and approaches the - performance of the PPM family of statistical compressors. - - Unless you have a specific application which requires bunzip2, you - should probably say N here. - -config BZIP2 - bool "bzip2" - default y - help - bzip2 is a compression utility using the Burrows-Wheeler block - sorting text compression algorithm, and Huffman coding. Compression - is generally considerably better than that achieved by more - conventional LZ77/LZ78-based compressors, and approaches the - performance of the PPM family of statistical compressors. - - Unless you have a specific application which requires bzip2, you - should probably say N here. - -config CPIO - bool "cpio" - default y - help - cpio is an archival utility program used to create, modify, and - extract contents from archives. - cpio has 110 bytes of overheads for every stored file. - - This implementation of cpio can extract cpio archives created in the - "newc" or "crc" format, it cannot create or modify them. - - Unless you have a specific application which requires cpio, you - should probably say N here. - -config FEATURE_CPIO_O - bool "Support for archive creation" - default y - depends on CPIO - help - This implementation of cpio can create cpio archives in the "newc" - format only. - -config FEATURE_CPIO_P - bool "Support for passthrough mode" - default y - depends on FEATURE_CPIO_O - help - Passthrough mode. Rarely used. - -config DPKG - bool "dpkg" - default n - select FEATURE_SEAMLESS_GZ - help - dpkg is a medium-level tool to install, build, remove and manage - Debian packages. - - This implementation of dpkg has a number of limitations, - you should use the official dpkg if possible. - -config DPKG_DEB - bool "dpkg_deb" - default n - select FEATURE_SEAMLESS_GZ - help - dpkg-deb unpacks and provides information about Debian archives. - - This implementation of dpkg-deb cannot pack archives. - - Unless you have a specific application which requires dpkg-deb, - say N here. - -config FEATURE_DPKG_DEB_EXTRACT_ONLY - bool "Extract only (-x)" - default n - depends on DPKG_DEB - help - This reduces dpkg-deb to the equivalent of - "ar -p data.tar.gz | tar -zx". However it saves space as none - of the extra dpkg-deb, ar or tar options are needed, they are linked - to internally. - -config GUNZIP - bool "gunzip" - default y - help - gunzip is used to decompress archives created by gzip. - You can use the `-t' option to test the integrity of - an archive, without decompressing it. - -config GZIP - bool "gzip" - default y - help - gzip is used to compress files. - It's probably the most widely used UNIX compression program. - -config FEATURE_GZIP_LONG_OPTIONS - bool "Enable long options" - default y - depends on GZIP && LONG_OPTS - help - Enable use of long options, increases size by about 106 Bytes - -config LZOP - bool "lzop" - default y - help - Lzop compression/decompresion. - -config LZOP_COMPR_HIGH - bool "lzop complession levels 7,8,9 (not very useful)" - default n - depends on LZOP - help - High levels (7,8,9) of lzop compression. These levels - are actually slower than gzip at equivalent compression ratios - and take up 3.2K of code. - -config RPM2CPIO - bool "rpm2cpio" - default y - help - Converts an RPM file into a CPIO archive. - -config RPM - bool "rpm" - default y - help - Mini RPM applet - queries and extracts RPM packages. - -config TAR - bool "tar" - default y - help - tar is an archiving program. It's commonly used with gzip to - create compressed archives. It's probably the most widely used - UNIX archive program. - -config FEATURE_TAR_CREATE - bool "Enable archive creation" - default y - depends on TAR - help - If you enable this option you'll be able to create - tar archives using the `-c' option. - -config FEATURE_TAR_AUTODETECT - bool "Autodetect compressed tarballs" - default y - depends on TAR && (FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA || FEATURE_SEAMLESS_XZ) - help - With this option tar can automatically detect compressed - tarballs. Currently it works only on files (not pipes etc). - -config FEATURE_TAR_FROM - bool "Enable -X (exclude from) and -T (include from) options)" - default y - depends on TAR - help - If you enable this option you'll be able to specify - a list of files to include or exclude from an archive. - -config FEATURE_TAR_OLDGNU_COMPATIBILITY - bool "Support for old tar header format" - default y - depends on TAR || DPKG - help - This option is required to unpack archives created in - the old GNU format; help to kill this old format by - repacking your ancient archives with the new format. - -config FEATURE_TAR_OLDSUN_COMPATIBILITY - bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" - default y - depends on TAR || DPKG - help - This option is required to unpack archives created by some old - version of Sun's tar (it was calculating checksum using signed - arithmetic). It is said to be fixed in newer Sun tar, but "old" - tarballs still exist. - -config FEATURE_TAR_GNU_EXTENSIONS - bool "Support for GNU tar extensions (long filenames)" - default y - depends on TAR || DPKG - help - With this option busybox supports GNU long filenames and - linknames. - -config FEATURE_TAR_LONG_OPTIONS - bool "Enable long options" - default y - depends on TAR && LONG_OPTS - help - Enable use of long options, increases size by about 400 Bytes - -config FEATURE_TAR_TO_COMMAND - bool "Support for writing to an external program" - default y - depends on TAR && FEATURE_TAR_LONG_OPTIONS - help - If you enable this option you'll be able to instruct tar to send - the contents of each extracted file to the standard input of an - external program. - -config FEATURE_TAR_UNAME_GNAME - bool "Enable use of user and group names" - default y - depends on TAR - help - Enables use of user and group names in tar. This affects contents - listings (-t) and preserving permissions when unpacking (-p). - +200 bytes. - -config FEATURE_TAR_NOPRESERVE_TIME - bool "Enable -m (do not preserve time) option" - default y - depends on TAR - help - With this option busybox supports GNU tar -m - (do not preserve time) option. - -config FEATURE_TAR_SELINUX - bool "Support for extracting SELinux labels" + bool "tar, rpm, modprobe etc understand .Z data" default n - depends on TAR && SELINUX help - With this option busybox supports restoring SELinux labels - when extracting files from tar archives. - -config UNCOMPRESS - bool "uncompress" - default n - help - uncompress is used to decompress archives created by compress. - Not much used anymore, replaced by gzip/gunzip. - -config UNLZMA - bool "unlzma" - default y - help - unlzma is a compression utility using the Lempel-Ziv-Markov chain - compression algorithm, and range coding. Compression - is generally considerably better than that achieved by the bzip2 - compressors. - - The BusyBox unlzma applet is limited to de-compression only. - On an x86 system, this applet adds about 4K. - - Unless you have a specific application which requires unlzma, you - should probably say N here. + Make tar, rpm, modprobe etc understand .Z data. -config FEATURE_LZMA_FAST - bool "Optimize unlzma for speed" - default y - depends on UNLZMA - help - This option reduces decompression time by about 25% at the cost of - a 1K bigger binary. - -config LZMA - bool "Provide lzma alias which supports only unpacking" - default y - depends on UNLZMA - help - Enable this option if you want commands like "lzma -d" to work. - IOW: you'll get lzma applet, but it will always require -d option. - -config UNXZ - bool "unxz" - default y - help - unxz is a unlzma successor. - -config XZ - bool "Provide xz alias which supports only unpacking" - default y - depends on UNXZ - help - Enable this option if you want commands like "xz -d" to work. - IOW: you'll get xz applet, but it will always require -d option. - -config UNZIP - bool "unzip" - default y - help - unzip will list or extract files from a ZIP archive, - commonly found on DOS/WIN systems. The default behavior - (with no options) is to extract the archive into the - current directory. Use the `-d' option to extract to a - directory of your choice. +INSERT endmenu diff --git a/archival/Kbuild.src b/archival/Kbuild.src index 076e582..a6fd2ea 100644 --- a/archival/Kbuild.src +++ b/archival/Kbuild.src @@ -2,30 +2,10 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# Licensed under the GPL v2, see the file LICENSE in this tarball. +# Licensed under GPLv2, see file LICENSE in this source tree. -libs-y += libunarchive/ +libs-y += libarchive/ lib-y:= INSERT - -lib-$(CONFIG_AR) += ar.o -lib-$(CONFIG_CPIO) += cpio.o -lib-$(CONFIG_DPKG) += dpkg.o -lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o -lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o -lib-$(CONFIG_RPM) += rpm.o -lib-$(CONFIG_TAR) += tar.o -lib-$(CONFIG_UNZIP) += unzip.o - -lib-$(CONFIG_LZOP) += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o -lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o -lib-$(CONFIG_GZIP) += gzip.o bbunzip.o -lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o - -lib-$(CONFIG_UNXZ) += bbunzip.o -lib-$(CONFIG_UNLZMA) += bbunzip.o -lib-$(CONFIG_BUNZIP2) += bbunzip.o -lib-$(CONFIG_GUNZIP) += bbunzip.o -lib-$(CONFIG_UNCOMPRESS) += bbunzip.o diff --git a/archival/ar.c b/archival/ar.c index 1b7b66a..f86c52d 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -6,7 +6,7 @@ * * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Archive creation support: * Copyright (C) 2010 Nokia Corporation. All rights reserved. @@ -17,8 +17,61 @@ * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html */ +//config:config AR +//config: bool "ar" +//config: default n # needs to be improved to be able to replace binutils ar +//config: help +//config: ar is an archival utility program used to create, modify, and +//config: extract contents from archives. An archive is a single file holding +//config: a collection of other files in a structure that makes it possible to +//config: retrieve the original individual files (called archive members). +//config: The original files' contents, mode (permissions), timestamp, owner, +//config: and group are preserved in the archive, and can be restored on +//config: extraction. +//config: +//config: The stored filename is limited to 15 characters. (for more information +//config: see long filename support). +//config: ar has 60 bytes of overheads for every stored file. +//config: +//config: This implementation of ar can extract archives, it cannot create or +//config: modify them. +//config: On an x86 system, the ar applet adds about 1K. +//config: +//config: Unless you have a specific application which requires ar, you should +//config: probably say N here. +//config: +//config:config FEATURE_AR_LONG_FILENAMES +//config: bool "Support for long filenames (not needed for debs)" +//config: default y +//config: depends on AR +//config: help +//config: By default the ar format can only store the first 15 characters +//config: of the filename, this option removes that limitation. +//config: It supports the GNU ar long filename method which moves multiple long +//config: filenames into a the data section of a new ar entry. +//config: +//config:config FEATURE_AR_CREATE +//config: bool "Support archive creation" +//config: default y +//config: depends on AR +//config: help +//config: This enables archive creation (-c and -r) with busybox ar. + +//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_AR) += ar.o + +//usage:#define ar_trivial_usage +//usage: "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES" +//usage:#define ar_full_usage "\n\n" +//usage: "Extract or list FILES from an ar archive\n" +//usage: "\n -o Preserve original dates" +//usage: "\n -p Extract to stdout" +//usage: "\n -t List" +//usage: "\n -x Extract" +//usage: "\n -v Verbose" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #include "ar.h" #if ENABLE_FEATURE_AR_CREATE @@ -71,7 +124,7 @@ static void output_ar_header(archive_handle_t *handle) } /* - * when replacing files in an existing archive, copy from the the + * when replacing files in an existing archive, copy from the * original archive those files that are to be left intact */ static void FAST_FUNC copy_data(archive_handle_t *handle) @@ -123,8 +176,7 @@ static int write_ar_archive(archive_handle_t *handle) struct stat st; archive_handle_t *out_handle; - if (fstat(handle->src_fd, &st) == -1) - bb_simple_perror_msg_and_die(handle->ar__name); + xfstat(handle->src_fd, &st, handle->ar__name); /* if archive exists, create a new handle for output. * we create it in place of the old one. @@ -180,17 +232,17 @@ static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header) ); } -#define AR_OPT_VERBOSE (1 << 0) -#define AR_OPT_PRESERVE_DATE (1 << 1) +#define AR_OPT_VERBOSE (1 << 0) +#define AR_OPT_PRESERVE_DATE (1 << 1) /* "ar r" implies create, but warns about it. c suppresses warning. * bbox accepts but ignores it: */ -#define AR_OPT_CREATE (1 << 2) +#define AR_OPT_CREATE (1 << 2) -#define AR_CMD_PRINT (1 << 3) -#define FIRST_CMD AR_CMD_PRINT -#define AR_CMD_LIST (1 << 4) -#define AR_CMD_EXTRACT (1 << 5) -#define AR_CMD_INSERT (1 << 6) +#define AR_CMD_PRINT (1 << 3) +#define FIRST_CMD AR_CMD_PRINT +#define AR_CMD_LIST (1 << 4) +#define AR_CMD_EXTRACT (1 << 5) +#define AR_CMD_INSERT (1 << 6) int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ar_main(int argc UNUSED_PARAM, char **argv) diff --git a/archival/bbunzip.c b/archival/bbunzip.c index c1259ac..b3fb90f 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -1,19 +1,25 @@ /* vi: set sw=4 ts=4: */ /* - * Common code for gunzip-like applets + * Common code for gunzip-like applets * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" +/* lzop_main() uses bbunpack(), need this: */ +//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o + +/* Note: must be kept in sync with archival/lzop.c */ enum { OPT_STDOUT = 1 << 0, OPT_FORCE = 1 << 1, /* only some decompressors: */ OPT_VERBOSE = 1 << 2, - OPT_DECOMPRESS = 1 << 3, - OPT_TEST = 1 << 4, + OPT_QUIET = 1 << 3, + OPT_DECOMPRESS = 1 << 4, + OPT_TEST = 1 << 5, + SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION, }; static @@ -33,16 +39,16 @@ char* FAST_FUNC append_ext(char *filename, const char *expected_ext) } int FAST_FUNC bbunpack(char **argv, - IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(unpack_info_t *info), + IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux), char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext), const char *expected_ext ) { struct stat stat_buf; - IF_DESKTOP(long long) int status; + IF_DESKTOP(long long) int status = 0; char *filename, *new_name; smallint exitcode = 0; - unpack_info_t info; + transformer_aux_data_t aux; do { /* NB: new_name is *maybe* malloc'ed! */ @@ -54,13 +60,27 @@ int FAST_FUNC bbunpack(char **argv, /* Open src */ if (filename) { - if (stat(filename, &stat_buf) != 0) { - bb_simple_perror_msg(filename); + if (!(option_mask32 & SEAMLESS_MAGIC)) { + if (stat(filename, &stat_buf) != 0) { + err_name: + bb_simple_perror_msg(filename); err: - exitcode = 1; - goto free_name; + exitcode = 1; + goto free_name; + } + if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0)) + goto err; + } else { + /* "clever zcat" with FILE */ + int fd = open_zipped(filename); + if (fd < 0) + goto err_name; + xmove_fd(fd, STDIN_FILENO); } - if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0)) + } else + if (option_mask32 & SEAMLESS_MAGIC) { + /* "clever zcat" on stdin */ + if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_detected*/ 0)) goto err; } @@ -68,7 +88,7 @@ int FAST_FUNC bbunpack(char **argv, if (option_mask32 & (OPT_STDOUT|OPT_TEST)) { if (option_mask32 & OPT_TEST) if (open_to_or_warn(STDOUT_FILENO, bb_dev_null, O_WRONLY, 0)) - goto err; + xfunc_die(); filename = NULL; } @@ -93,26 +113,37 @@ int FAST_FUNC bbunpack(char **argv, } /* Check that the input is sane */ - if (isatty(STDIN_FILENO) && (option_mask32 & OPT_FORCE) == 0) { + if (!(option_mask32 & OPT_FORCE) && isatty(STDIN_FILENO)) { bb_error_msg_and_die("compressed data not read from terminal, " "use -f to force it"); } - /* memset(&info, 0, sizeof(info)); */ - info.mtime = 0; /* so far it has one member only */ - status = unpacker(&info); - if (status < 0) - exitcode = 1; - xclose(STDOUT_FILENO); /* with error check! */ + if (!(option_mask32 & SEAMLESS_MAGIC)) { + init_transformer_aux_data(&aux); + aux.check_signature = 1; + status = unpacker(&aux); + if (status < 0) + exitcode = 1; + } else { + if (bb_copyfd_eof(STDIN_FILENO, STDOUT_FILENO) < 0) + /* Disk full, tty closed, etc. No point in continuing */ + xfunc_die(); + } + + if (!(option_mask32 & OPT_STDOUT)) + xclose(STDOUT_FILENO); /* with error check! */ if (filename) { char *del = new_name; + if (status >= 0) { + unsigned new_name_len; + /* TODO: restore other things? */ - if (info.mtime) { + if (aux.mtime != 0) { struct timeval times[2]; - times[1].tv_sec = times[0].tv_sec = info.mtime; + times[1].tv_sec = times[0].tv_sec = aux.mtime; times[1].tv_usec = times[0].tv_usec = 0; /* Note: we closed it first. * On some systems calling utimes @@ -121,28 +152,38 @@ int FAST_FUNC bbunpack(char **argv, utimes(new_name, times); /* ignoring errors */ } - /* Delete _compressed_ file */ + if (ENABLE_DESKTOP) + new_name_len = strlen(new_name); + /* Restore source filename (unless tgz -> tar case) */ + if (new_name == filename) { + new_name_len = strlen(filename); + filename[new_name_len] = '.'; + } + /* Extreme bloat for gunzip compat */ + /* Some users do want this info... */ + if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE)) { + unsigned percent = status + ? ((uoff_t)stat_buf.st_size * 100u / (unsigned long long)status) + : 0; + fprintf(stderr, "%s: %u%% - replaced with %.*s\n", + filename, + 100u - percent, + new_name_len, new_name + ); + } + /* Delete _source_ file */ del = filename; - /* restore extension (unless tgz -> tar case) */ - if (new_name == filename) - filename[strlen(filename)] = '.'; } xunlink(del); - -#if 0 /* Currently buggy - wrong name: "a.gz: 261% - replaced with a.gz" */ - /* Extreme bloat for gunzip compat */ - if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE) && status >= 0) { - fprintf(stderr, "%s: %u%% - replaced with %s\n", - filename, (unsigned)(stat_buf.st_size*100 / (status+1)), new_name); - } -#endif - free_name: if (new_name != filename) free(new_name); } } while (*argv && *++argv); + if (option_mask32 & OPT_STDOUT) + xclose(STDOUT_FILENO); /* with error check! */ + return exitcode; } @@ -165,20 +206,29 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) /* * Uncompress applet for busybox (c) 2002 Glenn McGrath * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define uncompress_trivial_usage +//usage: "[-cf] [FILE]..." +//usage:#define uncompress_full_usage "\n\n" +//usage: "Decompress .Z file[s]\n" +//usage: "\n -c Write to stdout" +//usage: "\n -f Overwrite" + +//config:config UNCOMPRESS +//config: bool "uncompress" +//config: default n +//config: help +//config: uncompress is used to decompress archives created by compress. +//config: Not much used anymore, replaced by gzip/gunzip. + +//applet:IF_UNCOMPRESS(APPLET(uncompress, BB_DIR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o #if ENABLE_UNCOMPRESS static -IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(transformer_aux_data_t *aux) { - IF_DESKTOP(long long) int status = -1; - - if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) { - bb_error_msg("invalid magic"); - } else { - status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO); - } - return status; + return unpack_Z_stream(aux, STDIN_FILENO, STDOUT_FILENO); } int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int uncompress_main(int argc UNUSED_PARAM, char **argv) @@ -206,7 +256,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) * General cleanup to better adhere to the style guide and make use of standard * busybox functions by Glenn McGrath * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface * Copyright (C) 1992-1993 Jean-loup Gailly @@ -214,10 +264,39 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) * Portions of the lzw code are derived from the public domain 'compress' * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies, * Ken Turkowski, Dave Mack and Peter Jannesen. - * - * See the license_msg below and the file COPYING for the software license. - * See the file algorithm.doc for the compression algorithms and file formats. */ +//usage:#define gunzip_trivial_usage +//usage: "[-cft] [FILE]..." +//usage:#define gunzip_full_usage "\n\n" +//usage: "Decompress FILEs (or stdin)\n" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: "\n -t Test file integrity" +//usage: +//usage:#define gunzip_example_usage +//usage: "$ ls -la /tmp/BusyBox*\n" +//usage: "-rw-rw-r-- 1 andersen andersen 557009 Apr 11 10:55 /tmp/BusyBox-0.43.tar.gz\n" +//usage: "$ gunzip /tmp/BusyBox-0.43.tar.gz\n" +//usage: "$ ls -la /tmp/BusyBox*\n" +//usage: "-rw-rw-r-- 1 andersen andersen 1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n" +//usage: +//usage:#define zcat_trivial_usage +//usage: "[FILE]..." +//usage:#define zcat_full_usage "\n\n" +//usage: "Decompress to stdout" + +//config:config GUNZIP +//config: bool "gunzip" +//config: default y +//config: help +//config: gunzip is used to decompress archives created by gzip. +//config: You can use the `-t' option to test the integrity of +//config: an archive, without decompressing it. + +//applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) +//applet:IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) +//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o +//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o #if ENABLE_GUNZIP static char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM) @@ -245,31 +324,9 @@ char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UN return filename; } static -IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(unpack_info_t *info) +IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_aux_data_t *aux) { - IF_DESKTOP(long long) int status = -1; - - /* do the decompression, and cleanup */ - if (xread_char(STDIN_FILENO) == 0x1f) { - unsigned char magic2; - - magic2 = xread_char(STDIN_FILENO); - if (ENABLE_FEATURE_SEAMLESS_Z && magic2 == 0x9d) { - status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO); - } else if (magic2 == 0x8b) { - status = unpack_gz_stream_with_info(STDIN_FILENO, STDOUT_FILENO, info); - } else { - goto bad_magic; - } - if (status < 0) { - bb_error_msg("error inflating"); - } - } else { - bad_magic: - bb_error_msg("invalid magic"); - /* status is still == -1 */ - } - return status; + return unpack_gz_stream(aux, STDIN_FILENO, STDOUT_FILENO); } /* * Linux kernel build uses gzip -d -n. We accept and ignore it. @@ -287,11 +344,15 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(unpack_info_t *info) int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int gunzip_main(int argc UNUSED_PARAM, char **argv) { - getopt32(argv, "cfvdtn"); + getopt32(argv, "cfvqdtn"); argv += optind; - /* if called as zcat */ + + /* If called as zcat... + * Normally, "zcat" is just "gunzip -c". + * But if seamless magic is enabled, then we are much more clever. + */ if (applet_name[1] == 'c') - option_mask32 |= OPT_STDOUT; + option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC; return bbunpack(argv, unpack_gunzip, make_new_name_gunzip, /*unused:*/ NULL); } @@ -302,31 +363,46 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv) * Modified for busybox by Glenn McGrath * Added support output to stdout by Thomas Lundquist * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ //usage:#define bunzip2_trivial_usage -//usage: "[OPTIONS] [FILE]..." +//usage: "[-cf] [FILE]..." //usage:#define bunzip2_full_usage "\n\n" //usage: "Decompress FILEs (or stdin)\n" -//usage: "\nOptions:" //usage: "\n -c Write to stdout" //usage: "\n -f Force" //usage:#define bzcat_trivial_usage -//usage: "FILE" +//usage: "[FILE]..." //usage:#define bzcat_full_usage "\n\n" //usage: "Decompress to stdout" -//applet:IF_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP)) -//applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP, bzcat)) + +//config:config BUNZIP2 +//config: bool "bunzip2" +//config: default y +//config: help +//config: bunzip2 is a compression utility using the Burrows-Wheeler block +//config: sorting text compression algorithm, and Huffman coding. Compression +//config: is generally considerably better than that achieved by more +//config: conventional LZ77/LZ78-based compressors, and approaches the +//config: performance of the PPM family of statistical compressors. +//config: +//config: Unless you have a specific application which requires bunzip2, you +//config: should probably say N here. + +//applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) +//applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) +//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o +//kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o #if ENABLE_BUNZIP2 static -IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux) { - return unpack_bz2_stream_prime(STDIN_FILENO, STDOUT_FILENO); + return unpack_bz2_stream(aux, STDIN_FILENO, STDOUT_FILENO); } int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bunzip2_main(int argc UNUSED_PARAM, char **argv) { - getopt32(argv, "cfvdt"); + getopt32(argv, "cfvqdt"); argv += optind; if (applet_name[2] == 'c') /* bzcat */ option_mask32 |= OPT_STDOUT; @@ -342,18 +418,90 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) * * Based on bunzip.c from busybox * - * Licensed under GPL v2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ +//usage:#define unlzma_trivial_usage +//usage: "[-cf] [FILE]..." +//usage:#define unlzma_full_usage "\n\n" +//usage: "Decompress FILE (or stdin)\n" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define lzma_trivial_usage +//usage: "-d [-cf] [FILE]..." +//usage:#define lzma_full_usage "\n\n" +//usage: "Decompress FILE (or stdin)\n" +//usage: "\n -d Decompress" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define lzcat_trivial_usage +//usage: "[FILE]..." +//usage:#define lzcat_full_usage "\n\n" +//usage: "Decompress to stdout" +//usage: +//usage:#define unxz_trivial_usage +//usage: "[-cf] [FILE]..." +//usage:#define unxz_full_usage "\n\n" +//usage: "Decompress FILE (or stdin)\n" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define xz_trivial_usage +//usage: "-d [-cf] [FILE]..." +//usage:#define xz_full_usage "\n\n" +//usage: "Decompress FILE (or stdin)\n" +//usage: "\n -d Decompress" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define xzcat_trivial_usage +//usage: "[FILE]..." +//usage:#define xzcat_full_usage "\n\n" +//usage: "Decompress to stdout" + +//config:config UNLZMA +//config: bool "unlzma" +//config: default y +//config: help +//config: unlzma is a compression utility using the Lempel-Ziv-Markov chain +//config: compression algorithm, and range coding. Compression +//config: is generally considerably better than that achieved by the bzip2 +//config: compressors. +//config: +//config: The BusyBox unlzma applet is limited to decompression only. +//config: On an x86 system, this applet adds about 4K. +//config: +//config:config FEATURE_LZMA_FAST +//config: bool "Optimize unlzma for speed" +//config: default n +//config: depends on UNLZMA +//config: help +//config: This option reduces decompression time by about 25% at the cost of +//config: a 1K bigger binary. +//config: +//config:config LZMA +//config: bool "Provide lzma alias which supports only unpacking" +//config: default y +//config: depends on UNLZMA +//config: help +//config: Enable this option if you want commands like "lzma -d" to work. +//config: IOW: you'll get lzma applet, but it will always require -d option. + +//applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) +//applet:IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) +//applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) +//kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o #if ENABLE_UNLZMA static -IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux) { - return unpack_lzma_stream(STDIN_FILENO, STDOUT_FILENO); + return unpack_lzma_stream(aux, STDIN_FILENO, STDOUT_FILENO); } int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int unlzma_main(int argc UNUSED_PARAM, char **argv) { - IF_LZMA(int opts =) getopt32(argv, "cfvdt"); + IF_LZMA(int opts =) getopt32(argv, "cfvqdt"); # if ENABLE_LZMA /* lzma without -d or -t? */ if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) @@ -369,25 +517,34 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) #endif +//config:config UNXZ +//config: bool "unxz" +//config: default y +//config: help +//config: unxz is a unlzma successor. +//config: +//config:config XZ +//config: bool "Provide xz alias which supports only unpacking" +//config: default y +//config: depends on UNXZ +//config: help +//config: Enable this option if you want commands like "xz -d" to work. +//config: IOW: you'll get xz applet, but it will always require -d option. + +//applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP)) +//applet:IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat)) +//applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) +//kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o #if ENABLE_UNXZ static -IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux) { - struct { - uint32_t v1; - uint16_t v2; - } magic; - xread(STDIN_FILENO, &magic, 6); - if (magic.v1 != XZ_MAGIC1a || magic.v2 != XZ_MAGIC2a) { - bb_error_msg("invalid magic"); - return -1; - } - return unpack_xz_stream(STDIN_FILENO, STDOUT_FILENO); + return unpack_xz_stream(aux, STDIN_FILENO, STDOUT_FILENO); } int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int unxz_main(int argc UNUSED_PARAM, char **argv) { - IF_XZ(int opts =) getopt32(argv, "cfvdt"); + IF_XZ(int opts =) getopt32(argv, "cfvqdt"); # if ENABLE_XZ /* xz without -d or -t? */ if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST))) diff --git a/archival/bzip2.c b/archival/bzip2.c index fdb8b93..f7718b4 100644 --- a/archival/bzip2.c +++ b/archival/bzip2.c @@ -7,10 +7,35 @@ * about bzip2 library code. */ +//config:config BZIP2 +//config: bool "bzip2" +//config: default y +//config: help +//config: bzip2 is a compression utility using the Burrows-Wheeler block +//config: sorting text compression algorithm, and Huffman coding. Compression +//config: is generally considerably better than that achieved by more +//config: conventional LZ77/LZ78-based compressors, and approaches the +//config: performance of the PPM family of statistical compressors. +//config: +//config: Unless you have a specific application which requires bzip2, you +//config: should probably say N here. + +//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o + +//usage:#define bzip2_trivial_usage +//usage: "[OPTIONS] [FILE]..." +//usage:#define bzip2_full_usage "\n\n" +//usage: "Compress FILEs (or stdin) with bzip2 algorithm\n" +//usage: "\n -1..9 Compression level" +//usage: "\n -d Decompress" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" -#define CONFIG_BZIP2_FEATURE_SPEED 1 +#define CONFIG_BZIP2_FAST 1 /* Speed test: * Compiled with gcc 4.2.1, run on Athlon 64 1800 MHz (512K L2 cache). @@ -18,7 +43,7 @@ * (time to compress gcc-4.2.1.tar is 126.4% compared to bbox). * At SPEED 5 difference is 32.7%. * - * Test run of all CONFIG_BZIP2_FEATURE_SPEED values on a 11Mb text file: + * Test run of all CONFIG_BZIP2_FAST values on a 11Mb text file: * Size Time (3 runs) * 0: 10828 4.145 4.146 4.148 * 1: 11097 3.845 3.860 3.861 @@ -33,14 +58,14 @@ /* Takes ~300 bytes, detects corruption caused by bad RAM etc */ #define BZ_LIGHT_DEBUG 0 -#include "bz/bzlib.h" +#include "libarchive/bz/bzlib.h" -#include "bz/bzlib_private.h" +#include "libarchive/bz/bzlib_private.h" -#include "bz/blocksort.c" -#include "bz/bzlib.c" -#include "bz/compress.c" -#include "bz/huffman.c" +#include "libarchive/bz/blocksort.c" +#include "libarchive/bz/bzlib.c" +#include "libarchive/bz/compress.c" +#include "libarchive/bz/huffman.c" /* No point in being shy and having very small buffer here. * bzip2 internal buffers are much bigger anyway, hundreds of kbytes. @@ -102,7 +127,7 @@ IF_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, vo } static -IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int FAST_FUNC compressStream(transformer_aux_data_t *aux UNUSED_PARAM) { IF_DESKTOP(long long) int total; ssize_t count; @@ -128,10 +153,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA break; } -#if ENABLE_FEATURE_CLEAN_UP + /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP - + * we are called repeatedly + */ BZ2_bzCompressEnd(strm); free(iobuf); -#endif + return total; } diff --git a/archival/cpio.c b/archival/cpio.c index e0ca7fa..1cce7c8 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -4,15 +4,75 @@ * * Copyright (C) 2001 by Glenn McGrath * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Limitations: * Doesn't check CRC's * Only supports new ASCII and CRC formats - * */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" + +//config:config CPIO +//config: bool "cpio" +//config: default y +//config: help +//config: cpio is an archival utility program used to create, modify, and +//config: extract contents from archives. +//config: cpio has 110 bytes of overheads for every stored file. +//config: +//config: This implementation of cpio can extract cpio archives created in the +//config: "newc" or "crc" format, it cannot create or modify them. +//config: +//config: Unless you have a specific application which requires cpio, you +//config: should probably say N here. +//config: +//config:config FEATURE_CPIO_O +//config: bool "Support for archive creation" +//config: default y +//config: depends on CPIO +//config: help +//config: This implementation of cpio can create cpio archives in the "newc" +//config: format only. +//config: +//config:config FEATURE_CPIO_P +//config: bool "Support for passthrough mode" +//config: default y +//config: depends on FEATURE_CPIO_O +//config: help +//config: Passthrough mode. Rarely used. + +//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_CPIO) += cpio.o + +//usage:#define cpio_trivial_usage +//usage: "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") +//usage: " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]") +//usage: " [EXTR_FILE]..." +//usage:#define cpio_full_usage "\n\n" +//usage: "Extract or list files from a cpio archive" +//usage: IF_FEATURE_CPIO_O(", or" +//usage: "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") +//usage: " using file list on stdin" +//usage: ) +//usage: "\n" +//usage: "\nMain operation mode:" +//usage: "\n -t List" +//usage: "\n -i Extract EXTR_FILEs (or all)" +//usage: IF_FEATURE_CPIO_O( +//usage: "\n -o Create (requires -H newc)" +//usage: ) +//usage: IF_FEATURE_CPIO_P( +//usage: "\n -p DIR Copy files to DIR" +//usage: ) +//usage: "\n -d Make leading directories" +//usage: "\n -m Preserve mtime" +//usage: "\n -v Verbose" +//usage: "\n -u Overwrite" +//usage: "\n -F FILE Input (-t,-i,-p) or output (-o) file" +//usage: IF_FEATURE_CPIO_O( +//usage: "\n -H newc Archive format" +//usage: ) /* GNU cpio 2.9 --help (abridged): @@ -20,7 +80,7 @@ -t, --list List the archive -i, --extract Extract files from an archive -o, --create Create the archive - -p, --pass-through Copy-pass mode [was ist das?!] + -p, --pass-through Copy-pass mode Options valid in any mode: --block-size=SIZE I/O block size = SIZE * 512 bytes @@ -78,27 +138,28 @@ --sparse Write files with blocks of zeros as sparse files -u, --unconditional Replace all files unconditionally */ + enum { - CPIO_OPT_EXTRACT = (1 << 0), - CPIO_OPT_TEST = (1 << 1), - CPIO_OPT_NUL_TERMINATED = (1 << 2), - CPIO_OPT_UNCONDITIONAL = (1 << 3), - CPIO_OPT_VERBOSE = (1 << 4), - CPIO_OPT_CREATE_LEADING_DIR = (1 << 5), - CPIO_OPT_PRESERVE_MTIME = (1 << 6), - CPIO_OPT_DEREF = (1 << 7), - CPIO_OPT_FILE = (1 << 8), + OPT_EXTRACT = (1 << 0), + OPT_TEST = (1 << 1), + OPT_NUL_TERMINATED = (1 << 2), + OPT_UNCONDITIONAL = (1 << 3), + OPT_VERBOSE = (1 << 4), + OPT_CREATE_LEADING_DIR = (1 << 5), + OPT_PRESERVE_MTIME = (1 << 6), + OPT_DEREF = (1 << 7), + OPT_FILE = (1 << 8), OPTBIT_FILE = 8, IF_FEATURE_CPIO_O(OPTBIT_CREATE ,) IF_FEATURE_CPIO_O(OPTBIT_FORMAT ,) IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,) IF_LONG_OPTS( OPTBIT_QUIET ,) IF_LONG_OPTS( OPTBIT_2STDOUT ,) - CPIO_OPT_CREATE = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE )) + 0, - CPIO_OPT_FORMAT = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT )) + 0, - CPIO_OPT_PASSTHROUGH = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0, - CPIO_OPT_QUIET = IF_LONG_OPTS( (1 << OPTBIT_QUIET )) + 0, - CPIO_OPT_2STDOUT = IF_LONG_OPTS( (1 << OPTBIT_2STDOUT )) + 0, + OPT_CREATE = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE )) + 0, + OPT_FORMAT = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT )) + 0, + OPT_PASSTHROUGH = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0, + OPT_QUIET = IF_LONG_OPTS( (1 << OPTBIT_QUIET )) + 0, + OPT_2STDOUT = IF_LONG_OPTS( (1 << OPTBIT_2STDOUT )) + 0, }; #define OPTION_STR "it0uvdmLF:" @@ -138,7 +199,7 @@ static NOINLINE int cpio_o(void) char *line; struct stat st; - line = (option_mask32 & CPIO_OPT_NUL_TERMINATED) + line = (option_mask32 & OPT_NUL_TERMINATED) ? bb_get_chunk_from_file(stdin, NULL) : xmalloc_fgetline(stdin); @@ -153,7 +214,7 @@ static NOINLINE int cpio_o(void) free(line); continue; } - if ((option_mask32 & CPIO_OPT_DEREF) + if ((option_mask32 & OPT_DEREF) ? stat(name, &st) : lstat(name, &st) ) { @@ -223,24 +284,24 @@ static NOINLINE int cpio_o(void) } bytes += printf("070701" - "%08X%08X%08X%08X%08X%08X%08X" - "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */ + "%08X%08X%08X%08X%08X%08X%08X" + "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */ /* strlen+1: */ "%08X" /* chksum: */ "00000000" /* (only for "070702" files) */ /* name,NUL: */ "%s%c", - (unsigned)(uint32_t) st.st_ino, - (unsigned)(uint32_t) st.st_mode, - (unsigned)(uint32_t) st.st_uid, - (unsigned)(uint32_t) st.st_gid, - (unsigned)(uint32_t) st.st_nlink, - (unsigned)(uint32_t) st.st_mtime, - (unsigned)(uint32_t) st.st_size, - (unsigned)(uint32_t) major(st.st_dev), - (unsigned)(uint32_t) minor(st.st_dev), - (unsigned)(uint32_t) major(st.st_rdev), - (unsigned)(uint32_t) minor(st.st_rdev), - (unsigned)(strlen(name) + 1), - name, '\0'); + (unsigned)(uint32_t) st.st_ino, + (unsigned)(uint32_t) st.st_mode, + (unsigned)(uint32_t) st.st_uid, + (unsigned)(uint32_t) st.st_gid, + (unsigned)(uint32_t) st.st_nlink, + (unsigned)(uint32_t) st.st_mtime, + (unsigned)(uint32_t) st.st_size, + (unsigned)(uint32_t) major(st.st_dev), + (unsigned)(uint32_t) minor(st.st_dev), + (unsigned)(uint32_t) major(st.st_rdev), + (unsigned)(uint32_t) minor(st.st_rdev), + (unsigned)(strlen(name) + 1), + name, '\0'); bytes = cpio_pad4(bytes); if (st.st_size) { @@ -308,28 +369,24 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) /* -L makes sense only with -o or -p */ #if !ENABLE_FEATURE_CPIO_O - /* no parameters */ - opt_complementary = "=0"; opt = getopt32(argv, OPTION_STR, &cpio_filename); argv += optind; - if (opt & CPIO_OPT_FILE) { /* -F */ + if (opt & OPT_FILE) { /* -F */ xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO); } #else - /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */ - opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0"; opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt); argv += optind; - if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */ + if ((opt & (OPT_FILE|OPT_CREATE)) == OPT_FILE) { /* -F without -o */ xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO); } - if (opt & CPIO_OPT_PASSTHROUGH) { + if (opt & OPT_PASSTHROUGH) { pid_t pid; struct fd_pair pp; if (argv[0] == NULL) bb_show_usage(); - if (opt & CPIO_OPT_CREATE_LEADING_DIR) + if (opt & OPT_CREATE_LEADING_DIR) mkdir(argv[0], 0777); /* Crude existence check: * close(xopen(argv[0], O_RDONLY | O_DIRECTORY)); @@ -358,19 +415,20 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) goto dump; } /* parent */ + USE_FOR_NOMMU(argv[-optind][0] &= 0x7f); /* undo fork_or_rexec() damage */ xchdir(*argv++); close(pp.wr); xmove_fd(pp.rd, STDIN_FILENO); - //opt &= ~CPIO_OPT_PASSTHROUGH; - opt |= CPIO_OPT_EXTRACT; + //opt &= ~OPT_PASSTHROUGH; + opt |= OPT_EXTRACT; goto skip; } /* -o */ - if (opt & CPIO_OPT_CREATE) { + if (opt & OPT_CREATE) { if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */ bb_show_usage(); - if (opt & CPIO_OPT_FILE) { - xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO); + if (opt & OPT_FILE) { + xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO); } dump: return cpio_o(); @@ -379,35 +437,35 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) #endif /* One of either extract or test options must be given */ - if ((opt & (CPIO_OPT_TEST | CPIO_OPT_EXTRACT)) == 0) { + if ((opt & (OPT_TEST | OPT_EXTRACT)) == 0) { bb_show_usage(); } - if (opt & CPIO_OPT_TEST) { + if (opt & OPT_TEST) { /* if both extract and test options are given, ignore extract option */ - opt &= ~CPIO_OPT_EXTRACT; + opt &= ~OPT_EXTRACT; archive_handle->action_header = header_list; } - if (opt & CPIO_OPT_EXTRACT) { + if (opt & OPT_EXTRACT) { archive_handle->action_data = data_extract_all; - if (opt & CPIO_OPT_2STDOUT) + if (opt & OPT_2STDOUT) archive_handle->action_data = data_extract_to_stdout; } - if (opt & CPIO_OPT_UNCONDITIONAL) { + if (opt & OPT_UNCONDITIONAL) { archive_handle->ah_flags |= ARCHIVE_UNLINK_OLD; archive_handle->ah_flags &= ~ARCHIVE_EXTRACT_NEWER; } - if (opt & CPIO_OPT_VERBOSE) { + if (opt & OPT_VERBOSE) { if (archive_handle->action_header == header_list) { archive_handle->action_header = header_verbose_list; } else { archive_handle->action_header = header_list; } } - if (opt & CPIO_OPT_CREATE_LEADING_DIR) { + if (opt & OPT_CREATE_LEADING_DIR) { archive_handle->ah_flags |= ARCHIVE_CREATE_LEADING_DIRS; } - if (opt & CPIO_OPT_PRESERVE_MTIME) { + if (opt & OPT_PRESERVE_MTIME) { archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE; } @@ -423,7 +481,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) continue; if (archive_handle->cpio__blocks != (off_t)-1 - && !(opt & CPIO_OPT_QUIET) + && !(opt & OPT_QUIET) ) { fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks); } diff --git a/archival/dpkg.c b/archival/dpkg.c index 219512b..2893cfc 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -12,9 +12,8 @@ * * started life as a busybox implementation of udpkg * - * licensed under gplv2 or later, see file license in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* * known difference between busybox dpkg and the official dpkg that i don't * consider important, its worth keeping a note of differences anyway, just to @@ -25,12 +24,52 @@ * * bugs that need to be fixed * - (unknown, please let me know when you find any) - * */ +//config:config DPKG +//config: bool "dpkg" +//config: default n +//config: select FEATURE_SEAMLESS_GZ +//config: help +//config: dpkg is a medium-level tool to install, build, remove and manage +//config: Debian packages. +//config: +//config: This implementation of dpkg has a number of limitations, +//config: you should use the official dpkg if possible. + +//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_DPKG) += dpkg.o + +//usage:#define dpkg_trivial_usage +//usage: "[-ilCPru] [-F OPT] PACKAGE" +//usage:#define dpkg_full_usage "\n\n" +//usage: "Install, remove and manage Debian packages\n" +//usage: IF_LONG_OPTS( +//usage: "\n -i,--install Install the package" +//usage: "\n -l,--list List of installed packages" +//usage: "\n --configure Configure an unpackaged package" +//usage: "\n -P,--purge Purge all files of a package" +//usage: "\n -r,--remove Remove all but the configuration files for a package" +//usage: "\n --unpack Unpack a package, but don't configure it" +//usage: "\n --force-depends Ignore dependency problems" +//usage: "\n --force-confnew Overwrite existing config files when installing" +//usage: "\n --force-confold Keep old config files when installing" +//usage: ) +//usage: IF_NOT_LONG_OPTS( +//usage: "\n -i Install the package" +//usage: "\n -l List of installed packages" +//usage: "\n -C Configure an unpackaged package" +//usage: "\n -P Purge all files of a package" +//usage: "\n -r Remove all but the configuration files for a package" +//usage: "\n -u Unpack a package, but don't configure it" +//usage: "\n -F depends Ignore dependency problems" +//usage: "\n -F confnew Overwrite existing config files when installing" +//usage: "\n -F confold Keep old config files when installing" +//usage: ) + #include "libbb.h" #include -#include "unarchive.h" +#include "bb_archive.h" /* note: if you vary hash_prime sizes be aware, * 1) tweaking these will have a big effect on how much memory this program uses. @@ -674,28 +713,21 @@ static unsigned get_status(const unsigned status_node, const int num) static void set_status(const unsigned status_node_num, const char *new_value, const int position) { - const unsigned new_value_len = strlen(new_value); const unsigned new_value_num = search_name_hashtable(new_value); unsigned want = get_status(status_node_num, 1); unsigned flag = get_status(status_node_num, 2); unsigned status = get_status(status_node_num, 3); - int want_len = strlen(name_hashtable[want]); - int flag_len = strlen(name_hashtable[flag]); - int status_len = strlen(name_hashtable[status]); char *new_status; switch (position) { case 1: want = new_value_num; - want_len = new_value_len; break; case 2: flag = new_value_num; - flag_len = new_value_len; break; case 3: status = new_value_num; - status_len = new_value_len; break; default: bb_error_msg_and_die("DEBUG ONLY: this shouldnt happen"); @@ -866,7 +898,7 @@ static void write_status_file(deb_file_t **deb_file) write_flag = TRUE; fputs("\n", new_status_file); } - else if (strcmp("config-files", name_hashtable[state_status]) == 0) { + else if (strcmp("config-files", name_hashtable[state_status]) == 0) { /* only change the status line */ while (1) { char *field_name; @@ -939,8 +971,8 @@ static int package_satisfies_dependency(int package, int depend_type) return 0; switch (depend_type) { - case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); - case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); + case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); + case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); } return 0; } @@ -967,7 +999,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count conflicts[conflicts_num] = package_num; conflicts_num++; /* add provides to conflicts list */ - for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) { + for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) { if (package_hashtable[package_num]->edge[j]->type == EDGE_PROVIDES) { const int conflicts_package_num = search_package_hashtable( package_hashtable[package_num]->edge[j]->name, @@ -1006,8 +1038,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count if (package_edge->type == EDGE_CONFLICTS) { const unsigned package_num = search_package_hashtable(package_edge->name, - package_edge->version, - package_edge->operator); + package_edge->version, + package_edge->operator); int result = 0; if (package_hashtable[package_num] != NULL) { status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]); @@ -1067,12 +1099,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count if (package_edge->type == EDGE_OR_PRE_DEPENDS || package_edge->type == EDGE_OR_DEPENDS - ) { /* start an EDGE_OR_ list */ + ) { + /* start an EDGE_OR_ list */ number_of_alternatives = package_edge->version; root_of_alternatives = package_edge; continue; } - if (number_of_alternatives == 0) { /* not in the middle of an EDGE_OR_ list */ + if (number_of_alternatives == 0) { /* not in the middle of an EDGE_OR_ list */ number_of_alternatives = 1; root_of_alternatives = NULL; } @@ -1093,7 +1126,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count */ if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1) bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1", - package_edge->type, root_of_alternatives->type); + package_edge->type, root_of_alternatives->type); if (package_hashtable[package_num] != NULL) result = !package_satisfies_dependency(package_num, package_edge->type); @@ -1524,8 +1557,8 @@ static char FAST_FUNC filter_rename_config(archive_handle_t *archive_handle) buf = xmalloc(4096); md5_begin(&md5); while ((count = safe_read(fd, buf, 4096)) > 0) - md5_hash(buf, count, &md5); - md5_end(buf, &md5); /* using buf as result storage */ + md5_hash(&md5, buf, count); + md5_end(&md5, buf); /* using buf as result storage */ close(fd); md5line = xmalloc(16 * 2 + 2 + strlen(name_ptr) + 1); @@ -1644,20 +1677,25 @@ static void unpack_package(deb_file_t *deb_file) archive_handle = init_archive_deb_ar(deb_file->filename); init_archive_deb_data(archive_handle); archive_handle->dpkg__sub_archive->accept = conffile_list; + /* Why ARCHIVE_REMEMBER_NAMES? + * We want names collected in ->passed list even if conffile_list + * is NULL (otherwise get_header_tar may optimize name saving out): + */ + archive_handle->dpkg__sub_archive->ah_flags |= ARCHIVE_REMEMBER_NAMES | ARCHIVE_UNLINK_OLD; archive_handle->dpkg__sub_archive->filter = filter_rename_config; archive_handle->dpkg__sub_archive->action_data = data_extract_all_prefix; archive_handle->dpkg__sub_archive->dpkg__buffer = (char*)"/"; /* huh? */ - archive_handle->dpkg__sub_archive->ah_flags |= ARCHIVE_UNLINK_OLD; unpack_ar_archive(archive_handle); /* Create the list file */ list_filename = xasprintf("/var/lib/dpkg/info/%s.%s", package_name, "list"); out_stream = xfopen_for_write(list_filename); + archive_handle->dpkg__sub_archive->passed = llist_rev(archive_handle->dpkg__sub_archive->passed); while (archive_handle->dpkg__sub_archive->passed) { + char *filename = llist_pop(&archive_handle->dpkg__sub_archive->passed); /* the leading . has been stripped by data_extract_all_prefix already */ - fputs(archive_handle->dpkg__sub_archive->passed->data, out_stream); - fputc('\n', out_stream); - archive_handle->dpkg__sub_archive->passed = archive_handle->dpkg__sub_archive->passed->link; + fprintf(out_stream, "%s\n", filename); + free(filename); } fclose(out_stream); diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 45a791b..13f9db9 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -2,16 +2,55 @@ /* * dpkg-deb packs, unpacks and provides information about Debian archives. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//config:config DPKG_DEB +//config: bool "dpkg_deb" +//config: default n +//config: select FEATURE_SEAMLESS_GZ +//config: help +//config: dpkg-deb unpacks and provides information about Debian archives. +//config: +//config: This implementation of dpkg-deb cannot pack archives. +//config: +//config: Unless you have a specific application which requires dpkg-deb, +//config: say N here. +//config: +//config:config FEATURE_DPKG_DEB_EXTRACT_ONLY +//config: bool "Extract only (-x)" +//config: default n +//config: depends on DPKG_DEB +//config: help +//config: This reduces dpkg-deb to the equivalent of +//config: "ar -p data.tar.gz | tar -zx". However it saves space as none +//config: of the extra dpkg-deb, ar or tar options are needed, they are linked +//config: to internally. + +//applet:IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, BB_DIR_USR_BIN, BB_SUID_DROP, dpkg_deb)) +//kbuild:lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o + +//usage:#define dpkg_deb_trivial_usage +//usage: "[-cefxX] FILE [argument]" +//usage:#define dpkg_deb_full_usage "\n\n" +//usage: "Perform actions on Debian packages (.debs)\n" +//usage: "\n -c List contents of filesystem tree" +//usage: "\n -e Extract control files to [argument] directory" +//usage: "\n -f Display control field name starting with [argument]" +//usage: "\n -x Extract packages filesystem tree to directory" +//usage: "\n -X Verbose extract" +//usage: +//usage:#define dpkg_deb_example_usage +//usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" -#define DPKG_DEB_OPT_CONTENTS 1 -#define DPKG_DEB_OPT_CONTROL 2 -#define DPKG_DEB_OPT_FIELD 4 -#define DPKG_DEB_OPT_EXTRACT 8 -#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16 +#define DPKG_DEB_OPT_CONTENTS 1 +#define DPKG_DEB_OPT_CONTROL 2 +#define DPKG_DEB_OPT_FIELD 4 +#define DPKG_DEB_OPT_EXTRACT 8 +#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16 int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int dpkg_deb_main(int argc, char **argv) diff --git a/archival/gzip.c b/archival/gzip.c index 620897b..1e779c9 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -13,9 +13,8 @@ * files as well as stdin/stdout, and to generally behave itself wrt * command line handling. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* big objects in bss: * 00000020 b bl_count * 00000074 b base_length @@ -31,7 +30,6 @@ * 00000480 b static_ltree * 000008f4 b dyn_ltree */ - /* TODO: full support for -v for DESKTOP * "/usr/bin/gzip -v a bogus aa" should say: a: 85.1% -- replaced with a.gz @@ -39,8 +37,52 @@ gzip: bogus: No such file or directory aa: 85.1% -- replaced with aa.gz */ +//config:config GZIP +//config: bool "gzip" +//config: default y +//config: help +//config: gzip is used to compress files. +//config: It's probably the most widely used UNIX compression program. +//config: +//config:config FEATURE_GZIP_LONG_OPTIONS +//config: bool "Enable long options" +//config: default y +//config: depends on GZIP && LONG_OPTS +//config: help +//config: Enable use of long options, increases size by about 106 Bytes +//config: +//config:config GZIP_FAST +//config: int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" +//config: default 0 +//config: range 0 2 +//config: depends on GZIP +//config: help +//config: Enable big memory options for gzip. +//config: 0: small buffers, small hash-tables +//config: 1: larger buffers, larger hash-tables +//config: 2: larger buffers, largest hash-tables +//config: Larger models may give slightly better compression + +//applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_GZIP) += gzip.o + +//usage:#define gzip_trivial_usage +//usage: "[-cfd] [FILE]..." +//usage:#define gzip_full_usage "\n\n" +//usage: "Compress FILEs (or stdin)\n" +//usage: "\n -d Decompress" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define gzip_example_usage +//usage: "$ ls -la /tmp/busybox*\n" +//usage: "-rw-rw-r-- 1 andersen andersen 1761280 Apr 14 17:47 /tmp/busybox.tar\n" +//usage: "$ gzip /tmp/busybox.tar\n" +//usage: "$ ls -la /tmp/busybox*\n" +//usage: "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" /* =========================================================================== @@ -66,9 +108,17 @@ aa: 85.1% -- replaced with aa.gz /* =========================================================================== */ -#define SMALL_MEM +#if CONFIG_GZIP_FAST == 0 +# define SMALL_MEM +#elif CONFIG_GZIP_FAST == 1 +# define MEDIUM_MEM +#elif CONFIG_GZIP_FAST == 2 +# define BIG_MEM +#else +# error "Invalid CONFIG_GZIP_FAST value" +#endif -#ifndef INBUFSIZ +#ifndef INBUFSIZ # ifdef SMALL_MEM # define INBUFSIZ 0x2000 /* input buffer size */ # else @@ -76,7 +126,7 @@ aa: 85.1% -- replaced with aa.gz # endif #endif -#ifndef OUTBUFSIZ +#ifndef OUTBUFSIZ # ifdef SMALL_MEM # define OUTBUFSIZ 8192 /* output buffer size */ # else @@ -340,7 +390,7 @@ struct globals { ulg bits_sent; /* bit length of the compressed data */ #endif - uint32_t *crc_32_tab; + /*uint32_t *crc_32_tab;*/ uint32_t crc; /* shift register contents */ }; @@ -393,15 +443,9 @@ static void put_32bit(ulg n) * pointer, then initialize the crc shift register contents instead. * Return the current crc in either case. */ -static uint32_t updcrc(uch * s, unsigned n) +static void updcrc(uch * s, unsigned n) { - uint32_t c = G1.crc; - while (n) { - c = G1.crc_32_tab[(uch)(c ^ *s++)] ^ (c >> 8); - n--; - } - G1.crc = c; - return c; + G1.crc = crc32_block_endian0(G1.crc, s, n, global_crc32_table /*G1.crc_32_tab*/); } @@ -1162,7 +1206,7 @@ static void gen_codes(ct_data * tree, int max_code) * must be all ones. */ Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1, - "inconsistent bit counts"); + "inconsistent bit counts"); Tracev((stderr, "\ngen_codes: max_code %d ", max_code)); for (n = 0; n <= max_code; n++) { @@ -1510,9 +1554,9 @@ static int ct_tally(int dist, int lc) } out_length >>= 3; Trace((stderr, - "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", - G2.last_lit, G2.last_dist, in_length, out_length, - 100L - out_length * 100L / in_length)); + "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", + G2.last_lit, G2.last_dist, in_length, out_length, + 100L - out_length * 100L / in_length)); if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2) return 1; } @@ -1604,9 +1648,9 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) static_lenb = (G2.static_len + 3 + 7) >> 3; Trace((stderr, - "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", - opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len, - G2.last_lit, G2.last_dist)); + "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", + opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len, + G2.last_lit, G2.last_dist)); if (static_lenb <= opt_lenb) opt_lenb = static_lenb; @@ -1644,7 +1688,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) } else { send_bits((DYN_TREES << 1) + eof, 3); send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1, - max_blindex + 1); + max_blindex + 1); compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree); G2.compressed_len += 3 + G2.opt_len; } @@ -1664,7 +1708,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) /* =========================================================================== * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * IN assertion: all calls to UPDATE_HASH are made with consecutive * input characters, so that a running hash key can be computed from the * previous key instead of complete recalculation each time. */ @@ -1695,7 +1739,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) /* Insert string s in the dictionary and set match_head to the previous head * of the hash chain (the most recent string with same hash key). Return * the previous length of the hash chain. - * IN assertion: all calls to to INSERT_STRING are made with consecutive + * IN assertion: all calls to INSERT_STRING are made with consecutive * input characters and the first MIN_MATCH bytes of s are valid * (except for the last MIN_MATCH-1 bytes of the input file). */ #define INSERT_STRING(s, match_head) \ @@ -1998,7 +2042,7 @@ static void zip(ulg time_stamp) /* ======================================================================== */ static -IF_DESKTOP(long long) int FAST_FUNC pack_gzip(unpack_info_t *info UNUSED_PARAM) +IF_DESKTOP(long long) int FAST_FUNC pack_gzip(transformer_aux_data_t *aux UNUSED_PARAM) { struct stat s; @@ -2104,8 +2148,8 @@ int gzip_main(int argc UNUSED_PARAM, char **argv) ALLOC(uch, G1.window, 2L * WSIZE); ALLOC(ush, G1.prev, 1L << BITS); - /* Initialise the CRC32 table */ - G1.crc_32_tab = crc32_filltable(NULL, 0); + /* Initialize the CRC32 table */ + global_crc32_table = crc32_filltable(NULL, 0); return bbunpack(argv, pack_gzip, append_ext, "gz"); } diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src new file mode 100644 index 0000000..968fdf8 --- /dev/null +++ b/archival/libarchive/Kbuild.src @@ -0,0 +1,83 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2004 by Erik Andersen +# +# Licensed under GPLv2 or later, see file LICENSE in this source tree. + +lib-y:= + +COMMON_FILES:= \ +\ + data_skip.o \ + data_extract_all.o \ + data_extract_to_stdout.o \ +\ + filter_accept_all.o \ + filter_accept_list.o \ + filter_accept_reject_list.o \ +\ + header_skip.o \ + header_list.o \ + header_verbose_list.o \ +\ + seek_by_read.o \ + seek_by_jump.o \ +\ + data_align.o \ + find_list_entry.o \ + init_handle.o + +DPKG_FILES:= \ + unpack_ar_archive.o \ + filter_accept_list_reassign.o \ + get_header_ar.o \ + get_header_tar.o \ + get_header_tar_gz.o \ + get_header_tar_bz2.o \ + get_header_tar_lzma.o \ + +INSERT + +lib-$(CONFIG_DPKG) += $(DPKG_FILES) +lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) + +lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o +lib-$(CONFIG_CPIO) += get_header_cpio.o +lib-$(CONFIG_TAR) += get_header_tar.o +lib-$(CONFIG_FEATURE_TAR_TO_COMMAND) += data_extract_to_command.o +lib-$(CONFIG_LZOP) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o +lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o +lib-$(CONFIG_BUNZIP2) += open_transformer.o decompress_bunzip2.o +lib-$(CONFIG_UNLZMA) += open_transformer.o decompress_unlzma.o +lib-$(CONFIG_UNXZ) += open_transformer.o decompress_unxz.o +lib-$(CONFIG_GUNZIP) += open_transformer.o decompress_gunzip.o +lib-$(CONFIG_UNCOMPRESS) += open_transformer.o decompress_uncompress.o +lib-$(CONFIG_UNZIP) += open_transformer.o decompress_gunzip.o +lib-$(CONFIG_RPM2CPIO) += open_transformer.o decompress_gunzip.o get_header_cpio.o +lib-$(CONFIG_RPM) += open_transformer.o decompress_gunzip.o get_header_cpio.o + +lib-$(CONFIG_GZIP) += open_transformer.o +lib-$(CONFIG_BZIP2) += open_transformer.o +lib-$(CONFIG_LZOP) += open_transformer.o +lib-$(CONFIG_MAN) += open_transformer.o +lib-$(CONFIG_SETFONT) += open_transformer.o +lib-$(CONFIG_FEATURE_2_4_MODULES) += open_transformer.o +lib-$(CONFIG_MODINFO) += open_transformer.o +lib-$(CONFIG_INSMOD) += open_transformer.o +lib-$(CONFIG_DEPMOD) += open_transformer.o +lib-$(CONFIG_RMMOD) += open_transformer.o +lib-$(CONFIG_LSMOD) += open_transformer.o +lib-$(CONFIG_MODPROBE) += open_transformer.o +lib-$(CONFIG_MODPROBE_SMALL) += open_transformer.o + +lib-$(CONFIG_FEATURE_SEAMLESS_Z) += open_transformer.o decompress_uncompress.o +lib-$(CONFIG_FEATURE_SEAMLESS_GZ) += open_transformer.o decompress_gunzip.o +lib-$(CONFIG_FEATURE_SEAMLESS_BZ2) += open_transformer.o decompress_bunzip2.o +lib-$(CONFIG_FEATURE_SEAMLESS_LZMA) += open_transformer.o decompress_unlzma.o +lib-$(CONFIG_FEATURE_SEAMLESS_XZ) += open_transformer.o decompress_unxz.o +lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += open_transformer.o decompress_bunzip2.o +lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += open_transformer.o decompress_bunzip2.o + +ifneq ($(lib-y),) +lib-y += $(COMMON_FILES) +endif diff --git a/archival/bz/LICENSE b/archival/libarchive/bz/LICENSE similarity index 100% rename from archival/bz/LICENSE rename to archival/libarchive/bz/LICENSE diff --git a/archival/bz/README b/archival/libarchive/bz/README similarity index 100% rename from archival/bz/README rename to archival/libarchive/bz/README diff --git a/archival/bz/blocksort.c b/archival/libarchive/bz/blocksort.c similarity index 99% rename from archival/bz/blocksort.c rename to archival/libarchive/bz/blocksort.c index f70c370..e600cb7 100644 --- a/archival/bz/blocksort.c +++ b/archival/libarchive/bz/blocksort.c @@ -385,7 +385,7 @@ int mainGtU( * but speeds up compression 10% overall */ -#if CONFIG_BZIP2_FEATURE_SPEED >= 1 +#if CONFIG_BZIP2_FAST >= 1 #define TIMES_8(code) \ code; code; code; code; \ @@ -496,7 +496,7 @@ void mainSimpleSort(uint32_t* ptr, i++; /* 1.5% overall speedup, +290 bytes */ -#if CONFIG_BZIP2_FEATURE_SPEED >= 3 +#if CONFIG_BZIP2_FAST >= 3 /*-- copy 2 --*/ if (i > hi) break; v = ptr[i]; @@ -750,7 +750,7 @@ void mainSort(EState* state, j = block[0] << 8; i = nblock - 1; /* 3%, +300 bytes */ -#if CONFIG_BZIP2_FEATURE_SPEED >= 2 +#if CONFIG_BZIP2_FAST >= 2 for (; i >= 3; i -= 4) { quadrant[i] = 0; j = (j >> 8) | (((uint16_t)block[i]) << 8); @@ -787,7 +787,7 @@ void mainSort(EState* state, s = block[0] << 8; i = nblock - 1; -#if CONFIG_BZIP2_FEATURE_SPEED >= 2 +#if CONFIG_BZIP2_FAST >= 2 for (; i >= 3; i -= 4) { s = (s >> 8) | (block[i] << 8); j = ftab[s] - 1; diff --git a/archival/bz/bzlib.c b/archival/libarchive/bz/bzlib.c similarity index 98% rename from archival/bz/bzlib.c rename to archival/libarchive/bz/bzlib.c index 8341794..5f7db74 100644 --- a/archival/bz/bzlib.c +++ b/archival/libarchive/bz/bzlib.c @@ -28,7 +28,7 @@ in the file LICENSE. * 0.9.0a/b -- no changes in this file. * 0.9.0c -- made zero-length BZ_FLUSH work correctly in bzCompress(). * fixed bzWrite/bzRead to ignore zero-length requests. - * fixed bzread to correctly handle read requests after EOF. + * fixed bzread to correctly handle read requests after EOF. * wrong parameter order in call to bzDecompressInit in * bzBuffToBuffDecompress. Fixed. */ @@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int action) /*---------------------------------------------------*/ -#if ENABLE_FEATURE_CLEAN_UP static void BZ2_bzCompressEnd(bz_stream *strm) { @@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm) free(s->arr2); free(s->ftab); free(s->crc32table); - free(strm->state); + free(s); } -#endif /*---------------------------------------------------*/ diff --git a/archival/bz/bzlib.h b/archival/libarchive/bz/bzlib.h similarity index 100% rename from archival/bz/bzlib.h rename to archival/libarchive/bz/bzlib.h diff --git a/archival/bz/bzlib_private.h b/archival/libarchive/bz/bzlib_private.h similarity index 99% rename from archival/bz/bzlib_private.h rename to archival/libarchive/bz/bzlib_private.h index 6430ce4..43e674b 100644 --- a/archival/bz/bzlib_private.h +++ b/archival/libarchive/bz/bzlib_private.h @@ -183,7 +183,7 @@ typedef struct EState { /* stack-saving measures: these can be local, but they are too big */ int32_t sendMTFValues__code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; int32_t sendMTFValues__rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; -#if CONFIG_BZIP2_FEATURE_SPEED >= 5 +#if CONFIG_BZIP2_FAST >= 5 /* second dimension: only 3 needed; 4 makes index calculations faster */ uint32_t sendMTFValues__len_pack[BZ_MAX_ALPHA_SIZE][4]; #endif diff --git a/archival/bz/compress.c b/archival/libarchive/bz/compress.c similarity index 95% rename from archival/bz/compress.c rename to archival/libarchive/bz/compress.c index 640b887..23de9d3 100644 --- a/archival/bz/compress.c +++ b/archival/libarchive/bz/compress.c @@ -61,7 +61,7 @@ void bsFinishWrite(EState* s) /*---------------------------------------------------*/ static /* Helps only on level 5, on other levels hurts. ? */ -#if CONFIG_BZIP2_FEATURE_SPEED >= 5 +#if CONFIG_BZIP2_FAST >= 5 ALWAYS_INLINE #endif void bsW(EState* s, int32_t n, uint32_t v) @@ -134,15 +134,14 @@ void generateMTFValues(EState* s) * holds the original block data. * * The first thing to do is generate the MTF values, - * and put them in - * ((uint16_t*)s->arr1)[0 .. s->nblock-1]. + * and put them in ((uint16_t*)s->arr1)[0 .. s->nblock-1]. + * * Because there are strictly fewer or equal MTF values * than block values, ptr values in this area are overwritten * with MTF values only when they are no longer needed. * * The final compressed bitstream is generated into the - * area starting at - * &((uint8_t*)s->arr2)[s->nblock] + * area starting at &((uint8_t*)s->arr2)[s->nblock] * * These storage aliases are set up in bzCompressInit(), * except for the last one, which is arranged in @@ -212,7 +211,6 @@ void generateMTFValues(EState* s) wr++; s->mtfFreq[j+1]++; } - } } @@ -251,9 +249,9 @@ void generateMTFValues(EState* s) static NOINLINE void sendMTFValues(EState* s) { - int32_t v, t, i, j, gs, ge, totc, bt, bc, iter; + int32_t v, t, i, j, gs, ge, bt, bc, iter; int32_t nSelectors, alphaSize, minLen, maxLen, selCtr; - int32_t nGroups, nBytes; + int32_t nGroups; /* * uint8_t len[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; @@ -333,7 +331,7 @@ void sendMTFValues(EState* s) for (v = 0; v < alphaSize; v++) s->rfreq[t][v] = 0; -#if CONFIG_BZIP2_FEATURE_SPEED >= 5 +#if CONFIG_BZIP2_FAST >= 5 /* * Set up an auxiliary length table which is used to fast-track * the common case (nGroups == 6). @@ -347,7 +345,6 @@ void sendMTFValues(EState* s) } #endif nSelectors = 0; - totc = 0; gs = 0; while (1) { /*--- Set group start & end marks. --*/ @@ -363,7 +360,7 @@ void sendMTFValues(EState* s) */ for (t = 0; t < nGroups; t++) cost[t] = 0; -#if CONFIG_BZIP2_FEATURE_SPEED >= 5 +#if CONFIG_BZIP2_FAST >= 5 if (nGroups == 6 && 50 == ge-gs+1) { /*--- fast track the common case ---*/ register uint32_t cost01, cost23, cost45; @@ -413,7 +410,6 @@ void sendMTFValues(EState* s) bt = t; } } - totc += bc; fave[bt]++; s->selector[nSelectors] = bt; nSelectors++; @@ -422,7 +418,7 @@ void sendMTFValues(EState* s) * Increment the symbol frequencies for the selected table. */ /* 1% faster compress. +800 bytes */ -#if CONFIG_BZIP2_FEATURE_SPEED >= 4 +#if CONFIG_BZIP2_FAST >= 4 if (nGroups == 6 && 50 == ge-gs+1) { /*--- fast track the common case ---*/ #define BZ_ITUR(nn) s->rfreq[bt][mtfv[gs + (nn)]]++ @@ -460,7 +456,7 @@ void sendMTFValues(EState* s) } AssertH(nGroups < 8, 3002); - AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003); + AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003); /*--- Compute MTF values for the selectors. ---*/ { @@ -503,18 +499,17 @@ void sendMTFValues(EState* s) for (i = 0; i < 16; i++) { if (sizeof(long) <= 4) { inUse16 = inUse16*2 + - ((*(uint32_t*)&(s->inUse[i * 16 + 0]) - | *(uint32_t*)&(s->inUse[i * 16 + 4]) - | *(uint32_t*)&(s->inUse[i * 16 + 8]) - | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0); + ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0]) + | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4]) + | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8]) + | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0); } else { /* Our CPU can do better */ inUse16 = inUse16*2 + - ((*(uint64_t*)&(s->inUse[i * 16 + 0]) - | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0); + ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0]) + | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0); } } - nBytes = s->numZ; bsW(s, 16, inUse16); inUse16 <<= (sizeof(int)*8 - 16); /* move 15th bit into sign bit */ @@ -530,7 +525,6 @@ void sendMTFValues(EState* s) } /*--- Now the selectors. ---*/ - nBytes = s->numZ; bsW(s, 3, nGroups); bsW(s, 15, nSelectors); for (i = 0; i < nSelectors; i++) { @@ -540,8 +534,6 @@ void sendMTFValues(EState* s) } /*--- Now the coding tables. ---*/ - nBytes = s->numZ; - for (t = 0; t < nGroups; t++) { int32_t curr = s->len[t][0]; bsW(s, 5, curr); @@ -553,7 +545,6 @@ void sendMTFValues(EState* s) } /*--- And finally, the block data proper ---*/ - nBytes = s->numZ; selCtr = 0; gs = 0; while (1) { diff --git a/archival/bz/huffman.c b/archival/libarchive/bz/huffman.c similarity index 99% rename from archival/bz/huffman.c rename to archival/libarchive/bz/huffman.c index 676b1af..bbec11a 100644 --- a/archival/bz/huffman.c +++ b/archival/libarchive/bz/huffman.c @@ -48,7 +48,7 @@ in the file LICENSE. /* 90 bytes, 0.3% of overall compress speed */ -#if CONFIG_BZIP2_FEATURE_SPEED >= 1 +#if CONFIG_BZIP2_FAST >= 1 /* macro works better than inline (gcc 4.2.1) */ #define DOWNHEAP1(heap, weight, Heap) \ diff --git a/archival/libunarchive/data_align.c b/archival/libarchive/data_align.c similarity index 75% rename from archival/libunarchive/data_align.c rename to archival/libarchive/data_align.c index 0c8542b..a6b84a4 100644 --- a/archival/libunarchive/data_align.c +++ b/archival/libarchive/data_align.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary) { diff --git a/archival/libunarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c similarity index 86% rename from archival/libunarchive/data_extract_all.c rename to archival/libarchive/data_extract_all.c index 00e67d4..45776dc 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libarchive/data_extract_all.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) { @@ -13,13 +13,13 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) int res; #if ENABLE_FEATURE_TAR_SELINUX - char *sctx = archive_handle->tar__next_file_sctx; + char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE]; if (!sctx) - sctx = archive_handle->tar__global_sctx; + sctx = archive_handle->tar__sctx[PAX_GLOBAL]; if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */ setfscreatecon(sctx); - free(archive_handle->tar__next_file_sctx); - archive_handle->tar__next_file_sctx = NULL; + free(archive_handle->tar__sctx[PAX_NEXT_FILE]); + archive_handle->tar__sctx[PAX_NEXT_FILE] = NULL; } #endif @@ -69,7 +69,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) } } else if (existing_sb.st_mtime >= file_header->mtime) { - if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { + if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) + && !S_ISDIR(file_header->mode) + ) { bb_error_msg("%s not created: newer or " "same age file exists", file_header->name); } @@ -104,15 +106,28 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) switch (file_header->mode & S_IFMT) { case S_IFREG: { /* Regular file */ + char *dst_name; int flags = O_WRONLY | O_CREAT | O_EXCL; if (archive_handle->ah_flags & ARCHIVE_O_TRUNC) flags = O_WRONLY | O_CREAT | O_TRUNC; - dst_fd = xopen3(file_header->name, + dst_name = file_header->name; +#ifdef ARCHIVE_REPLACE_VIA_RENAME + if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) + /* rpm-style temp file name */ + dst_name = xasprintf("%s;%x", dst_name, (int)getpid()); +#endif + dst_fd = xopen3(dst_name, flags, file_header->mode ); bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size); close(dst_fd); +#ifdef ARCHIVE_REPLACE_VIA_RENAME + if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) { + xrename(dst_name, file_header->name); + free(dst_name); + } +#endif break; } case S_IFDIR: diff --git a/archival/libunarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c similarity index 84% rename from archival/libunarchive/data_extract_to_command.c rename to archival/libarchive/data_extract_to_command.c index 95f5bc8..5b32c2e 100644 --- a/archival/libunarchive/data_extract_to_command.c +++ b/archival/libarchive/data_extract_to_command.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" enum { //TAR_FILETYPE, @@ -64,13 +64,13 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle) file_header_t *file_header = archive_handle->file_header; #if 0 /* do we need this? ENABLE_FEATURE_TAR_SELINUX */ - char *sctx = archive_handle->tar__next_file_sctx; + char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE]; if (!sctx) - sctx = archive_handle->tar__global_sctx; + sctx = archive_handle->tar__sctx[PAX_GLOBAL]; if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */ setfscreatecon(sctx); - free(archive_handle->tar__next_file_sctx); - archive_handle->tar__next_file_sctx = NULL; + free(archive_handle->tar__sctx[PAX_NEXT_FILE]); + archive_handle->tar__sctx[PAX_NEXT_FILE] = NULL; } #endif @@ -99,8 +99,12 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle) close(p[1]); xdup2(p[0], STDIN_FILENO); signal(SIGPIPE, SIG_DFL); - execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", archive_handle->tar__to_command, NULL); - bb_perror_msg_and_die("can't execute '%s'", DEFAULT_SHELL); + execl(archive_handle->tar__to_command_shell, + archive_handle->tar__to_command_shell, + "-c", + archive_handle->tar__to_command, + (char *)0); + bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell); } close(p[0]); /* Our caller is expected to do signal(SIGPIPE, SIG_IGN) diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libarchive/data_extract_to_stdout.c similarity index 69% rename from archival/libunarchive/data_extract_to_stdout.c rename to archival/libarchive/data_extract_to_stdout.c index a3efea1..f849f3b 100644 --- a/archival/libunarchive/data_extract_to_stdout.c +++ b/archival/libarchive/data_extract_to_stdout.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle) { diff --git a/archival/libunarchive/data_skip.c b/archival/libarchive/data_skip.c similarity index 65% rename from archival/libunarchive/data_skip.c rename to archival/libarchive/data_skip.c index 06d3dce..588167f 100644 --- a/archival/libunarchive/data_skip.c +++ b/archival/libarchive/data_skip.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC data_skip(archive_handle_t *archive_handle) { diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c similarity index 66% rename from archival/libunarchive/decompress_bunzip2.c rename to archival/libarchive/decompress_bunzip2.c index bdbd39a..6396fe4 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libarchive/decompress_bunzip2.c @@ -6,7 +6,7 @@ Peter Fenwick, Alistair Moffat, Radford Neal, Ian H. Witten, Robert Sedgewick, and Jon L. Bentley. - Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* @@ -16,10 +16,21 @@ function, and various other tweaks. In (limited) tests, approximately 20% faster than bzcat on x86 and about 10% faster on arm. - Note that about 2/3 of the time is spent in read_unzip() reversing + Note that about 2/3 of the time is spent in read_bunzip() reversing the Burrows-Wheeler transformation. Much of that time is delay resulting from cache misses. + (2010 update by vda: profiled "bzcat <84mbyte.bz2 >/dev/null" + on x86-64 CPU with L2 > 1M: get_next_block is hotter than read_bunzip: + %time seconds calls function + 71.01 12.69 444 get_next_block + 28.65 5.12 93065 read_bunzip + 00.22 0.04 7736490 get_bits + 00.11 0.02 47 dealloc_bunzip + 00.00 0.00 93018 full_write + ...) + + I would ask that anyone benefiting from this work, especially those using it in commercial products, consider making a donation to my local non-profit hospice organization (www.hospiceacadiana.com) in the name of @@ -29,7 +40,13 @@ */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" + +#if 0 +# define dbg(...) bb_error_msg(__VA_ARGS__) +#else +# define dbg(...) ((void)0) +#endif /* Constants for Huffman coding */ #define MAX_GROUPS 6 @@ -41,13 +58,13 @@ /* Status return values */ #define RETVAL_OK 0 -#define RETVAL_LAST_BLOCK (-1) -#define RETVAL_NOT_BZIP_DATA (-2) -#define RETVAL_UNEXPECTED_INPUT_EOF (-3) -#define RETVAL_SHORT_WRITE (-4) -#define RETVAL_DATA_ERROR (-5) -#define RETVAL_OUT_OF_MEMORY (-6) -#define RETVAL_OBSOLETE_INPUT (-7) +#define RETVAL_LAST_BLOCK (dbg("%d", __LINE__), -1) +#define RETVAL_NOT_BZIP_DATA (dbg("%d", __LINE__), -2) +#define RETVAL_UNEXPECTED_INPUT_EOF (dbg("%d", __LINE__), -3) +#define RETVAL_SHORT_WRITE (dbg("%d", __LINE__), -4) +#define RETVAL_DATA_ERROR (dbg("%d", __LINE__), -5) +#define RETVAL_OUT_OF_MEMORY (dbg("%d", __LINE__), -6) +#define RETVAL_OBSOLETE_INPUT (dbg("%d", __LINE__), -7) /* Other housekeeping constants */ #define IOBUF_SIZE 4096 @@ -70,38 +87,41 @@ struct bunzip_data { /* I/O tracking data (file handles, buffers, positions, etc.) */ unsigned inbufBitCount, inbufBits; int in_fd, out_fd, inbufCount, inbufPos /*, outbufPos*/; - unsigned char *inbuf /*,*outbuf*/; + uint8_t *inbuf /*,*outbuf*/; /* State for interrupting output loop */ - int writeCopies, writePos, writeRunCountdown, writeCount, writeCurrent; + int writeCopies, writePos, writeRunCountdown, writeCount; + int writeCurrent; /* actually a uint8_t */ /* The CRC values stored in the block header and calculated from the data */ uint32_t headerCRC, totalCRC, writeCRC; /* Intermediate buffer and its size (in bytes) */ - unsigned *dbuf, dbufSize; + uint32_t *dbuf; + unsigned dbufSize; /* For I/O error handling */ jmp_buf jmpbuf; /* Big things go last (register-relative addressing can be larger for big offsets) */ uint32_t crc32Table[256]; - unsigned char selectors[32768]; /* nSelectors=15 bits */ - struct group_data groups[MAX_GROUPS]; /* Huffman coding tables */ + uint8_t selectors[32768]; /* nSelectors=15 bits */ + struct group_data groups[MAX_GROUPS]; /* Huffman coding tables */ }; /* typedef struct bunzip_data bunzip_data; -- done in .h file */ /* Return the next nnn bits of input. All reads from the compressed input are done through this function. All reads are big endian */ - static unsigned get_bits(bunzip_data *bd, int bits_wanted) { unsigned bits = 0; + /* Cache bd->inbufBitCount in a CPU register (hopefully): */ + int bit_count = bd->inbufBitCount; /* If we need to get more data from the byte buffer, do so. (Loop getting one byte at a time to enforce endianness and avoid unaligned access.) */ - while ((int)(bd->inbufBitCount) < bits_wanted) { + while (bit_count < bits_wanted) { /* If we need to read more data from file into byte buffer, do so */ if (bd->inbufPos == bd->inbufCount) { @@ -113,41 +133,47 @@ static unsigned get_bits(bunzip_data *bd, int bits_wanted) } /* Avoid 32-bit overflow (dump bit buffer to top of output) */ - if (bd->inbufBitCount >= 24) { - bits = bd->inbufBits & ((1 << bd->inbufBitCount) - 1); - bits_wanted -= bd->inbufBitCount; + if (bit_count >= 24) { + bits = bd->inbufBits & ((1 << bit_count) - 1); + bits_wanted -= bit_count; bits <<= bits_wanted; - bd->inbufBitCount = 0; + bit_count = 0; } /* Grab next 8 bits of input from buffer. */ bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++]; - bd->inbufBitCount += 8; + bit_count += 8; } /* Calculate result */ - bd->inbufBitCount -= bits_wanted; - bits |= (bd->inbufBits >> bd->inbufBitCount) & ((1 << bits_wanted) - 1); + bit_count -= bits_wanted; + bd->inbufBitCount = bit_count; + bits |= (bd->inbufBits >> bit_count) & ((1 << bits_wanted) - 1); return bits; } -/* Unpacks the next block and sets up for the inverse burrows-wheeler step. */ +/* Unpacks the next block and sets up for the inverse Burrows-Wheeler step. */ static int get_next_block(bunzip_data *bd) { struct group_data *hufGroup; - int dbufCount, nextSym, dbufSize, groupCount, *base, *limit, selector, - i, j, k, t, runPos, symCount, symTotal, nSelectors, byteCount[256]; - unsigned char uc, symToByte[256], mtfSymbol[256], *selectors; - unsigned *dbuf, origPtr; + int dbufCount, dbufSize, groupCount, *base, *limit, selector, + i, j, t, runPos, symCount, symTotal, nSelectors, byteCount[256]; + int runCnt = runCnt; /* for compiler */ + uint8_t uc, symToByte[256], mtfSymbol[256], *selectors; + uint32_t *dbuf; + unsigned origPtr; dbuf = bd->dbuf; dbufSize = bd->dbufSize; selectors = bd->selectors; +/* In bbox, we are ok with aborting through setjmp which is set up in start_bunzip */ +#if 0 /* Reset longjmp I/O error handling */ i = setjmp(bd->jmpbuf); if (i) return i; +#endif /* Read in header signature and CRC, then validate signature. (last block signature means CRC is for whole file, return now) */ @@ -169,16 +195,23 @@ static int get_next_block(bunzip_data *bd) symbols to deal with, and writes a sparse bitfield indicating which values were present. We make a translation table to convert the symbols back to the corresponding bytes. */ - t = get_bits(bd, 16); symTotal = 0; - for (i = 0; i < 16; i++) { - if (t & (1 << (15-i))) { - k = get_bits(bd, 16); - for (j = 0; j < 16; j++) - if (k & (1 << (15-j))) - symToByte[symTotal++] = (16*i) + j; + i = 0; + t = get_bits(bd, 16); + do { + if (t & (1 << 15)) { + unsigned inner_map = get_bits(bd, 16); + do { + if (inner_map & (1 << 15)) + symToByte[symTotal++] = i; + inner_map <<= 1; + i++; + } while (i & 15); + i -= 16; } - } + t <<= 1; + i += 16; + } while (i < 256); /* How many different Huffman coding groups does this block use? */ groupCount = get_bits(bd, 3); @@ -189,57 +222,63 @@ static int get_next_block(bunzip_data *bd) group. Read in the group selector list, which is stored as MTF encoded bit runs. (MTF=Move To Front, as each value is used it's moved to the start of the list.) */ + for (i = 0; i < groupCount; i++) + mtfSymbol[i] = i; nSelectors = get_bits(bd, 15); - if (!nSelectors) return RETVAL_DATA_ERROR; - for (i = 0; i < groupCount; i++) mtfSymbol[i] = i; + if (!nSelectors) + return RETVAL_DATA_ERROR; for (i = 0; i < nSelectors; i++) { - + uint8_t tmp_byte; /* Get next value */ - for (j = 0; get_bits(bd, 1); j++) - if (j >= groupCount) return RETVAL_DATA_ERROR; - + int n = 0; + while (get_bits(bd, 1)) { + if (n >= groupCount) return RETVAL_DATA_ERROR; + n++; + } /* Decode MTF to get the next selector */ - uc = mtfSymbol[j]; - for (;j;j--) mtfSymbol[j] = mtfSymbol[j-1]; - mtfSymbol[0] = selectors[i] = uc; + tmp_byte = mtfSymbol[n]; + while (--n >= 0) + mtfSymbol[n + 1] = mtfSymbol[n]; + mtfSymbol[0] = selectors[i] = tmp_byte; } /* Read the Huffman coding tables for each group, which code for symTotal literal symbols, plus two run symbols (RUNA, RUNB) */ symCount = symTotal + 2; for (j = 0; j < groupCount; j++) { - unsigned char length[MAX_SYMBOLS]; + uint8_t length[MAX_SYMBOLS]; /* 8 bits is ALMOST enough for temp[], see below */ unsigned temp[MAX_HUFCODE_BITS+1]; - int minLen, maxLen, pp; + int minLen, maxLen, pp, len_m1; /* Read Huffman code lengths for each symbol. They're stored in a way similar to mtf; record a starting value for the first symbol, - and an offset from the previous value for everys symbol after that. + and an offset from the previous value for every symbol after that. (Subtracting 1 before the loop and then adding it back at the end is an optimization that makes the test inside the loop simpler: symbol length 0 becomes negative, so an unsigned inequality catches it.) */ - t = get_bits(bd, 5) - 1; + len_m1 = get_bits(bd, 5) - 1; for (i = 0; i < symCount; i++) { for (;;) { - if ((unsigned)t > (MAX_HUFCODE_BITS-1)) + int two_bits; + if ((unsigned)len_m1 > (MAX_HUFCODE_BITS-1)) return RETVAL_DATA_ERROR; /* If first bit is 0, stop. Else second bit indicates whether to increment or decrement the value. Optimization: grab 2 bits and unget the second if the first was 0. */ - k = get_bits(bd, 2); - if (k < 2) { + two_bits = get_bits(bd, 2); + if (two_bits < 2) { bd->inbufBitCount++; break; } /* Add one if second bit 1, else subtract 1. Avoids if/else */ - t += (((k+1) & 2) - 1); + len_m1 += (((two_bits+1) & 2) - 1); } /* Correct for the initial -1, to get the final symbol length */ - length[i] = t + 1; + length[i] = len_m1 + 1; } /* Find largest and smallest lengths in this group */ @@ -265,17 +304,18 @@ static int get_next_block(bunzip_data *bd) /* Note that minLen can't be smaller than 1, so we adjust the base and limit array pointers so we're not always wasting the first - entry. We do this again when using them (during symbol decoding).*/ + entry. We do this again when using them (during symbol decoding). */ base = hufGroup->base - 1; limit = hufGroup->limit - 1; /* Calculate permute[]. Concurently, initialize temp[] and limit[]. */ pp = 0; for (i = minLen; i <= maxLen; i++) { + int k; temp[i] = limit[i] = 0; - for (t = 0; t < symCount; t++) - if (length[t] == i) - hufGroup->permute[pp++] = t; + for (k = 0; k < symCount; k++) + if (length[k] == i) + hufGroup->permute[pp++] = k; } /* Count symbols coded for at each bit length */ @@ -288,8 +328,10 @@ static int get_next_block(bunzip_data *bd) * base[] (number of symbols to ignore at each bit length, which is * limit minus the cumulative count of symbols coded for already). */ pp = t = 0; - for (i = minLen; i < maxLen; i++) { - pp += temp[i]; + for (i = minLen; i < maxLen;) { + unsigned temp_i = temp[i]; + + pp += temp_i; /* We read the largest possible symbol size and then unget bits after determining how many we need, and those extra bits could @@ -299,11 +341,11 @@ static int get_next_block(bunzip_data *bd) don't affect the value>limit[length] comparison. */ limit[i] = (pp << (maxLen - i)) - 1; pp <<= 1; - t += temp[i]; - base[i+1] = pp - t; + t += temp_i; + base[++i] = pp - t; } - limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */ limit[maxLen] = pp + temp[maxLen] - 1; + limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */ base[minLen] = 0; } @@ -312,16 +354,17 @@ static int get_next_block(bunzip_data *bd) and run length encoding, saving the result into dbuf[dbufCount++] = uc */ /* Initialize symbol occurrence counters and symbol Move To Front table */ - memset(byteCount, 0, sizeof(byteCount)); /* smaller, maybe slower? */ + /*memset(byteCount, 0, sizeof(byteCount)); - smaller, but slower */ for (i = 0; i < 256; i++) { - //byteCount[i] = 0; - mtfSymbol[i] = (unsigned char)i; + byteCount[i] = 0; + mtfSymbol[i] = (uint8_t)i; } /* Loop through compressed symbols. */ runPos = dbufCount = selector = 0; for (;;) { + int nextSym; /* Fetch next Huffman coding group from list. */ symCount = GROUP_SIZE - 1; @@ -329,44 +372,49 @@ static int get_next_block(bunzip_data *bd) hufGroup = bd->groups + selectors[selector++]; base = hufGroup->base - 1; limit = hufGroup->limit - 1; - continue_this_group: + continue_this_group: /* Read next Huffman-coded symbol. */ /* Note: It is far cheaper to read maxLen bits and back up than it is - to read minLen bits and then an additional bit at a time, testing + to read minLen bits and then add additional bit at a time, testing as we go. Because there is a trailing last block (with file CRC), there is no danger of the overread causing an unexpected EOF for a - valid compressed file. As a further optimization, we do the read - inline (falling back to a call to get_bits if the buffer runs - dry). The following (up to got_huff_bits:) is equivalent to - j = get_bits(bd, hufGroup->maxLen); + valid compressed file. */ - while ((int)(bd->inbufBitCount) < hufGroup->maxLen) { - if (bd->inbufPos == bd->inbufCount) { - j = get_bits(bd, hufGroup->maxLen); - goto got_huff_bits; - } - bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++]; - bd->inbufBitCount += 8; - }; - bd->inbufBitCount -= hufGroup->maxLen; - j = (bd->inbufBits >> bd->inbufBitCount) & ((1 << hufGroup->maxLen) - 1); - - got_huff_bits: - - /* Figure how how many bits are in next symbol and unget extras */ + if (1) { + /* As a further optimization, we do the read inline + (falling back to a call to get_bits if the buffer runs dry). + */ + int new_cnt; + while ((new_cnt = bd->inbufBitCount - hufGroup->maxLen) < 0) { + /* bd->inbufBitCount < hufGroup->maxLen */ + if (bd->inbufPos == bd->inbufCount) { + nextSym = get_bits(bd, hufGroup->maxLen); + goto got_huff_bits; + } + bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++]; + bd->inbufBitCount += 8; + }; + bd->inbufBitCount = new_cnt; /* "bd->inbufBitCount -= hufGroup->maxLen;" */ + nextSym = (bd->inbufBits >> new_cnt) & ((1 << hufGroup->maxLen) - 1); + got_huff_bits: ; + } else { /* unoptimized equivalent */ + nextSym = get_bits(bd, hufGroup->maxLen); + } + /* Figure how many bits are in next symbol and unget extras */ i = hufGroup->minLen; - while (j > limit[i]) ++i; - bd->inbufBitCount += (hufGroup->maxLen - i); + while (nextSym > limit[i]) ++i; + j = hufGroup->maxLen - i; + if (j < 0) + return RETVAL_DATA_ERROR; + bd->inbufBitCount += j; /* Huffman decode value to get nextSym (with bounds checking) */ - if (i > hufGroup->maxLen) + nextSym = (nextSym >> j) - base[i]; + if ((unsigned)nextSym >= MAX_SYMBOLS) return RETVAL_DATA_ERROR; - j = (j >> (hufGroup->maxLen - i)) - base[i]; - if ((unsigned)j >= MAX_SYMBOLS) - return RETVAL_DATA_ERROR; - nextSym = hufGroup->permute[j]; + nextSym = hufGroup->permute[nextSym]; /* We have now decoded the symbol, which indicates either a new literal byte, or a repeated run of the most recent literal byte. First, @@ -375,9 +423,9 @@ static int get_next_block(bunzip_data *bd) if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */ /* If this is the start of a new run, zero out counter */ - if (!runPos) { + if (runPos == 0) { runPos = 1; - t = 0; + runCnt = 0; } /* Neat trick that saves 1 symbol: instead of or-ing 0 or 1 at @@ -387,7 +435,7 @@ static int get_next_block(bunzip_data *bd) the basic or 0/1 method (except all bits 0, which would use no symbols, but a run of length 0 doesn't mean anything in this context). Thus space is saved. */ - t += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */ + runCnt += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */ if (runPos < dbufSize) runPos <<= 1; goto end_of_huffman_loop; } @@ -396,13 +444,17 @@ static int get_next_block(bunzip_data *bd) how many times to repeat the last literal, so append that many copies to our buffer of decoded symbols (dbuf) now. (The last literal used is the one at the head of the mtfSymbol array.) */ - if (runPos) { + if (runPos != 0) { + uint8_t tmp_byte; + if (dbufCount + runCnt > dbufSize) { + dbg("dbufCount:%d+runCnt:%d %d > dbufSize:%d RETVAL_DATA_ERROR", + dbufCount, runCnt, dbufCount + runCnt, dbufSize); + return RETVAL_DATA_ERROR; + } + tmp_byte = symToByte[mtfSymbol[0]]; + byteCount[tmp_byte] += runCnt; + while (--runCnt >= 0) dbuf[dbufCount++] = (uint32_t)tmp_byte; runPos = 0; - if (dbufCount + t >= dbufSize) return RETVAL_DATA_ERROR; - - uc = symToByte[mtfSymbol[0]]; - byteCount[uc] += t; - while (t--) dbuf[dbufCount++] = uc; } /* Is this the terminating symbol? */ @@ -431,12 +483,12 @@ static int get_next_block(bunzip_data *bd) /* We have our literal byte. Save it into dbuf. */ byteCount[uc]++; - dbuf[dbufCount++] = (unsigned)uc; + dbuf[dbufCount++] = (uint32_t)uc; /* Skip group initialization if we're not done with this group. Done * this way to avoid compiler warning. */ end_of_huffman_loop: - if (symCount--) goto continue_this_group; + if (--symCount >= 0) goto continue_this_group; } /* At this point, we've read all the Huffman-coded symbols (and repeated @@ -449,26 +501,28 @@ static int get_next_block(bunzip_data *bd) /* Turn byteCount into cumulative occurrence counts of 0 to n-1. */ j = 0; for (i = 0; i < 256; i++) { - k = j + byteCount[i]; + int tmp_count = j + byteCount[i]; byteCount[i] = j; - j = k; + j = tmp_count; } /* Figure out what order dbuf would be in if we sorted it. */ for (i = 0; i < dbufCount; i++) { - uc = (unsigned char)(dbuf[i] & 0xff); - dbuf[byteCount[uc]] |= (i << 8); - byteCount[uc]++; + uint8_t tmp_byte = (uint8_t)dbuf[i]; + int tmp_count = byteCount[tmp_byte]; + dbuf[tmp_count] |= (i << 8); + byteCount[tmp_byte] = tmp_count + 1; } /* Decode first byte by hand to initialize "previous" byte. Note that it doesn't get output, and if the first three characters are identical it doesn't qualify as a run (hence writeRunCountdown=5). */ if (dbufCount) { + uint32_t tmp; if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR; - bd->writePos = dbuf[origPtr]; - bd->writeCurrent = (unsigned char)(bd->writePos & 0xff); - bd->writePos >>= 8; + tmp = dbuf[origPtr]; + bd->writeCurrent = (uint8_t)tmp; + bd->writePos = (tmp >> 8); bd->writeRunCountdown = 5; } bd->writeCount = dbufCount; @@ -476,70 +530,84 @@ static int get_next_block(bunzip_data *bd) return RETVAL_OK; } -/* Undo burrows-wheeler transform on intermediate buffer to produce output. +/* Undo Burrows-Wheeler transform on intermediate buffer to produce output. If start_bunzip was initialized with out_fd=-1, then up to len bytes of data are written to outbuf. Return value is number of bytes written or error (all errors are negative numbers). If out_fd!=-1, outbuf and len are ignored, data is written to out_fd and return is RETVAL_OK or error. + + NB: read_bunzip returns < 0 on error, or the number of *unfilled* bytes + in outbuf. IOW: on EOF returns len ("all bytes are not filled"), not 0. + (Why? This allows to get rid of one local variable) */ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len) { - const unsigned *dbuf; - int pos, current, previous, gotcount; + const uint32_t *dbuf; + int pos, current, previous; + uint32_t CRC; - /* If last read was short due to end of file, return last block now */ - if (bd->writeCount < 0) return bd->writeCount; + /* If we already have error/end indicator, return it */ + if (bd->writeCount < 0) + return bd->writeCount; - gotcount = 0; dbuf = bd->dbuf; + + /* Register-cached state (hopefully): */ pos = bd->writePos; current = bd->writeCurrent; + CRC = bd->writeCRC; /* small loss on x86-32 (not enough regs), win on x86-64 */ /* We will always have pending decoded data to write into the output buffer unless this is the very first call (in which case we haven't Huffman-decoded a block into the intermediate buffer yet). */ if (bd->writeCopies) { + dec_writeCopies: /* Inside the loop, writeCopies means extra copies (beyond 1) */ --bd->writeCopies; /* Loop outputting bytes */ for (;;) { - /* If the output buffer is full, snapshot state and return */ - if (gotcount >= len) { - bd->writePos = pos; - bd->writeCurrent = current; - bd->writeCopies++; - return len; + /* If the output buffer is full, save cached state and return */ + if (--len < 0) { + /* Unlikely branch. + * Use of "goto" instead of keeping code here + * helps compiler to realize this. */ + goto outbuf_full; } /* Write next byte into output buffer, updating CRC */ - outbuf[gotcount++] = current; - bd->writeCRC = (bd->writeCRC << 8) - ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current]; + *outbuf++ = current; + CRC = (CRC << 8) ^ bd->crc32Table[(CRC >> 24) ^ current]; /* Loop now if we're outputting multiple copies of this byte */ if (bd->writeCopies) { - --bd->writeCopies; - continue; + /* Unlikely branch */ + /*--bd->writeCopies;*/ + /*continue;*/ + /* Same, but (ab)using other existing --writeCopies operation + * (and this if() compiles into just test+branch pair): */ + goto dec_writeCopies; } decode_next_byte: - if (!bd->writeCount--) break; + if (--bd->writeCount < 0) + break; /* input block is fully consumed, need next one */ + /* Follow sequence vector to undo Burrows-Wheeler transform */ previous = current; pos = dbuf[pos]; - current = pos & 0xff; + current = (uint8_t)pos; pos >>= 8; /* After 3 consecutive copies of the same byte, the 4th * is a repeat count. We count down from 4 instead * of counting up because testing for non-zero is faster */ - if (--bd->writeRunCountdown) { + if (--bd->writeRunCountdown != 0) { if (current != previous) bd->writeRunCountdown = 4; } else { - + /* Unlikely branch */ /* We have a repeated run, this byte indicates the count */ bd->writeCopies = current; current = previous; @@ -551,30 +619,42 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len) /* Subtract the 1 copy we'd output anyway to get extras */ --bd->writeCopies; } - } + } /* for(;;) */ - /* Decompression of this block completed successfully */ - bd->writeCRC = ~bd->writeCRC; - bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ bd->writeCRC; + /* Decompression of this input block completed successfully */ + bd->writeCRC = CRC = ~CRC; + bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ CRC; - /* If this block had a CRC error, force file level CRC error. */ - if (bd->writeCRC != bd->headerCRC) { + /* If this block had a CRC error, force file level CRC error */ + if (CRC != bd->headerCRC) { bd->totalCRC = bd->headerCRC + 1; return RETVAL_LAST_BLOCK; } } /* Refill the intermediate buffer by Huffman-decoding next block of input */ - /* (previous is just a convenient unused temp variable here) */ - previous = get_next_block(bd); - if (previous) { - bd->writeCount = previous; - return (previous != RETVAL_LAST_BLOCK) ? previous : gotcount; + { + int r = get_next_block(bd); + if (r) { /* error/end */ + bd->writeCount = r; + return (r != RETVAL_LAST_BLOCK) ? r : len; + } } - bd->writeCRC = ~0; + + CRC = ~0; pos = bd->writePos; current = bd->writeCurrent; goto decode_next_byte; + + outbuf_full: + /* Output buffer is full, save cached state and return */ + bd->writePos = pos; + bd->writeCurrent = current; + bd->writeCRC = CRC; + + bd->writeCopies++; + + return 0; } /* Allocate the structure, read file header. If in_fd==-1, inbuf must contain @@ -584,8 +664,8 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len) /* Because bunzip2 is used for help text unpacking, and because bb_show_usage() should work for NOFORK applets too, we must be extremely careful to not leak any allocations! */ -int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf, - int len) +int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, + const void *inbuf, int len) { bunzip_data *bd; unsigned i; @@ -606,9 +686,11 @@ int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *in if (-1 == in_fd) { /* in this case, bd->inbuf is read-only */ bd->inbuf = (void*)inbuf; /* cast away const-ness */ - bd->inbufCount = len; - } else - bd->inbuf = (unsigned char *)(bd + 1); + } else { + bd->inbuf = (uint8_t*)(bd + 1); + memcpy(bd->inbuf, inbuf, len); + } + bd->inbufCount = len; /* Init the CRC32 table (big endian) */ crc32_filltable(bd->crc32Table, 1); @@ -632,7 +714,7 @@ int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *in bd->dbufSize = 100000 * (i - h0); /* Cannot use xmalloc - may leak bd in NOFORK case! */ - bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(int)); + bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(bd->dbuf[0])); if (!bd->dbuf) { free(bd); xfunc_die(); @@ -649,57 +731,82 @@ void FAST_FUNC dealloc_bunzip(bunzip_data *bd) /* Decompress src_fd to dst_fd. Stops at end of bzip data, not end of file. */ IF_DESKTOP(long long) int FAST_FUNC -unpack_bz2_stream(int src_fd, int dst_fd) +unpack_bz2_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) { IF_DESKTOP(long long total_written = 0;) - char *outbuf; bunzip_data *bd; + char *outbuf; int i; + unsigned len; + + if (check_signature16(aux, src_fd, BZIP2_MAGIC)) + return -1; outbuf = xmalloc(IOBUF_SIZE); - i = start_bunzip(&bd, src_fd, NULL, 0); - if (!i) { - for (;;) { - i = read_bunzip(bd, outbuf, IOBUF_SIZE); - if (i <= 0) break; - if (i != full_write(dst_fd, outbuf, i)) { - i = RETVAL_SHORT_WRITE; - break; + len = 0; + while (1) { /* "Process one BZ... stream" loop */ + + i = start_bunzip(&bd, src_fd, outbuf + 2, len); + + if (i == 0) { + while (1) { /* "Produce some output bytes" loop */ + i = read_bunzip(bd, outbuf, IOBUF_SIZE); + if (i < 0) /* error? */ + break; + i = IOBUF_SIZE - i; /* number of bytes produced */ + if (i == 0) /* EOF? */ + break; + if (i != full_write(dst_fd, outbuf, i)) { + bb_error_msg("short write"); + i = RETVAL_SHORT_WRITE; + goto release_mem; + } + IF_DESKTOP(total_written += i;) } - IF_DESKTOP(total_written += i;) } - } - - /* Check CRC and release memory */ - if (i == RETVAL_LAST_BLOCK) { + if (i != RETVAL_LAST_BLOCK + /* Observed case when i == RETVAL_OK: + * "bzcat z.bz2", where "z.bz2" is a bzipped zero-length file + * (to be exact, z.bz2 is exactly these 14 bytes: + * 42 5a 68 39 17 72 45 38 50 90 00 00 00 00). + */ + && i != RETVAL_OK + ) { + bb_error_msg("bunzip error %d", i); + break; + } if (bd->headerCRC != bd->totalCRC) { bb_error_msg("CRC error"); - } else { - i = RETVAL_OK; + break; } - } else if (i == RETVAL_SHORT_WRITE) { - bb_error_msg("short write"); - } else { - bb_error_msg("bunzip error %d", i); + + /* Successfully unpacked one BZ stream */ + i = RETVAL_OK; + + /* Do we have "BZ..." after last processed byte? + * pbzip2 (parallelized bzip2) produces such files. + */ + len = bd->inbufCount - bd->inbufPos; + memcpy(outbuf, &bd->inbuf[bd->inbufPos], len); + if (len < 2) { + if (safe_read(src_fd, outbuf + len, 2 - len) != 2 - len) + break; + len = 2; + } + if (*(uint16_t*)outbuf != BZIP2_MAGIC) /* "BZ"? */ + break; + dealloc_bunzip(bd); + len -= 2; } + + release_mem: dealloc_bunzip(bd); free(outbuf); return i ? i : IF_DESKTOP(total_written) + 0; } -IF_DESKTOP(long long) int FAST_FUNC -unpack_bz2_stream_prime(int src_fd, int dst_fd) -{ - uint16_t magic2; - xread(src_fd, &magic2, 2); - if (magic2 != BZIP2_MAGIC) { - bb_error_msg_and_die("invalid magic"); - } - return unpack_bz2_stream(src_fd, dst_fd); -} - #ifdef TESTING static char *const bunzip_errors[] = { @@ -711,10 +818,9 @@ static char *const bunzip_errors[] = { /* Dumb little test thing, decompress stdin to stdout */ int main(int argc, char **argv) { - int i; char c; - int i = unpack_bz2_stream_prime(0, 1); + int i = unpack_bz2_stream(0, 1); if (i < 0) fprintf(stderr, "%s\n", bunzip_errors[-i]); else if (read(STDIN_FILENO, &c, 1)) diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libarchive/decompress_gunzip.c similarity index 96% rename from archival/libunarchive/decompress_unzip.c rename to archival/libarchive/decompress_gunzip.c index bccd026..7c6f38e 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libarchive/decompress_gunzip.c @@ -30,12 +30,12 @@ * * See the file algorithm.doc for the compression algorithms and file formats. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" typedef struct huft_t { unsigned char e; /* number of extra bits or operation */ @@ -293,8 +293,8 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current * m: maximum lookup bits, returns actual */ static int huft_build(const unsigned *b, const unsigned n, - const unsigned s, const unsigned short *d, - const unsigned char *e, huft_t **t, unsigned *m) + const unsigned s, const unsigned short *d, + const unsigned char *e, huft_t **t, unsigned *m) { unsigned a; /* counter for codes of length k */ unsigned c[BMAX + 1]; /* bit length count table */ @@ -336,7 +336,7 @@ static int huft_build(const unsigned *b, const unsigned n, } /* Find minimum and maximum length, bound *m by those */ - for (j = 1; (c[j] == 0) && (j <= BMAX); j++) + for (j = 1; (j <= BMAX) && (c[j] == 0); j++) continue; k = j; /* minimum code length */ for (i = BMAX; (c[i] == 0) && i; i--) @@ -925,10 +925,7 @@ static int inflate_block(STATE_PARAM smallint *e) /* Two callsites, both in inflate_get_next_window */ static void calculate_gunzip_crc(STATE_PARAM_ONLY) { - unsigned n; - for (n = 0; n < gunzip_outbuf_count; n++) { - gunzip_crc = gunzip_crc_table[((int) gunzip_crc ^ (gunzip_window[n])) & 0xff] ^ (gunzip_crc >> 8); - } + gunzip_crc = crc32_block_endian0(gunzip_crc, gunzip_window, gunzip_outbuf_count, gunzip_crc_table); gunzip_bytes_out += gunzip_outbuf_count; } @@ -1037,22 +1034,22 @@ inflate_unzip_internal(STATE_PARAM int in, int out) /* For unzip */ IF_DESKTOP(long long) int FAST_FUNC -inflate_unzip(inflate_unzip_result *res, off_t compr_size, int in, int out) +inflate_unzip(transformer_aux_data_t *aux, int in, int out) { IF_DESKTOP(long long) int n; DECLARE_STATE; ALLOC_STATE; - to_read = compr_size; + to_read = aux->bytes_in; // bytebuffer_max = 0x8000; bytebuffer_offset = 4; bytebuffer = xmalloc(bytebuffer_max); n = inflate_unzip_internal(PASS_STATE in, out); free(bytebuffer); - res->crc = gunzip_crc; - res->bytes_out = gunzip_bytes_out; + aux->crc32 = gunzip_crc; + aux->bytes_out = gunzip_bytes_out; DEALLOC_STATE; return n; } @@ -1110,7 +1107,7 @@ static uint32_t buffer_read_le_u32(STATE_PARAM_ONLY) return res; } -static int check_header_gzip(STATE_PARAM unpack_info_t *info) +static int check_header_gzip(STATE_PARAM transformer_aux_data_t *aux) { union { unsigned char raw[8]; @@ -1172,8 +1169,8 @@ static int check_header_gzip(STATE_PARAM unpack_info_t *info) } } - if (info) - info->mtime = SWAP_LE32(header.formatted.mtime); + if (aux) + aux->mtime = SWAP_LE32(header.formatted.mtime); /* Read the header checksum */ if (header.formatted.flags & 0x02) { @@ -1185,33 +1182,58 @@ static int check_header_gzip(STATE_PARAM unpack_info_t *info) } IF_DESKTOP(long long) int FAST_FUNC -unpack_gz_stream_with_info(int in, int out, unpack_info_t *info) +unpack_gz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) { uint32_t v32; - IF_DESKTOP(long long) int n; + IF_DESKTOP(long long) int total, n; DECLARE_STATE; - n = 0; +#if !ENABLE_FEATURE_SEAMLESS_Z + if (check_signature16(aux, src_fd, GZIP_MAGIC)) + return -1; +#else + if (aux && aux->check_signature) { + uint16_t magic2; + + if (full_read(src_fd, &magic2, 2) != 2) { + bad_magic: + bb_error_msg("invalid magic"); + return -1; + } + if (magic2 == COMPRESS_MAGIC) { + aux->check_signature = 0; + return unpack_Z_stream(aux, src_fd, dst_fd); + } + if (magic2 != GZIP_MAGIC) + goto bad_magic; + } +#endif + + total = 0; ALLOC_STATE; to_read = -1; // bytebuffer_max = 0x8000; bytebuffer = xmalloc(bytebuffer_max); - gunzip_src_fd = in; + gunzip_src_fd = src_fd; again: - if (!check_header_gzip(PASS_STATE info)) { + if (!check_header_gzip(PASS_STATE aux)) { bb_error_msg("corrupted data"); - n = -1; + total = -1; goto ret; } - n += inflate_unzip_internal(PASS_STATE in, out); - if (n < 0) + + n = inflate_unzip_internal(PASS_STATE src_fd, dst_fd); + if (n < 0) { + total = -1; goto ret; + } + total += n; if (!top_up(PASS_STATE 8)) { bb_error_msg("corrupted data"); - n = -1; + total = -1; goto ret; } @@ -1219,7 +1241,7 @@ unpack_gz_stream_with_info(int in, int out, unpack_info_t *info) v32 = buffer_read_le_u32(PASS_STATE_ONLY); if ((~gunzip_crc) != v32) { bb_error_msg("crc error"); - n = -1; + total = -1; goto ret; } @@ -1227,7 +1249,7 @@ unpack_gz_stream_with_info(int in, int out, unpack_info_t *info) v32 = buffer_read_le_u32(PASS_STATE_ONLY); if ((uint32_t)gunzip_bytes_out != v32) { bb_error_msg("incorrect length"); - n = -1; + total = -1; } if (!top_up(PASS_STATE 2)) @@ -1245,11 +1267,5 @@ unpack_gz_stream_with_info(int in, int out, unpack_info_t *info) ret: free(bytebuffer); DEALLOC_STATE; - return n; -} - -IF_DESKTOP(long long) int FAST_FUNC -unpack_gz_stream(int in, int out) -{ - return unpack_gz_stream_with_info(in, out, NULL); + return total; } diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c similarity index 85% rename from archival/libunarchive/decompress_uncompress.c rename to archival/libarchive/decompress_uncompress.c index 1ff89ce..53c2708 100644 --- a/archival/libunarchive/decompress_uncompress.c +++ b/archival/libarchive/decompress_uncompress.c @@ -25,14 +25,14 @@ */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" /* Default input buffer size */ -#define IBUFSIZ 2048 +#define IBUFSIZ 2048 /* Default output buffer size */ -#define OBUFSIZ 2048 +#define OBUFSIZ 2048 /* Defines for third byte of header */ #define BIT_MASK 0x1f /* Mask for 'number of compresssion bits' */ @@ -73,12 +73,11 @@ */ IF_DESKTOP(long long) int FAST_FUNC -unpack_Z_stream(int fd_in, int fd_out) +unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) { IF_DESKTOP(long long total_written = 0;) IF_DESKTOP(long long) int retval = -1; unsigned char *stackp; - long code; int finchar; long oldcode; long incode; @@ -103,16 +102,19 @@ unpack_Z_stream(int fd_in, int fd_out) /* block compress mode -C compatible with 2.0 */ int block_mode; /* = BLOCK_MODE; */ + if (check_signature16(aux, src_fd, COMPRESS_MAGIC)) + return -1; + inbuf = xzalloc(IBUFSIZ + 64); outbuf = xzalloc(OBUFSIZ + 2048); - htab = xzalloc(HSIZE); /* wsn't zeroed out before, maybe can xmalloc? */ + htab = xzalloc(HSIZE); /* wasn't zeroed out before, maybe can xmalloc? */ codetab = xzalloc(HSIZE * sizeof(codetab[0])); insize = 0; /* xread isn't good here, we have to return - caller may want * to do some cleanup (e.g. delete incomplete unpacked file etc) */ - if (full_read(fd_in, inbuf, 1) != 1) { + if (full_read(src_fd, inbuf, 1) != 1) { bb_error_msg("short read"); goto err; } @@ -140,8 +142,10 @@ unpack_Z_stream(int fd_in, int fd_out) /* As above, initialize the first 256 entries in the table. */ /*clear_tab_prefixof(); - done by xzalloc */ - for (code = 255; code >= 0; --code) { - tab_suffixof(code) = (unsigned char) code; + { + int i; + for (i = 255; i >= 0; --i) + tab_suffixof(i) = (unsigned char) i; } do { @@ -162,8 +166,9 @@ unpack_Z_stream(int fd_in, int fd_out) } if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) { - rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ); -//error check?? + rsize = safe_read(src_fd, inbuf + insize, IBUFSIZ); + if (rsize < 0) + bb_error_msg_and_die(bb_msg_read_error); insize += rsize; } @@ -171,6 +176,8 @@ unpack_Z_stream(int fd_in, int fd_out) (insize << 3) - (n_bits - 1)); while (inbits > posbits) { + long code; + if (free_ent > maxcode) { posbits = ((posbits - 1) + @@ -187,14 +194,15 @@ unpack_Z_stream(int fd_in, int fd_out) } { unsigned char *p = &inbuf[posbits >> 3]; - - code = ((((long) (p[0])) | ((long) (p[1]) << 8) | - ((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask; + code = ((p[0] + | ((long) (p[1]) << 8) + | ((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask; } posbits += n_bits; - if (oldcode == -1) { + if (code >= 256) + bb_error_msg_and_die("corrupted data"); /* %ld", code); */ oldcode = code; finchar = (int) oldcode; outbuf[outpos++] = (unsigned char) finchar; @@ -220,15 +228,16 @@ unpack_Z_stream(int fd_in, int fd_out) /* Special case for KwKwK string. */ if (code >= free_ent) { if (code > free_ent) { +/* unsigned char *p; posbits -= n_bits; p = &inbuf[posbits >> 3]; - bb_error_msg ("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)", - insize, posbits, p[-1], p[0], p[1], p[2], p[3], - (posbits & 07)); + insize, posbits, p[-1], p[0], p[1], p[2], p[3], + (posbits & 07)); +*/ bb_error_msg("corrupted data"); goto err; } @@ -238,7 +247,9 @@ unpack_Z_stream(int fd_in, int fd_out) } /* Generate output characters in reverse order */ - while ((long) code >= (long) 256) { + while (code >= 256) { + if (stackp <= &htabof(0)) + bb_error_msg_and_die("corrupted data"); *--stackp = tab_suffixof(code); code = tab_prefixof(code); } @@ -263,8 +274,7 @@ unpack_Z_stream(int fd_in, int fd_out) } if (outpos >= OBUFSIZ) { - full_write(fd_out, outbuf, outpos); -//error check?? + xwrite(dst_fd, outbuf, outpos); IF_DESKTOP(total_written += outpos;) outpos = 0; } @@ -278,11 +288,10 @@ unpack_Z_stream(int fd_in, int fd_out) } /* Generate the new entry. */ - code = free_ent; - if (code < maxmaxcode) { - tab_prefixof(code) = (unsigned short) oldcode; - tab_suffixof(code) = (unsigned char) finchar; - free_ent = code + 1; + if (free_ent < maxmaxcode) { + tab_prefixof(free_ent) = (unsigned short) oldcode; + tab_suffixof(free_ent) = (unsigned char) finchar; + free_ent++; } /* Remember previous code. */ @@ -292,8 +301,7 @@ unpack_Z_stream(int fd_in, int fd_out) } while (rsize > 0); if (outpos > 0) { - full_write(fd_out, outbuf, outpos); -//error check?? + xwrite(dst_fd, outbuf, outpos); IF_DESKTOP(total_written += outpos;) } diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c similarity index 95% rename from archival/libunarchive/decompress_unlzma.c rename to archival/libarchive/decompress_unlzma.c index ecda174..ca32bd8 100644 --- a/archival/libunarchive/decompress_unlzma.c +++ b/archival/libarchive/decompress_unlzma.c @@ -6,10 +6,10 @@ * Based on LzmaDecode.c from the LZMA SDK 4.22 (http://www.7-zip.org/) * Copyright (C) 1999-2005 Igor Pavlov * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #if ENABLE_FEATURE_LZMA_FAST # define speed_inline ALWAYS_INLINE @@ -45,16 +45,16 @@ typedef struct { #define RC_MODEL_TOTAL_BITS 11 -/* Called twice: once at startup (LZMA_FAST only) and once in rc_normalize() */ -static size_inline void rc_read(rc_t *rc) +/* Called once in rc_do_normalize() */ +static void rc_read(rc_t *rc) { int buffer_size = safe_read(rc->fd, RC_BUFFER, RC_BUFFER_SIZE); //TODO: return -1 instead //This will make unlzma delete broken unpacked file on unpack errors if (buffer_size <= 0) bb_error_msg_and_die("unexpected EOF"); - rc->ptr = RC_BUFFER; rc->buffer_end = RC_BUFFER + buffer_size; + rc->ptr = RC_BUFFER; } /* Called twice, but one callsite is in speed_inline'd rc_is_bit_1() */ @@ -65,6 +65,12 @@ static void rc_do_normalize(rc_t *rc) rc->range <<= 8; rc->code = (rc->code << 8) | *rc->ptr++; } +static ALWAYS_INLINE void rc_normalize(rc_t *rc) +{ + if (rc->range < (1 << RC_TOP_BITS)) { + rc_do_normalize(rc); + } +} /* Called once */ static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */ @@ -78,15 +84,9 @@ static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */ /* rc->ptr = rc->buffer_end; */ for (i = 0; i < 5; i++) { -#if ENABLE_FEATURE_LZMA_FAST - if (rc->ptr >= rc->buffer_end) - rc_read(rc); - rc->code = (rc->code << 8) | *rc->ptr++; -#else rc_do_normalize(rc); -#endif } - rc->range = 0xFFFFFFFF; + rc->range = 0xffffffff; return rc; } @@ -96,13 +96,6 @@ static ALWAYS_INLINE void rc_free(rc_t *rc) free(rc); } -static ALWAYS_INLINE void rc_normalize(rc_t *rc) -{ - if (rc->range < (1 << RC_TOP_BITS)) { - rc_do_normalize(rc); - } -} - /* rc_is_bit_1 is called 9 times */ static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p) { @@ -120,7 +113,7 @@ static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p) } /* Called 4 times in unlzma loop */ -static speed_inline int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol) +static ALWAYS_INLINE int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol) { int ret = rc_is_bit_1(rc, p); *symbol = *symbol * 2 + ret; @@ -213,7 +206,7 @@ enum { IF_DESKTOP(long long) int FAST_FUNC -unpack_lzma_stream(int src_fd, int dst_fd) +unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst_fd) { IF_DESKTOP(long long total_written = 0;) lzma_header_t header; diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c similarity index 54% rename from archival/libunarchive/decompress_unxz.c rename to archival/libarchive/decompress_unxz.c index 721acd9..986b7b1 100644 --- a/archival/libunarchive/decompress_unxz.c +++ b/archival/libarchive/decompress_unxz.c @@ -7,10 +7,10 @@ * * This file is: * Copyright (C) 2010 Denys Vlasenko - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #define XZ_FUNC FAST_FUNC #define XZ_EXTERN static @@ -22,54 +22,50 @@ /* We use our own crc32 function */ #define XZ_INTERNAL_CRC32 0 -static uint32_t *crc32_table; static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc) { - crc = ~crc; - - while (size != 0) { - crc = crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8); - --size; - } - - return ~crc; + return ~crc32_block_endian0(~crc, buf, size, global_crc32_table); } /* We use arch-optimized unaligned accessors */ #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); }) #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); }) -#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val)) -#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val)) +#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val)) +#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val)) #include "unxz/xz_dec_bcj.c" #include "unxz/xz_dec_lzma2.c" #include "unxz/xz_dec_stream.c" IF_DESKTOP(long long) int FAST_FUNC -unpack_xz_stream(int src_fd, int dst_fd) +unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) { + enum xz_ret xz_result; struct xz_buf iobuf; struct xz_dec *state; unsigned char *membuf; IF_DESKTOP(long long) int total = 0; - if (!crc32_table) - crc32_table = crc32_filltable(NULL, /*endian:*/ 0); + if (!global_crc32_table) + global_crc32_table = crc32_filltable(NULL, /*endian:*/ 0); memset(&iobuf, 0, sizeof(iobuf)); - /* Preload XZ file signature */ - membuf = (void*) strcpy(xmalloc(2 * BUFSIZ), HEADER_MAGIC); + membuf = xmalloc(2 * BUFSIZ); iobuf.in = membuf; - iobuf.in_size = HEADER_MAGIC_SIZE; iobuf.out = membuf + BUFSIZ; iobuf.out_size = BUFSIZ; + if (!aux || aux->check_signature == 0) { + /* Preload XZ file signature */ + strcpy((char*)membuf, HEADER_MAGIC); + iobuf.in_size = HEADER_MAGIC_SIZE; + } /* else: let xz code read & check it */ + /* Limit memory usage to about 64 MiB. */ state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024); + xz_result = X_OK; while (1) { - enum xz_ret r; - if (iobuf.in_pos == iobuf.in_size) { int rd = safe_read(src_fd, membuf, BUFSIZ); if (rd < 0) { @@ -77,28 +73,57 @@ unpack_xz_stream(int src_fd, int dst_fd) total = -1; break; } + if (rd == 0 && xz_result == XZ_STREAM_END) + break; iobuf.in_size = rd; iobuf.in_pos = 0; } + if (xz_result == XZ_STREAM_END) { + /* + * Try to start decoding next concatenated stream. + * Stream padding must always be a multiple of four + * bytes to preserve four-byte alignment. To keep the + * code slightly smaller, we aren't as strict here as + * the .xz spec requires. We just skip all zero-bytes + * without checking the alignment and thus can accept + * files that aren't valid, e.g. the XZ utils test + * files bad-0pad-empty.xz and bad-0catpad-empty.xz. + */ + do { + if (membuf[iobuf.in_pos] != 0) { + xz_dec_reset(state); + goto do_run; + } + iobuf.in_pos++; + } while (iobuf.in_pos < iobuf.in_size); + } + do_run: // bb_error_msg(">in pos:%d size:%d out pos:%d size:%d", // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size); - r = xz_dec_run(state, &iobuf); + xz_result = xz_dec_run(state, &iobuf); // bb_error_msg("accept, key); /* Fail if an accept list was specified and the key wasnt in there */ - if ((accept_entry == NULL) && archive_handle->accept) { - return EXIT_FAILURE; + if (archive_handle->accept) { + accept_entry = find_list_entry2(archive_handle->accept, key); + if (!accept_entry) { + return EXIT_FAILURE; + } } /* Accepted */ diff --git a/archival/libunarchive/find_list_entry.c b/archival/libarchive/find_list_entry.c similarity index 91% rename from archival/libunarchive/find_list_entry.c rename to archival/libarchive/find_list_entry.c index bc7bc64..56032c6 100644 --- a/archival/libunarchive/find_list_entry.c +++ b/archival/libarchive/find_list_entry.c @@ -2,12 +2,12 @@ /* * Copyright (C) 2002 by Glenn McGrath * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" /* Find a string in a shell pattern list */ const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename) diff --git a/archival/libunarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c similarity index 75% rename from archival/libunarchive/get_header_ar.c rename to archival/libarchive/get_header_ar.c index dbc5ec0..c66bb3e 100644 --- a/archival/libunarchive/get_header_ar.c +++ b/archival/libarchive/get_header_ar.c @@ -1,18 +1,26 @@ /* vi: set sw=4 ts=4: */ /* Copyright 2001 Glenn McGrath. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #include "ar.h" -static unsigned read_num(const char *str, int base) +/* WARNING: Clobbers str[len], so fields must be read in reverse order! */ +static unsigned read_num(char *str, int base, int len) { + int err; + + /* ar fields are fixed length text strings (padded with spaces). + * Ensure bb_strtou doesn't read past the field in case the full + * width is used. */ + str[len] = 0; + /* This code works because * on misformatted numbers bb_strtou returns all-ones */ - int err = bb_strtou(str, NULL, base); + err = bb_strtou(str, NULL, base); if (err == -1) bb_error_msg_and_die("invalid ar header"); return err; @@ -51,11 +59,13 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle) if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n') bb_error_msg_and_die("invalid ar header"); - /* FIXME: more thorough routine would be in order here - * (we have something like that in tar) - * but for now we are lax. */ - ar.formatted.magic[0] = '\0'; /* else 4G-2 file will have size="4294967294`\n..." */ - typed->size = size = read_num(ar.formatted.size, 10); + /* + * Note that the fields MUST be read in reverse order as + * read_num() clobbers the next byte after the field! + * Order is: name, date, uid, gid, mode, size, magic. + */ + typed->size = size = read_num(ar.formatted.size, 10, + sizeof(ar.formatted.size)); /* special filenames have '/' as the first character */ if (ar.formatted.name[0] == '/') { @@ -87,10 +97,10 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle) * long filename pseudo file. Thus we decode the rest * after dealing with long filename pseudo file. */ - typed->mode = read_num(ar.formatted.mode, 8); - typed->mtime = read_num(ar.formatted.date, 10); - typed->uid = read_num(ar.formatted.uid, 10); - typed->gid = read_num(ar.formatted.gid, 10); + typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode)); + typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid)); + typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid)); + typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date)); #if ENABLE_FEATURE_AR_LONG_FILENAMES if (ar.formatted.name[0] == '/') { @@ -98,7 +108,8 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle) /* The number after the '/' indicates the offset in the ar data section * (saved in ar_long_names) that conatains the real filename */ - long_offset = read_num(&ar.formatted.name[1], 10); + long_offset = read_num(&ar.formatted.name[1], 10, + sizeof(ar.formatted.name) - 1); if (long_offset >= ar_long_name_size) { bb_error_msg_and_die("can't resolve long filename"); } diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c similarity index 98% rename from archival/libunarchive/get_header_cpio.c rename to archival/libarchive/get_header_cpio.c index 4507d53..1a0058b 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libarchive/get_header_cpio.c @@ -1,11 +1,11 @@ /* vi: set sw=4 ts=4: */ /* Copyright 2002 Laurence Anderson * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" typedef struct hardlinks_t { struct hardlinks_t *next; diff --git a/archival/libunarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c similarity index 78% rename from archival/libunarchive/get_header_tar.c rename to archival/libarchive/get_header_tar.c index d5c9235..32f8420 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libarchive/get_header_tar.c @@ -1,23 +1,52 @@ /* vi: set sw=4 ts=4: */ -/* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. +/* Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * FIXME: + * FIXME: * In privileged mode if uname and gname map to a uid and gid then use the * mapped value instead of the uid/gid values in tar header * - * References: + * References: * GNU tar and star man pages, * Opengroup's ustar interchange format, - * http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html + * http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" typedef uint32_t aliased_uint32_t FIX_ALIASING; typedef off_t aliased_off_t FIX_ALIASING; +const char* FAST_FUNC strip_unsafe_prefix(const char *str) +{ + const char *cp = str; + while (1) { + char *cp2; + if (*cp == '/') { + cp++; + continue; + } + if (strncmp(cp, "/../"+1, 3) == 0) { + cp += 3; + continue; + } + cp2 = strstr(cp, "/../"); + if (!cp2) + break; + cp = cp2 + 4; + } + if (cp != str) { + static smallint warned = 0; + if (!warned) { + warned = 1; + bb_error_msg("removing leading '%.*s' from member names", + (int)(cp - str), str); + } + } + return cp; +} + /* NB: _DESTROYS_ str[len] character! */ static unsigned long long getOctal(char *str, int len) { @@ -50,34 +79,31 @@ static unsigned long long getOctal(char *str, int len) * * NB: tarballs with NEGATIVE unix times encoded that way were seen! */ - v = first; - /* Sign-extend using 6th bit: */ - v <<= sizeof(unsigned long long)*8 - 7; - v = (long long)v >> (sizeof(unsigned long long)*8 - 7); + /* Sign-extend 7bit 'first' to 64bit 'v' (that is, using 6th bit as sign): */ + first <<= 1; + first >>= 1; /* now 7th bit = 6th bit */ + v = first; /* sign-extend 8 bits to 64 */ while (--len != 0) - v = (v << 8) + (unsigned char) *str++; + v = (v << 8) + (uint8_t) *++str; } return v; } #define GET_OCTAL(a) getOctal((a), sizeof(a)) -#if ENABLE_FEATURE_TAR_SELINUX -/* Scan a PAX header for SELinux contexts, via "RHT.security.selinux" keyword. - * This is what Red Hat's patched version of tar uses. - */ -# define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux" -static char *get_selinux_sctx_from_pax_hdr(archive_handle_t *archive_handle, unsigned sz) +/* "global" is 0 or 1 */ +static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int global) { char *buf, *p; - char *result; + unsigned blk_sz; + + blk_sz = (sz + 511) & (~511); + p = buf = xmalloc(blk_sz + 1); + xread(archive_handle->src_fd, buf, blk_sz); + archive_handle->offset += blk_sz; - p = buf = xmalloc(sz + 1); /* prevent bb_strtou from running off the buffer */ buf[sz] = '\0'; - xread(archive_handle->src_fd, buf, sz); - archive_handle->offset += sz; - result = NULL; while (sz != 0) { char *end, *value; unsigned len; @@ -104,19 +130,33 @@ static char *get_selinux_sctx_from_pax_hdr(archive_handle_t *archive_handle, uns * (we do not bother to check that it *was* a newline) */ p[-1] = '\0'; - /* Is it selinux security context? */ value = end + 1; + +#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS + if (!global && strncmp(value, "path=", sizeof("path=") - 1) == 0) { + value += sizeof("path=") - 1; + free(archive_handle->tar__longname); + archive_handle->tar__longname = xstrdup(value); + continue; + } +#endif + +#if ENABLE_FEATURE_TAR_SELINUX + /* Scan for SELinux contexts, via "RHT.security.selinux" keyword. + * This is what Red Hat's patched version of tar uses. + */ +# define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux" if (strncmp(value, SELINUX_CONTEXT_KEYWORD"=", sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1) == 0) { value += sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1; - result = xstrdup(value); - break; + free(archive_handle->tar__sctx[global]); + archive_handle->tar__sctx[global] = xstrdup(value); + continue; } +#endif } free(buf); - return result; } -#endif char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) { @@ -158,13 +198,13 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) * the message and we don't check whether we indeed * saw zero block directly before this. */ if (i == 0) { - xfunc_error_retval = 0; - short_read: - bb_error_msg_and_die("short read"); + bb_error_msg("short read"); + /* this merely signals end of archive, not exit(1): */ + return EXIT_FAILURE; } if (i != 512) { IF_FEATURE_TAR_AUTODETECT(goto autodetect;) - goto short_read; + bb_error_msg_and_die("short read"); } #else @@ -181,10 +221,10 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) */ while (full_read(archive_handle->src_fd, &tar, 512) == 512) continue; - return EXIT_FAILURE; + return EXIT_FAILURE; /* "end of archive" */ } archive_handle->tar__end = 1; - return EXIT_SUCCESS; + return EXIT_SUCCESS; /* "decoded one header" */ } archive_handle->tar__end = 0; @@ -195,43 +235,18 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) || memcmp(tar.magic, "\0\0\0\0", 5) != 0) ) { #if ENABLE_FEATURE_TAR_AUTODETECT - char FAST_FUNC (*get_header_ptr)(archive_handle_t *); - uint16_t magic2; - autodetect: - magic2 = *(uint16_t*)tar.name; - /* tar gz/bz autodetect: check for gz/bz2 magic. - * If we see the magic, and it is the very first block, - * we can switch to get_header_tar_gz/bz2/lzma(). - * Needs seekable fd. I wish recv(MSG_PEEK) works - * on any fd... */ -# if ENABLE_FEATURE_SEAMLESS_GZ - if (magic2 == GZIP_MAGIC) { - get_header_ptr = get_header_tar_gz; - } else -# endif -# if ENABLE_FEATURE_SEAMLESS_BZ2 - if (magic2 == BZIP2_MAGIC - && tar.name[2] == 'h' && isdigit(tar.name[3]) - ) { /* bzip2 */ - get_header_ptr = get_header_tar_bz2; - } else -# endif -# if ENABLE_FEATURE_SEAMLESS_XZ - //TODO: if (magic2 == XZ_MAGIC1)... - //else -# endif - goto err; /* Two different causes for lseek() != 0: * unseekable fd (would like to support that too, but...), * or not first block (false positive, it's not .gz/.bz2!) */ if (lseek(archive_handle->src_fd, -i, SEEK_CUR) != 0) goto err; - while (get_header_ptr(archive_handle) == EXIT_SUCCESS) - continue; - return EXIT_FAILURE; + if (setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_detected:*/ 0) != 0) err: -#endif /* FEATURE_TAR_AUTODETECT */ + bb_error_msg_and_die("invalid tar magic"); + archive_handle->offset = 0; + goto again_after_align; +#endif bb_error_msg_and_die("invalid tar magic"); } @@ -319,10 +334,20 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) /* Set bits 12-15 of the files mode */ /* (typeflag was not trashed because chksum does not use getOctal) */ switch (tar.typeflag) { - /* busybox identifies hard links as being regular files with 0 size and a link name */ - case '1': + case '1': /* hardlink */ + /* we mark hardlinks as regular files with zero size and a link name */ file_header->mode |= S_IFREG; - break; + /* on size of link fields from star(4) + * ... For tar archives written by pre POSIX.1-1988 + * implementations, the size field usually contains the size of + * the file and needs to be ignored as no data may follow this + * header type. For POSIX.1- 1988 compliant archives, the size + * field needs to be 0. For POSIX.1-2001 compliant archives, + * the size field may be non zero, indicating that file data is + * included in the archive. + * i.e; always assume this is zero for safety. + */ + goto size0; case '7': /* case 0: */ case '0': @@ -379,12 +404,14 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) case 'S': /* Sparse file */ case 'V': /* Volume header */ #endif -#if !ENABLE_FEATURE_TAR_SELINUX case 'g': /* pax global header */ - case 'x': /* pax extended header */ -#else + case 'x': { /* pax extended header */ + if ((uoff_t)file_header->size > 0xfffff) /* paranoia */ + goto skip_ext_hdr; + process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g')); + goto again_after_align; + } skip_ext_hdr: -#endif { off_t sz; bb_error_msg("warning: skipping header '%c'", tar.typeflag); @@ -396,18 +423,6 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) /* return get_header_tar(archive_handle); */ goto again_after_align; } -#if ENABLE_FEATURE_TAR_SELINUX - case 'g': /* pax global header */ - case 'x': { /* pax extended header */ - char **pp; - if ((uoff_t)file_header->size > 0xfffff) /* paranoia */ - goto skip_ext_hdr; - pp = (tar.typeflag == 'g') ? &archive_handle->tar__global_sctx : &archive_handle->tar__next_file_sctx; - free(*pp); - *pp = get_selinux_sctx_from_pax_hdr(archive_handle, file_header->size); - goto again; - } -#endif default: bb_error_msg_and_die("unknown typeflag: 0x%x", tar.typeflag); } @@ -422,12 +437,9 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) p_linkname = NULL; } #endif - if (strncmp(file_header->name, "/../"+1, 3) == 0 - || strstr(file_header->name, "/../") - ) { - bb_error_msg_and_die("name with '..' encountered: '%s'", - file_header->name); - } + + /* Everything up to and including last ".." component is stripped */ + overlapping_strcpy(file_header->name, strip_unsafe_prefix(file_header->name)); /* Strip trailing '/' in directories */ /* Must be done after mode is set as '/' is used to check if it's a directory */ @@ -440,9 +452,11 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) if (cp) *cp = '\0'; archive_handle->action_data(archive_handle); - if (archive_handle->accept || archive_handle->reject) + if (archive_handle->accept || archive_handle->reject + || (archive_handle->ah_flags & ARCHIVE_REMEMBER_NAMES) + ) { llist_add_to(&archive_handle->passed, file_header->name); - else /* Caller isn't interested in list of unpacked files */ + } else /* Caller isn't interested in list of unpacked files */ free(file_header->name); } else { data_skip(archive_handle); @@ -457,5 +471,5 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) free(file_header->tar__uname); free(file_header->tar__gname); #endif - return EXIT_SUCCESS; + return EXIT_SUCCESS; /* "decoded one header" */ } diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libarchive/get_header_tar_bz2.c similarity index 65% rename from archival/libunarchive/get_header_tar_bz2.c rename to archival/libarchive/get_header_tar_bz2.c index 615bbba..0ee00df 100644 --- a/archival/libunarchive/get_header_tar_bz2.c +++ b/archival/libarchive/get_header_tar_bz2.c @@ -1,17 +1,17 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle) { /* Can't lseek over pipes */ archive_handle->seek = seek_by_read; - open_transformer(archive_handle->src_fd, unpack_bz2_stream_prime, "bunzip2"); + open_transformer_with_sig(archive_handle->src_fd, unpack_bz2_stream, "bunzip2"); archive_handle->offset = 0; while (get_header_tar(archive_handle) == EXIT_SUCCESS) continue; diff --git a/archival/libarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c new file mode 100644 index 0000000..0328434 --- /dev/null +++ b/archival/libarchive/get_header_tar_gz.c @@ -0,0 +1,21 @@ +/* vi: set sw=4 ts=4: */ +/* + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ + +#include "libbb.h" +#include "bb_archive.h" + +char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) +{ + /* Can't lseek over pipes */ + archive_handle->seek = seek_by_read; + + open_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip"); + archive_handle->offset = 0; + while (get_header_tar(archive_handle) == EXIT_SUCCESS) + continue; + + /* Can only do one file at a time */ + return EXIT_FAILURE; +} diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libarchive/get_header_tar_lzma.c similarity index 72% rename from archival/libunarchive/get_header_tar_lzma.c rename to archival/libarchive/get_header_tar_lzma.c index 03b1b79..d565a21 100644 --- a/archival/libunarchive/get_header_tar_lzma.c +++ b/archival/libarchive/get_header_tar_lzma.c @@ -3,18 +3,18 @@ * Small lzma deflate implementation. * Copyright (C) 2006 Aurelien Jacobs * - * Licensed under GPL v2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle) { /* Can't lseek over pipes */ archive_handle->seek = seek_by_read; - open_transformer(archive_handle->src_fd, unpack_lzma_stream, "unlzma"); + open_transformer_with_sig(archive_handle->src_fd, unpack_lzma_stream, "unlzma"); archive_handle->offset = 0; while (get_header_tar(archive_handle) == EXIT_SUCCESS) continue; diff --git a/archival/libunarchive/header_list.c b/archival/libarchive/header_list.c similarity index 66% rename from archival/libunarchive/header_list.c rename to archival/libarchive/header_list.c index b1c425a..0621aa4 100644 --- a/archival/libunarchive/header_list.c +++ b/archival/libarchive/header_list.c @@ -1,9 +1,9 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC header_list(const file_header_t *file_header) { diff --git a/archival/libunarchive/header_skip.c b/archival/libarchive/header_skip.c similarity index 55% rename from archival/libunarchive/header_skip.c rename to archival/libarchive/header_skip.c index a97a9ce..f5987bf 100644 --- a/archival/libunarchive/header_skip.c +++ b/archival/libarchive/header_skip.c @@ -1,9 +1,9 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM) { diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c similarity index 93% rename from archival/libunarchive/header_verbose_list.c rename to archival/libarchive/header_verbose_list.c index 3319e63..87dd821 100644 --- a/archival/libunarchive/header_verbose_list.c +++ b/archival/libarchive/header_verbose_list.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC header_verbose_list(const file_header_t *file_header) { diff --git a/archival/libunarchive/init_handle.c b/archival/libarchive/init_handle.c similarity index 82% rename from archival/libunarchive/init_handle.c rename to archival/libarchive/init_handle.c index ff7d484..cbae06a 100644 --- a/archival/libunarchive/init_handle.c +++ b/archival/libarchive/init_handle.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" archive_handle_t* FAST_FUNC init_handle(void) { diff --git a/archival/liblzo.h b/archival/libarchive/liblzo.h similarity index 100% rename from archival/liblzo.h rename to archival/libarchive/liblzo.h diff --git a/archival/lzo1x_1.c b/archival/libarchive/lzo1x_1.c similarity index 100% rename from archival/lzo1x_1.c rename to archival/libarchive/lzo1x_1.c diff --git a/archival/lzo1x_1o.c b/archival/libarchive/lzo1x_1o.c similarity index 100% rename from archival/lzo1x_1o.c rename to archival/libarchive/lzo1x_1o.c diff --git a/archival/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c similarity index 98% rename from archival/lzo1x_9x.c rename to archival/libarchive/lzo1x_9x.c index 0baed54..2b490ae 100644 --- a/archival/lzo1x_9x.c +++ b/archival/libarchive/lzo1x_9x.c @@ -94,7 +94,7 @@ typedef struct { ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) ) #if defined(LZO_UNALIGNED_OK_2) -# define HEAD2(b,p) (* (uint16_t *) &(b[p])) +# define HEAD2(b,p) (* (bb__aliased_uint16_t *) &(b[p])) #else # define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8)) #endif @@ -466,7 +466,6 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s, } s->m_len = 1; - s->m_len = 1; #ifdef SWD_BEST_OFF if (s->use_best_off) memset(s->best_pos, 0, sizeof(s->best_pos)); @@ -644,7 +643,7 @@ static int len_of_coded_match(unsigned m_len, unsigned m_off, unsigned lit) static int min_gain(unsigned ahead, unsigned lit1, - unsigned lit2, int l1, int l2, int l3) + unsigned lit2, int l1, int l2, int l3) { int lazy_match_min_gain = 0; @@ -673,9 +672,8 @@ static int min_gain(unsigned ahead, unsigned lit1, #if defined(SWD_BEST_OFF) static void better_match(const lzo_swd_p swd, - unsigned *m_len, unsigned *m_off) + unsigned *m_len, unsigned *m_off) { - if (*m_len <= M2_MIN_LEN) return; @@ -915,8 +913,8 @@ int lzo1x_999_compress_level(const uint8_t *in, unsigned in_len, compression_level -= 7; return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem, - c[compression_level].good_length, - c[compression_level].max_lazy, - c[compression_level].max_chain, - c[compression_level].use_best_off); + c[compression_level].good_length, + c[compression_level].max_lazy, + c[compression_level].max_chain, + c[compression_level].use_best_off); } diff --git a/archival/lzo1x_c.c b/archival/libarchive/lzo1x_c.c similarity index 99% rename from archival/lzo1x_c.c rename to archival/libarchive/lzo1x_c.c index cc86f74..8c77072 100644 --- a/archival/lzo1x_c.c +++ b/archival/libarchive/lzo1x_c.c @@ -15,7 +15,7 @@ The LZO library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License diff --git a/archival/lzo1x_d.c b/archival/libarchive/lzo1x_d.c similarity index 99% rename from archival/lzo1x_d.c rename to archival/libarchive/lzo1x_d.c index 348a855..9bc1270 100644 --- a/archival/lzo1x_d.c +++ b/archival/libarchive/lzo1x_d.c @@ -15,7 +15,7 @@ The LZO library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c new file mode 100644 index 0000000..4e98264 --- /dev/null +++ b/archival/libarchive/open_transformer.c @@ -0,0 +1,227 @@ +/* vi: set sw=4 ts=4: */ +/* + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ + +#include "libbb.h" +#include "bb_archive.h" + +void FAST_FUNC init_transformer_aux_data(transformer_aux_data_t *aux) +{ + memset(aux, 0, sizeof(*aux)); +} + +int FAST_FUNC check_signature16(transformer_aux_data_t *aux, int src_fd, unsigned magic16) +{ + if (aux && aux->check_signature) { + uint16_t magic2; + if (full_read(src_fd, &magic2, 2) != 2 || magic2 != magic16) { + bb_error_msg("invalid magic"); +#if 0 /* possible future extension */ + if (aux->check_signature > 1) + xfunc_die(); +#endif + return -1; + } + } + return 0; +} + +void check_errors_in_children(int signo) +{ + int status; + + if (!signo) { + /* block waiting for any child */ + if (wait(&status) < 0) +//FIXME: check EINTR? + return; /* probably there are no children */ + goto check_status; + } + + /* Wait for any child without blocking */ + for (;;) { + if (wait_any_nohang(&status) < 0) +//FIXME: check EINTR? + /* wait failed?! I'm confused... */ + return; + check_status: + /*if (WIFEXITED(status) && WEXITSTATUS(status) == 0)*/ + /* On Linux, the above can be checked simply as: */ + if (status == 0) + /* this child exited with 0 */ + continue; + /* Cannot happen: + if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; + */ + bb_got_signal = 1; + } +} + +/* transformer(), more than meets the eye */ +#if BB_MMU +void FAST_FUNC open_transformer(int fd, + int check_signature, + IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd) +) +#else +void FAST_FUNC open_transformer(int fd, const char *transform_prog) +#endif +{ + struct fd_pair fd_pipe; + int pid; + + xpiped_pair(fd_pipe); + pid = BB_MMU ? xfork() : xvfork(); + if (pid == 0) { + /* Child */ + close(fd_pipe.rd); /* we don't want to read from the parent */ + // FIXME: error check? +#if BB_MMU + { + IF_DESKTOP(long long) int r; + transformer_aux_data_t aux; + init_transformer_aux_data(&aux); + aux.check_signature = check_signature; + r = transformer(&aux, fd, fd_pipe.wr); + if (ENABLE_FEATURE_CLEAN_UP) { + close(fd_pipe.wr); /* send EOF */ + close(fd); + } + /* must be _exit! bug was actually seen here */ + _exit(/*error if:*/ r < 0); + } +#else + { + char *argv[4]; + xmove_fd(fd, 0); + xmove_fd(fd_pipe.wr, 1); + argv[0] = (char*)transform_prog; + argv[1] = (char*)"-cf"; + argv[2] = (char*)"-"; + argv[3] = NULL; + BB_EXECVP(transform_prog, argv); + bb_perror_msg_and_die("can't execute '%s'", transform_prog); + } +#endif + /* notreached */ + } + + /* parent process */ + close(fd_pipe.wr); /* don't want to write to the child */ + xmove_fd(fd_pipe.rd, fd); +} + + +#if SEAMLESS_COMPRESSION + +/* Used by e.g. rpm which gives us a fd without filename, + * thus we can't guess the format from filename's extension. + */ +int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected) +{ + union { + uint8_t b[4]; + uint16_t b16[2]; + uint32_t b32[1]; + } magic; + int offset = -2; + USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);) + USE_FOR_NOMMU(const char *xformer_prog;) + + /* .gz and .bz2 both have 2-byte signature, and their + * unpack_XXX_stream wants this header skipped. */ + xread(fd, magic.b16, sizeof(magic.b16[0])); + if (ENABLE_FEATURE_SEAMLESS_GZ + && magic.b16[0] == GZIP_MAGIC + ) { + USE_FOR_MMU(xformer = unpack_gz_stream;) + USE_FOR_NOMMU(xformer_prog = "gunzip";) + goto found_magic; + } + if (ENABLE_FEATURE_SEAMLESS_BZ2 + && magic.b16[0] == BZIP2_MAGIC + ) { + USE_FOR_MMU(xformer = unpack_bz2_stream;) + USE_FOR_NOMMU(xformer_prog = "bunzip2";) + goto found_magic; + } + if (ENABLE_FEATURE_SEAMLESS_XZ + && magic.b16[0] == XZ_MAGIC1 + ) { + offset = -6; + xread(fd, magic.b32, sizeof(magic.b32[0])); + if (magic.b32[0] == XZ_MAGIC2) { + USE_FOR_MMU(xformer = unpack_xz_stream;) + USE_FOR_NOMMU(xformer_prog = "unxz";) + goto found_magic; + } + } + + /* No known magic seen */ + if (fail_if_not_detected) + bb_error_msg_and_die("no gzip" + IF_FEATURE_SEAMLESS_BZ2("/bzip2") + IF_FEATURE_SEAMLESS_XZ("/xz") + " magic"); + xlseek(fd, offset, SEEK_CUR); + return 1; + + found_magic: +# if BB_MMU + open_transformer_with_no_sig(fd, xformer); +# else + /* NOMMU version of open_transformer execs + * an external unzipper that wants + * file position at the start of the file */ + xlseek(fd, offset, SEEK_CUR); + open_transformer_with_sig(fd, xformer, xformer_prog); +# endif + return 0; +} + +int FAST_FUNC open_zipped(const char *fname) +{ + char *sfx; + int fd; + + fd = open(fname, O_RDONLY); + if (fd < 0) + return fd; + + sfx = strrchr(fname, '.'); + if (sfx) { + sfx++; + if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0) + /* .lzma has no header/signature, just trust it */ + open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma"); + else + if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0) + || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0) + || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0) + ) { + setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); + } + } + + return fd; +} + +#endif /* SEAMLESS_COMPRESSION */ + +void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) +{ + int fd; + char *image; + + fd = open_zipped(fname); + if (fd < 0) + return NULL; + + image = xmalloc_read(fd, maxsz_p); + if (!image) + bb_perror_msg("read error from '%s'", fname); + close(fd); + + return image; +} diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libarchive/seek_by_jump.c similarity index 72% rename from archival/libunarchive/seek_by_jump.c rename to archival/libarchive/seek_by_jump.c index 7181cb3..4fcd99a 100644 --- a/archival/libunarchive/seek_by_jump.c +++ b/archival/libarchive/seek_by_jump.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" void FAST_FUNC seek_by_jump(int fd, off_t amount) { diff --git a/archival/libunarchive/seek_by_read.c b/archival/libarchive/seek_by_read.c similarity index 73% rename from archival/libunarchive/seek_by_read.c rename to archival/libarchive/seek_by_read.c index af65e5d..c0fde96 100644 --- a/archival/libunarchive/seek_by_read.c +++ b/archival/libarchive/seek_by_read.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" /* If we are reading through a pipe, or from stdin then we can't lseek, * we must read and discard the data to skip over it. diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c similarity index 79% rename from archival/libunarchive/unpack_ar_archive.c rename to archival/libarchive/unpack_ar_archive.c index 300d10e..214d17e 100644 --- a/archival/libunarchive/unpack_ar_archive.c +++ b/archival/libarchive/unpack_ar_archive.c @@ -1,10 +1,10 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #include "ar.h" void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive) diff --git a/archival/libunarchive/unxz/README b/archival/libarchive/unxz/README similarity index 97% rename from archival/libunarchive/unxz/README rename to archival/libarchive/unxz/README index f79b0a4..a849120 100644 --- a/archival/libunarchive/unxz/README +++ b/archival/libarchive/unxz/README @@ -7,7 +7,7 @@ XZ Embedded XZ Embedded was written for use in the Linux kernel, but the code can be easily used in other environments too, including regular userspace - applications. + applications. See userspace/xzminidec.c for an example program. This README contains information that is useful only when the copy of XZ Embedded isn't part of the Linux kernel tree. You should also @@ -55,7 +55,7 @@ Compiler requirements code is modified not to support large files, which needs some more care than just using 32-bit integer instead of 64-bit). - If you use GCC, try to use a recent version. For example, on x86, + If you use GCC, try to use a recent version. For example, on x86-32, xz_dec_lzma2.c compiled with GCC 3.3.6 is 15-25 % slower than when compiled with GCC 4.3.3. @@ -93,7 +93,7 @@ BCJ filter support them always #defined doesn't hurt either. #define Instruction set BCJ filter endianness - XZ_DEC_X86 x86 or x86-64 Little endian only + XZ_DEC_X86 x86-32 or x86-64 Little endian only XZ_DEC_POWERPC PowerPC Big endian only XZ_DEC_IA64 Itanium (IA-64) Big or little endian XZ_DEC_ARM ARM Little endian only @@ -133,4 +133,3 @@ Specifying the calling convention For example, on Windows, you may make all functions use the stdcall calling convention by defining XZ_FUNC=__stdcall when building and using the functions from XZ Embedded. - diff --git a/archival/libunarchive/unxz/xz.h b/archival/libarchive/unxz/xz.h similarity index 96% rename from archival/libunarchive/unxz/xz.h rename to archival/libarchive/unxz/xz.h index c6c071c..e0b22db 100644 --- a/archival/libunarchive/unxz/xz.h +++ b/archival/libarchive/unxz/xz.h @@ -19,6 +19,10 @@ # include #endif +#ifdef __cplusplus +extern "C" { +#endif + /* In Linux, this is used to make extern functions static when needed. */ #ifndef XZ_EXTERN # define XZ_EXTERN extern @@ -70,7 +74,7 @@ enum xz_mode { * @XZ_UNSUPPORTED_CHECK: Integrity check type is not supported. Decoding * is still possible in multi-call mode by simply * calling xz_dec_run() again. - * NOTE: This return value is used only if + * Note that this return value is used only if * XZ_DEC_ANY_CHECK was defined at build time, * which is not used in the kernel. Unsupported * check types return XZ_OPTIONS_ERROR if @@ -105,7 +109,7 @@ enum xz_mode { * stream that is truncated or otherwise corrupt. * * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer - * is too small, or the compressed input is corrupt in a way that makes the + * is too small or the compressed input is corrupt in a way that makes the * decoder produce more output than the caller expected. When it is * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR * is used instead of XZ_BUF_ERROR. @@ -207,8 +211,8 @@ XZ_EXTERN struct xz_dec * XZ_FUNC xz_dec_init( * The possible return values depend on build options and operation mode. * See enum xz_ret for details. * - * NOTE: If an error occurs in single-call mode (return value is not - * XZ_STREAM_END), b->in_pos and b->out_pos are not modified, and the + * Note that if an error occurs in single-call mode (return value is not + * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the * contents of the output buffer from b->out[b->out_pos] onward are * undefined. This is true even after XZ_BUF_ERROR, because with some filter * chains, there may be a second pass over the output buffer, and this pass @@ -268,4 +272,9 @@ XZ_EXTERN void XZ_FUNC xz_crc32_init(void); XZ_EXTERN uint32_t XZ_FUNC xz_crc32( const uint8_t *buf, size_t size, uint32_t crc); #endif + +#ifdef __cplusplus +} +#endif + #endif diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libarchive/unxz/xz_config.h similarity index 100% rename from archival/libunarchive/unxz/xz_config.h rename to archival/libarchive/unxz/xz_config.h diff --git a/archival/libunarchive/unxz/xz_dec_bcj.c b/archival/libarchive/unxz/xz_dec_bcj.c similarity index 92% rename from archival/libunarchive/unxz/xz_dec_bcj.c rename to archival/libarchive/unxz/xz_dec_bcj.c index 09162b5..e0f913a 100644 --- a/archival/libunarchive/unxz/xz_dec_bcj.c +++ b/archival/libarchive/unxz/xz_dec_bcj.c @@ -77,10 +77,13 @@ struct xz_dec_bcj { #ifdef XZ_DEC_X86 /* - * This is macro used to test the most significant byte of a memory address + * This is used to test the most significant byte of a memory address * in an x86 instruction. */ -#define bcj_x86_test_msbyte(b) ((b) == 0x00 || (b) == 0xFF) +static inline int bcj_x86_test_msbyte(uint8_t b) +{ + return b == 0x00 || b == 0xFF; +} static noinline_for_stack size_t XZ_FUNC bcj_x86( struct xz_dec_bcj *s, uint8_t *buf, size_t size) @@ -443,8 +446,12 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_bcj_run(struct xz_dec_bcj *s, * next filter in the chain. Apply the BCJ filter on the new data * in the output buffer. If everything cannot be filtered, copy it * to temp and rewind the output buffer position accordingly. + * + * This needs to be always run when temp.size == 0 to handle a special + * case where the output buffer is full and the next filter has no + * more output coming but hasn't returned XZ_STREAM_END yet. */ - if (s->temp.size < b->out_size - b->out_pos) { + if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0) { out_start = b->out_pos; memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size); b->out_pos += s->temp.size; @@ -467,16 +474,25 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_bcj_run(struct xz_dec_bcj *s, s->temp.size = b->out_pos - out_start; b->out_pos -= s->temp.size; memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size); + + /* + * If there wasn't enough input to the next filter to fill + * the output buffer with unfiltered data, there's no point + * to try decoding more data to temp. + */ + if (b->out_pos + s->temp.size < b->out_size) + return XZ_OK; } /* - * If we have unfiltered data in temp, try to fill by decoding more - * data from the next filter. Apply the BCJ filter on temp. Then we - * hopefully can fill the actual output buffer by copying filtered - * data from temp. A mix of filtered and unfiltered data may be left - * in temp; it will be taken care on the next call to this function. + * We have unfiltered data in temp. If the output buffer isn't full + * yet, try to fill the temp buffer by decoding more data from the + * next filter. Apply the BCJ filter on temp. Then we hopefully can + * fill the actual output buffer by copying filtered data from temp. + * A mix of filtered and unfiltered data may be left in temp; it will + * be taken care on the next call to this function. */ - if (s->temp.size > 0) { + if (b->out_pos < b->out_size) { /* Make b->out{,_pos,_size} temporarily point to s->temp. */ s->out = b->out; s->out_pos = b->out_pos; diff --git a/archival/libunarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c similarity index 99% rename from archival/libunarchive/unxz/xz_dec_lzma2.c rename to archival/libarchive/unxz/xz_dec_lzma2.c index da71cb4..3c2dc88 100644 --- a/archival/libunarchive/unxz/xz_dec_lzma2.c +++ b/archival/libarchive/unxz/xz_dec_lzma2.c @@ -407,7 +407,6 @@ static void XZ_FUNC dict_uncompressed( b->out_pos += copy_size; b->in_pos += copy_size; - } } @@ -972,6 +971,9 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run( */ tmp = b->in[b->in_pos++]; + if (tmp == 0x00) + return XZ_STREAM_END; + if (tmp >= 0xE0 || tmp == 0x01) { s->lzma2.need_props = true; s->lzma2.need_dict_reset = false; @@ -1004,9 +1006,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run( lzma_reset(s); } } else { - if (tmp == 0x00) - return XZ_STREAM_END; - if (tmp > 0x02) return XZ_DATA_ERROR; diff --git a/archival/libunarchive/unxz/xz_dec_stream.c b/archival/libarchive/unxz/xz_dec_stream.c similarity index 100% rename from archival/libunarchive/unxz/xz_dec_stream.c rename to archival/libarchive/unxz/xz_dec_stream.c diff --git a/archival/libunarchive/unxz/xz_lzma2.h b/archival/libarchive/unxz/xz_lzma2.h similarity index 100% rename from archival/libunarchive/unxz/xz_lzma2.h rename to archival/libarchive/unxz/xz_lzma2.h diff --git a/archival/libunarchive/unxz/xz_private.h b/archival/libarchive/unxz/xz_private.h similarity index 100% rename from archival/libunarchive/unxz/xz_private.h rename to archival/libarchive/unxz/xz_private.h diff --git a/archival/libunarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h similarity index 72% rename from archival/libunarchive/unxz/xz_stream.h rename to archival/libarchive/unxz/xz_stream.h index 36f2a7c..66cb5a7 100644 --- a/archival/libunarchive/unxz/xz_stream.h +++ b/archival/libarchive/unxz/xz_stream.h @@ -25,15 +25,20 @@ #define STREAM_HEADER_SIZE 12 -#define HEADER_MAGIC "\3757zXZ\0" +#define HEADER_MAGIC "\3757zXZ" #define HEADER_MAGIC_SIZE 6 #define FOOTER_MAGIC "YZ" #define FOOTER_MAGIC_SIZE 2 /* - * Variable-length integer can hold a 63-bit unsigned integer, or a special - * value to indicate that the value is unknown. + * Variable-length integer can hold a 63-bit unsigned integer or a special + * value indicating that the value is unknown. + * + * Experimental: vli_type can be defined to uint32_t to save a few bytes + * in code size (no effect on speed). Doing so limits the uncompressed and + * compressed size of the file to less than 256 MiB and may also weaken + * error detection slightly. */ typedef uint64_t vli_type; diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src deleted file mode 100644 index a854957..0000000 --- a/archival/libunarchive/Kbuild.src +++ /dev/null @@ -1,61 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2004 by Erik Andersen -# -# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. - -lib-y:= - -COMMON_FILES:= \ -\ - data_skip.o \ - data_extract_all.o \ - data_extract_to_stdout.o \ -\ - filter_accept_all.o \ - filter_accept_list.o \ - filter_accept_reject_list.o \ -\ - header_skip.o \ - header_list.o \ - header_verbose_list.o \ -\ - seek_by_read.o \ - seek_by_jump.o \ -\ - data_align.o \ - find_list_entry.o \ - init_handle.o - -DPKG_FILES:= \ - get_header_ar.o \ - unpack_ar_archive.o \ - get_header_tar.o \ - filter_accept_list_reassign.o - -INSERT - -lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o -lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o -lib-$(CONFIG_UNLZMA) += decompress_unlzma.o -lib-$(CONFIG_UNXZ) += decompress_unxz.o -lib-$(CONFIG_CPIO) += get_header_cpio.o -lib-$(CONFIG_DPKG) += $(DPKG_FILES) -lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) -lib-$(CONFIG_GUNZIP) += decompress_unzip.o -lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o -lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o -lib-$(CONFIG_TAR) += get_header_tar.o -lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o -lib-$(CONFIG_UNZIP) += decompress_unzip.o -lib-$(CONFIG_FEATURE_SEAMLESS_Z) += open_transformer.o decompress_uncompress.o -lib-$(CONFIG_FEATURE_SEAMLESS_GZ) += open_transformer.o decompress_unzip.o get_header_tar_gz.o -lib-$(CONFIG_FEATURE_SEAMLESS_BZ2) += open_transformer.o decompress_bunzip2.o get_header_tar_bz2.o -lib-$(CONFIG_FEATURE_SEAMLESS_LZMA) += open_transformer.o decompress_unlzma.o get_header_tar_lzma.o -lib-$(CONFIG_FEATURE_SEAMLESS_XZ) += open_transformer.o decompress_unxz.o -lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o -lib-$(CONFIG_FEATURE_TAR_TO_COMMAND) += data_extract_to_command.o - -ifneq ($(lib-y),) -lib-y += $(COMMON_FILES) -endif diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c deleted file mode 100644 index e88b720..0000000 --- a/archival/libunarchive/get_header_tar_gz.c +++ /dev/null @@ -1,36 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - */ - -#include "libbb.h" -#include "unarchive.h" - -char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) -{ -#if BB_MMU - unsigned char magic[2]; -#endif - - /* Can't lseek over pipes */ - archive_handle->seek = seek_by_read; - - /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case). - * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will - * need the header. */ -#if BB_MMU - xread(archive_handle->src_fd, &magic, 2); - /* Can skip this check, but error message will be less clear */ - if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { - bb_error_msg_and_die("invalid gzip magic"); - } -#endif - - open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip"); - archive_handle->offset = 0; - while (get_header_tar(archive_handle) == EXIT_SUCCESS) - continue; - - /* Can only do one file at a time */ - return EXIT_FAILURE; -} diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c deleted file mode 100644 index cba049f..0000000 --- a/archival/libunarchive/open_transformer.c +++ /dev/null @@ -1,54 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - */ - -#include "libbb.h" -#include "unarchive.h" - -/* transformer(), more than meets the eye */ -/* - * On MMU machine, the transform_prog is removed by macro magic - * in include/unarchive.h. On NOMMU, transformer is removed. - */ -void FAST_FUNC open_transformer(int fd, - IF_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd), - const char *transform_prog) -{ - struct fd_pair fd_pipe; - int pid; - - xpiped_pair(fd_pipe); - pid = BB_MMU ? xfork() : xvfork(); - if (pid == 0) { - /* Child */ - close(fd_pipe.rd); /* we don't want to read from the parent */ - // FIXME: error check? -#if BB_MMU - transformer(fd, fd_pipe.wr); - if (ENABLE_FEATURE_CLEAN_UP) { - close(fd_pipe.wr); /* send EOF */ - close(fd); - } - /* must be _exit! bug was actually seen here */ - _exit(EXIT_SUCCESS); -#else - { - char *argv[4]; - xmove_fd(fd, 0); - xmove_fd(fd_pipe.wr, 1); - argv[0] = (char*)transform_prog; - argv[1] = (char*)"-cf"; - argv[2] = (char*)"-"; - argv[3] = NULL; - BB_EXECVP(transform_prog, argv); - bb_perror_msg_and_die("can't execute '%s'", transform_prog); - } -#endif - /* notreached */ - } - - /* parent process */ - close(fd_pipe.wr); /* don't want to write to the child */ - xmove_fd(fd_pipe.rd, fd); -} diff --git a/archival/lzop.c b/archival/lzop.c index ab4d34c..5062d93 100644 --- a/archival/lzop.c +++ b/archival/lzop.c @@ -14,7 +14,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License @@ -25,8 +25,53 @@ "Minimalized" for busybox by Alain Knaff */ +//config:config LZOP +//config: bool "lzop" +//config: default y +//config: help +//config: Lzop compression/decompresion. +//config: +//config:config LZOP_COMPR_HIGH +//config: bool "lzop compression levels 7,8,9 (not very useful)" +//config: default n +//config: depends on LZOP +//config: help +//config: High levels (7,8,9) of lzop compression. These levels +//config: are actually slower than gzip at equivalent compression ratios +//config: and take up 3.2K of code. + +//applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP)) +//applet:IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) +//applet:IF_LZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) +//kbuild:lib-$(CONFIG_LZOP) += lzop.o + +//usage:#define lzop_trivial_usage +//usage: "[-cfvd123456789CF] [FILE]..." +//usage:#define lzop_full_usage "\n\n" +//usage: " -1..9 Compression level" +//usage: "\n -d Decompress" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: "\n -v Verbose" +//usage: "\n -F Don't store or verify checksum" +//usage: "\n -C Also write checksum of compressed block" +//usage: +//usage:#define lzopcat_trivial_usage +//usage: "[-vCF] [FILE]..." +//usage:#define lzopcat_full_usage "\n\n" +//usage: " -v Verbose" +//usage: "\n -F Don't store or verify checksum" +//usage: +//usage:#define unlzop_trivial_usage +//usage: "[-cfvCF] [FILE]..." +//usage:#define unlzop_full_usage "\n\n" +//usage: " -c Write to stdout" +//usage: "\n -f Force" +//usage: "\n -v Verbose" +//usage: "\n -F Don't store or verify checksum" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #include "liblzo_interface.h" /* lzo-2.03/src/lzo_ptr.h */ @@ -91,7 +136,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, unsigned nl; unsigned long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0; -// LZO_UNUSED(wrkmem); +// LZO_UNUSED(wrkmem); *out_len = 0; @@ -176,7 +221,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, /* remove short run */ *litp &= ~3; /* copy over the 2 literals that replace the match */ - copy2(ip-3+1,m_pos,pd(op,m_pos)); + copy2(ip-3+1, m_pos, pd(op, m_pos)); /* move literals 1 byte ahead */ litp += 2; if (lit > 0) @@ -186,7 +231,8 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, *litp = (unsigned char)(lit - 3); o_m1_b++; - *op++ = *m_pos++; *op++ = *m_pos++; + *op++ = *m_pos++; + *op++ = *m_pos++; goto copy_literal_run; } copy_m1: @@ -215,7 +261,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, ) { t = *ip++; /* copy over the 3 literals that replace the match */ - copy3(ip-1-2,m_pos,pd(op,m_pos)); + copy3(ip-1-2, m_pos, pd(op, m_pos)); /* set new length of previous literal run */ lit += 3 + t + 3; *litp = (unsigned char)(lit - 3); @@ -264,7 +310,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, lit += 3; *litp = (unsigned char)((*litp & ~3) | lit); /* copy over the 3 literals that replace the match */ - copy3(ip-3,m_pos,pd(op,m_pos)); + copy3(ip-3, m_pos, pd(op, m_pos)); o_m3_a++; } /* test if a literal run follows */ @@ -275,7 +321,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, /* remove short run */ *litp &= ~3; /* copy over the 3 literals that replace the match */ - copy3(ip-4+1,m_pos,pd(op,m_pos)); + copy3(ip-4+1, m_pos, pd(op, m_pos)); /* move literals 1 byte ahead */ litp += 2; if (lit > 0) @@ -320,11 +366,11 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, return LZO_E_EOF_NOT_FOUND; eof_found: -// LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2); -// LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b); +// LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2); +// LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b); *out_len = pd(op, out); return (ip == ip_end ? LZO_E_OK : - (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); + (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); } /**********************************************************************/ @@ -393,7 +439,7 @@ typedef struct header_t { } header_t; struct globals { - const uint32_t *lzo_crc32_table; + /*const uint32_t *lzo_crc32_table;*/ chksum_t chksum_in; chksum_t chksum_out; } FIX_ALIASING; @@ -401,7 +447,7 @@ struct globals { #define INIT_G() do { } while (0) //#define G (*ptr_to_globals) //#define INIT_G() do { -// SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); +// SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); //} while (0) @@ -410,25 +456,27 @@ struct globals { //#define LZOP_VERSION_STRING "1.01" //#define LZOP_VERSION_DATE "Apr 27th 2003" -#define OPTION_STRING "cfvdt123456789CF" +#define OPTION_STRING "cfvqdt123456789CF" +/* Note: must be kept in sync with archival/bbunzip.c */ enum { OPT_STDOUT = (1 << 0), OPT_FORCE = (1 << 1), OPT_VERBOSE = (1 << 2), - OPT_DECOMPRESS = (1 << 3), - OPT_TEST = (1 << 4), - OPT_1 = (1 << 5), - OPT_2 = (1 << 6), - OPT_3 = (1 << 7), - OPT_4 = (1 << 8), - OPT_5 = (1 << 9), - OPT_6 = (1 << 10), - OPT_789 = (7 << 11), - OPT_7 = (1 << 11), - OPT_8 = (1 << 12), - OPT_C = (1 << 14), - OPT_F = (1 << 15), + OPT_QUIET = (1 << 3), + OPT_DECOMPRESS = (1 << 4), + OPT_TEST = (1 << 5), + OPT_1 = (1 << 6), + OPT_2 = (1 << 7), + OPT_3 = (1 << 8), + OPT_4 = (1 << 9), + OPT_5 = (1 << 10), + OPT_6 = (1 << 11), + OPT_789 = (7 << 12), + OPT_7 = (1 << 13), + OPT_8 = (1 << 14), + OPT_C = (1 << 15), + OPT_F = (1 << 16), }; /**********************************************************************/ @@ -468,19 +516,10 @@ lzo_adler32(uint32_t adler, const uint8_t* buf, unsigned len) static FAST_FUNC uint32_t lzo_crc32(uint32_t c, const uint8_t* buf, unsigned len) { - uint32_t crc; - - if (buf == NULL) - return 0; + //if (buf == NULL) - impossible + // return 0; - crc = ~c; - if (len != 0) do { - crc = G.lzo_crc32_table[(uint8_t)((int)crc ^ *buf)] ^ (crc >> 8); - buf += 1; - len -= 1; - } while (len > 0); - - return ~crc; + return ~crc32_block_endian0(~c, buf, len, global_crc32_table); } /**********************************************************************/ @@ -679,8 +718,7 @@ static NOINLINE smallint lzo_compress(const header_t *h) if (dst_len < src_len) { /* write checksum of compressed block */ if (h->flags & F_ADLER32_C) - write32(lzo_adler32(ADLER32_INIT_VALUE, b2, - dst_len)); + write32(lzo_adler32(ADLER32_INIT_VALUE, b2, dst_len)); if (h->flags & F_CRC32_C) write32(lzo_crc32(CRC32_INIT_VALUE, b2, dst_len)); /* write compressed block data */ @@ -697,10 +735,16 @@ static NOINLINE smallint lzo_compress(const header_t *h) return ok; } -static void lzo_check(uint32_t FAST_FUNC (*fn)(uint32_t, const uint8_t*, unsigned), - uint32_t ref, uint32_t init, - uint8_t* buf, unsigned len) +static FAST_FUNC void lzo_check( + uint32_t init, + uint8_t* buf, unsigned len, + uint32_t FAST_FUNC (*fn)(uint32_t, const uint8_t*, unsigned), + uint32_t ref) { + /* This function, by having the same order of parameters + * as fn, and by being marked FAST_FUNC (same as fn), + * saves a dozen bytes of code. + */ uint32_t c = fn(init, buf, len); if (c != ref) bb_error_msg_and_die("checksum error"); @@ -747,9 +791,8 @@ static NOINLINE smallint lzo_decompress(const header_t *h) if (dst_len > block_size) { if (b2) { -//FIXME! - b2 = NULL; free(b2); + b2 = NULL; } block_size = dst_len; mcs_block_size = MAX_COMPRESSED_SIZE(block_size); @@ -781,13 +824,13 @@ static NOINLINE smallint lzo_decompress(const header_t *h) if (!(option_mask32 & OPT_F)) { /* verify checksum of compressed block */ if (h->flags & F_ADLER32_C) - lzo_check(lzo_adler32, c_adler32, - ADLER32_INIT_VALUE, - b1, src_len); + lzo_check(ADLER32_INIT_VALUE, + b1, src_len, + lzo_adler32, c_adler32); if (h->flags & F_CRC32_C) - lzo_check(lzo_crc32, c_crc32, - CRC32_INIT_VALUE, - b1, src_len); + lzo_check(CRC32_INIT_VALUE, + b1, src_len, + lzo_crc32, c_crc32); } /* decompress */ @@ -808,11 +851,13 @@ static NOINLINE smallint lzo_decompress(const header_t *h) if (!(option_mask32 & OPT_F)) { /* verify checksum of uncompressed block */ if (h->flags & F_ADLER32_D) - lzo_check(lzo_adler32, d_adler32, ADLER32_INIT_VALUE, - dst, dst_len); + lzo_check(ADLER32_INIT_VALUE, + dst, dst_len, + lzo_adler32, d_adler32); if (h->flags & F_CRC32_D) - lzo_check(lzo_crc32, d_crc32, CRC32_INIT_VALUE, - dst, dst_len); + lzo_check(CRC32_INIT_VALUE, + dst, dst_len, + lzo_crc32, d_crc32); } /* write uncompressed block data */ @@ -1054,7 +1099,7 @@ static char* FAST_FUNC make_new_name_lzop(char *filename, const char *expected_e return xasprintf("%s.lzo", filename); } -static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(unpack_info_t *info UNUSED_PARAM) +static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(transformer_aux_data_t *aux UNUSED_PARAM) { if (option_mask32 & OPT_DECOMPRESS) return do_lzo_decompress(); @@ -1070,9 +1115,9 @@ int lzop_main(int argc UNUSED_PARAM, char **argv) if (applet_name[4] == 'c') option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS); /* unlzop? */ - if (applet_name[0] == 'u') + if (applet_name[4] == 'o') option_mask32 |= OPT_DECOMPRESS; - G.lzo_crc32_table = crc32_filltable(NULL, 0); + global_crc32_table = crc32_filltable(NULL, 0); return bbunpack(argv, pack_lzop, make_new_name_lzop, /*unused:*/ NULL); } diff --git a/archival/rpm.c b/archival/rpm.c index 38ec20e..885eddd 100644 --- a/archival/rpm.c +++ b/archival/rpm.c @@ -4,11 +4,32 @@ * * Copyright (C) 2001,2002 by Laurence Anderson * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//config:config RPM +//config: bool "rpm" +//config: default y +//config: help +//config: Mini RPM applet - queries and extracts RPM packages. + +//applet:IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_RPM) += rpm.o + +//usage:#define rpm_trivial_usage +//usage: "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm" +//usage:#define rpm_full_usage "\n\n" +//usage: "Manipulate RPM packages\n" +//usage: "\nCommands:" +//usage: "\n -i Install package" +//usage: "\n -qp Query package" +//usage: "\n -qpi Show information" +//usage: "\n -qpl List contents" +//usage: "\n -qpd List documents" +//usage: "\n -qpc List config files" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #include "rpm.h" #define RPM_CHAR_TYPE 1 @@ -67,136 +88,13 @@ typedef struct { uint32_t count; /* 4 byte count */ } rpm_index; -static void *map; -static rpm_index **mytags; -static int tagcount; - -static void extract_cpio(int fd, const char *source_rpm); -static rpm_index **rpm_gettags(int fd, int *num_tags); -static int bsearch_rpmtag(const void *key, const void *item); -static char *rpm_getstr(int tag, int itemindex); -static int rpm_getint(int tag, int itemindex); -static int rpm_getcount(int tag); -static void fileaction_dobackup(char *filename, int fileref); -static void fileaction_setowngrp(char *filename, int fileref); -static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref)); - -int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int rpm_main(int argc, char **argv) -{ - int opt = 0, func = 0, rpm_fd, offset; - const int pagesize = getpagesize(); - - while ((opt = getopt(argc, argv, "iqpldc")) != -1) { - switch (opt) { - case 'i': /* First arg: Install mode, with q: Information */ - if (!func) func = rpm_install; - else func |= rpm_query_info; - break; - case 'q': /* First arg: Query mode */ - if (func) bb_show_usage(); - func = rpm_query; - break; - case 'p': /* Query a package */ - func |= rpm_query_package; - break; - case 'l': /* List files in a package */ - func |= rpm_query_list; - break; - case 'd': /* List doc files in a package (implies list) */ - func |= rpm_query_list; - func |= rpm_query_list_doc; - break; - case 'c': /* List config files in a package (implies list) */ - func |= rpm_query_list; - func |= rpm_query_list_config; - break; - default: - bb_show_usage(); - } - } - argv += optind; - //argc -= optind; - if (!argv[0]) { - bb_show_usage(); - } - - while (*argv) { - const char *source_rpm; - - rpm_fd = xopen(*argv++, O_RDONLY); - mytags = rpm_gettags(rpm_fd, &tagcount); - if (!mytags) - bb_error_msg_and_die("error reading rpm header"); - offset = xlseek(rpm_fd, 0, SEEK_CUR); - /* Mimimum is one page */ - map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0); - - source_rpm = rpm_getstr(TAG_SOURCERPM, 0); - - if (func & rpm_install) { - /* Backup any config files */ - loop_through_files(TAG_BASENAMES, fileaction_dobackup); - /* Extact the archive */ - extract_cpio(rpm_fd, source_rpm); - /* Set the correct file uid/gid's */ - loop_through_files(TAG_BASENAMES, fileaction_setowngrp); - } - else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) { - if (!(func & (rpm_query_info|rpm_query_list))) { - /* If just a straight query, just give package name */ - printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0)); - } - if (func & rpm_query_info) { - /* Do the nice printout */ - time_t bdate_time; - struct tm *bdate_ptm; - char bdatestring[50]; - const char *p; - - p = rpm_getstr(TAG_PREFIXS, 0); - if (!p) p = "(not relocateable)"; - printf("Name : %-29sRelocations: %s\n", rpm_getstr(TAG_NAME, 0), p); - p = rpm_getstr(TAG_VENDOR, 0); - if (!p) p = "(none)"; - printf("Version : %-34sVendor: %s\n", rpm_getstr(TAG_VERSION, 0), p); - bdate_time = rpm_getint(TAG_BUILDTIME, 0); - bdate_ptm = localtime(&bdate_time); - strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm); - printf("Release : %-30sBuild Date: %s\n", rpm_getstr(TAG_RELEASE, 0), bdatestring); - printf("Install date: %-30sBuild Host: %s\n", "(not installed)", rpm_getstr(TAG_BUILDHOST, 0)); - printf("Group : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), source_rpm); - printf("Size : %-33dLicense: %s\n", rpm_getint(TAG_SIZE, 0), rpm_getstr(TAG_LICENSE, 0)); - printf("URL : %s\n", rpm_getstr(TAG_URL, 0)); - printf("Summary : %s\n", rpm_getstr(TAG_SUMMARY, 0)); - printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0)); - } - if (func & rpm_query_list) { - int count, it, flags; - count = rpm_getcount(TAG_BASENAMES); - for (it = 0; it < count; it++) { - flags = rpm_getint(TAG_FILEFLAGS, it); - switch (func & (rpm_query_list_doc|rpm_query_list_config)) { - case rpm_query_list_doc: - if (!(flags & RPMFILE_DOC)) continue; - break; - case rpm_query_list_config: - if (!(flags & RPMFILE_CONFIG)) continue; - break; - case rpm_query_list_doc|rpm_query_list_config: - if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue; - break; - } - printf("%s%s\n", - rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)), - rpm_getstr(TAG_BASENAMES, it)); - } - } - } - free(mytags); - } - return 0; -} +struct globals { + void *map; + rpm_index **mytags; + int tagcount; +} FIX_ALIASING; +#define G (*(struct globals*)&bb_common_bufsiz1) +#define INIT_G() do { } while (0) static void extract_cpio(int fd, const char *source_rpm) { @@ -219,12 +117,12 @@ static void extract_cpio(int fd, const char *source_rpm) /* compat: overwrite existing files. * try "rpm -i foo.src.rpm" few times in a row - * standard rpm will not complain. - * (TODO? real rpm creates "file;1234" and then renames it) */ - | ARCHIVE_UNLINK_OLD; + */ + | ARCHIVE_REPLACE_VIA_RENAME; archive_handle->src_fd = fd; /*archive_handle->offset = 0; - init_handle() did it */ - setup_unzip_on_fd(archive_handle->src_fd /*, fail_if_not_detected: 1*/); + setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_detected:*/ 1); while (get_header_cpio(archive_handle) == EXIT_SUCCESS) continue; } @@ -282,7 +180,7 @@ static int bsearch_rpmtag(const void *key, const void *item) static int rpm_getcount(int tag) { rpm_index **found; - found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); + found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); if (!found) return 0; return found[0]->count; @@ -291,7 +189,7 @@ static int rpm_getcount(int tag) static char *rpm_getstr(int tag, int itemindex) { rpm_index **found; - found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); + found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); if (!found || itemindex >= found[0]->count) return NULL; if (found[0]->type == RPM_STRING_TYPE @@ -299,7 +197,7 @@ static char *rpm_getstr(int tag, int itemindex) || found[0]->type == RPM_STRING_ARRAY_TYPE ) { int n; - char *tmpstr = (char *) map + found[0]->offset; + char *tmpstr = (char *) G.map + found[0]->offset; for (n = 0; n < itemindex; n++) tmpstr = tmpstr + strlen(tmpstr) + 1; return tmpstr; @@ -310,32 +208,25 @@ static char *rpm_getstr(int tag, int itemindex) static int rpm_getint(int tag, int itemindex) { rpm_index **found; - int *tmpint; /* NB: using int8_t* would be easier to code */ + char *tmpint; /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ... * it's ok to ignore it because tag won't be used as a pointer */ - found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); + found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); if (!found || itemindex >= found[0]->count) return -1; - tmpint = (int *) ((char *) map + found[0]->offset); - + tmpint = (char *) G.map + found[0]->offset; if (found[0]->type == RPM_INT32_TYPE) { - tmpint = (int *) ((char *) tmpint + itemindex*4); - /*return ntohl(*tmpint);*/ - /* int can be != int32_t */ + tmpint += itemindex*4; return ntohl(*(int32_t*)tmpint); } if (found[0]->type == RPM_INT16_TYPE) { - tmpint = (int *) ((char *) tmpint + itemindex*2); - /* ??? read int, and THEN ntohs() it?? */ - /*return ntohs(*tmpint);*/ + tmpint += itemindex*2; return ntohs(*(int16_t*)tmpint); } if (found[0]->type == RPM_INT8_TYPE) { - tmpint = (int *) ((char *) tmpint + itemindex); - /* ??? why we don't read byte here??? */ - /*return ntohs(*tmpint);*/ + tmpint += itemindex; return *(int8_t*)tmpint; } return -1; @@ -380,3 +271,134 @@ static void loop_through_files(int filetag, void (*fileaction)(char *filename, i free(filename); } } + +int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int rpm_main(int argc, char **argv) +{ + int opt, func = 0; + const unsigned pagesize = getpagesize(); + + while ((opt = getopt(argc, argv, "iqpldc")) != -1) { + switch (opt) { + case 'i': /* First arg: Install mode, with q: Information */ + if (!func) func = rpm_install; + else func |= rpm_query_info; + break; + case 'q': /* First arg: Query mode */ + if (func) bb_show_usage(); + func = rpm_query; + break; + case 'p': /* Query a package */ + func |= rpm_query_package; + break; + case 'l': /* List files in a package */ + func |= rpm_query_list; + break; + case 'd': /* List doc files in a package (implies list) */ + func |= rpm_query_list; + func |= rpm_query_list_doc; + break; + case 'c': /* List config files in a package (implies list) */ + func |= rpm_query_list; + func |= rpm_query_list_config; + break; + default: + bb_show_usage(); + } + } + argv += optind; + //argc -= optind; + if (!argv[0]) { + bb_show_usage(); + } + + while (*argv) { + int rpm_fd; + unsigned mapsize; + const char *source_rpm; + + rpm_fd = xopen(*argv++, O_RDONLY); + G.mytags = rpm_gettags(rpm_fd, &G.tagcount); + if (!G.mytags) + bb_error_msg_and_die("error reading rpm header"); + mapsize = xlseek(rpm_fd, 0, SEEK_CUR); + mapsize = (mapsize + pagesize) & -(int)pagesize; + /* Some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */ + G.map = mmap(0, mapsize, PROT_READ, MAP_PRIVATE, rpm_fd, 0); +//FIXME: error check? + + source_rpm = rpm_getstr(TAG_SOURCERPM, 0); + + if (func & rpm_install) { + /* Backup any config files */ + loop_through_files(TAG_BASENAMES, fileaction_dobackup); + /* Extact the archive */ + extract_cpio(rpm_fd, source_rpm); + /* Set the correct file uid/gid's */ + loop_through_files(TAG_BASENAMES, fileaction_setowngrp); + } + else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) { + if (!(func & (rpm_query_info|rpm_query_list))) { + /* If just a straight query, just give package name */ + printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0)); + } + if (func & rpm_query_info) { + /* Do the nice printout */ + time_t bdate_time; + struct tm *bdate_ptm; + char bdatestring[50]; + const char *p; + + printf("%-12s: %s\n", "Name" , rpm_getstr(TAG_NAME, 0)); + /* TODO compat: add "Epoch" here */ + printf("%-12s: %s\n", "Version" , rpm_getstr(TAG_VERSION, 0)); + printf("%-12s: %s\n", "Release" , rpm_getstr(TAG_RELEASE, 0)); + /* add "Architecture" */ + printf("%-12s: %s\n", "Install Date", "(not installed)"); + printf("%-12s: %s\n", "Group" , rpm_getstr(TAG_GROUP, 0)); + printf("%-12s: %d\n", "Size" , rpm_getint(TAG_SIZE, 0)); + printf("%-12s: %s\n", "License" , rpm_getstr(TAG_LICENSE, 0)); + /* add "Signature" */ + printf("%-12s: %s\n", "Source RPM" , source_rpm ? source_rpm : "(none)"); + bdate_time = rpm_getint(TAG_BUILDTIME, 0); + bdate_ptm = localtime(&bdate_time); + strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm); + printf("%-12s: %s\n", "Build Date" , bdatestring); + printf("%-12s: %s\n", "Build Host" , rpm_getstr(TAG_BUILDHOST, 0)); + p = rpm_getstr(TAG_PREFIXS, 0); + printf("%-12s: %s\n", "Relocations" , p ? p : "(not relocatable)"); + /* add "Packager" */ + p = rpm_getstr(TAG_VENDOR, 0); + printf("%-12s: %s\n", "Vendor" , p ? p : "(none)"); + printf("%-12s: %s\n", "URL" , rpm_getstr(TAG_URL, 0)); + printf("%-12s: %s\n", "Summary" , rpm_getstr(TAG_SUMMARY, 0)); + printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0)); + } + if (func & rpm_query_list) { + int count, it, flags; + count = rpm_getcount(TAG_BASENAMES); + for (it = 0; it < count; it++) { + flags = rpm_getint(TAG_FILEFLAGS, it); + switch (func & (rpm_query_list_doc|rpm_query_list_config)) { + case rpm_query_list_doc: + if (!(flags & RPMFILE_DOC)) continue; + break; + case rpm_query_list_config: + if (!(flags & RPMFILE_CONFIG)) continue; + break; + case rpm_query_list_doc|rpm_query_list_config: + if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue; + break; + } + printf("%s%s\n", + rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)), + rpm_getstr(TAG_BASENAMES, it)); + } + } + } + munmap(G.map, mapsize); + free(G.mytags); + close(rpm_fd); + } + return 0; +} diff --git a/archival/rpm.h b/archival/rpm.h index f7c6fc2..afe2b55 100644 --- a/archival/rpm.h +++ b/archival/rpm.h @@ -4,7 +4,7 @@ * * Copyright (C) 2001 by Laurence Anderson * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* RPM file starts with this struct: */ diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index 5bc50b8..61adde7 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c @@ -4,10 +4,25 @@ * * Copyright (C) 2001 by Laurence Anderson * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//config:config RPM2CPIO +//config: bool "rpm2cpio" +//config: default y +//config: help +//config: Converts a RPM file into a CPIO archive. + +//applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o + +//usage:#define rpm2cpio_trivial_usage +//usage: "package.rpm" +//usage:#define rpm2cpio_full_usage "\n\n" +//usage: "Output a cpio archive of the rpm file" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" #include "rpm.h" enum { rpm_fd = STDIN_FILENO }; @@ -60,54 +75,22 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv) /* Skip the main header */ skip_header(); -#if 0 + //if (SEAMLESS_COMPRESSION) + // /* We need to know whether child (gzip/bzip/etc) exits abnormally */ + // signal(SIGCHLD, check_errors_in_children); + /* This works, but doesn't report uncompress errors (they happen in child) */ - setup_unzip_on_fd(rpm_fd /*fail_if_not_detected: 1*/); + setup_unzip_on_fd(rpm_fd, /*fail_if_not_detected:*/ 1); if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0) bb_error_msg_and_die("error unpacking"); -#else - /* BLOAT */ - { - union { - uint8_t b[4]; - uint16_t b16[2]; - uint32_t b32[1]; - } magic; - IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd); - - xread(rpm_fd, magic.b16, sizeof(magic.b16[0])); - if (magic.b16[0] == GZIP_MAGIC) { - unpack = unpack_gz_stream; - } else - if (ENABLE_FEATURE_SEAMLESS_BZ2 - && magic.b16[0] == BZIP2_MAGIC - ) { - unpack = unpack_bz2_stream; - } else - if (ENABLE_FEATURE_SEAMLESS_XZ - && magic.b16[0] == XZ_MAGIC1 - ) { - xread(rpm_fd, magic.b32, sizeof(magic.b32[0])); - if (magic.b32[0] != XZ_MAGIC2) - goto no_magic; - /* unpack_xz_stream wants fd at position 6, no need to seek */ - //xlseek(rpm_fd, -6, SEEK_CUR); - unpack = unpack_xz_stream; - } else { - no_magic: - bb_error_msg_and_die("no gzip" - IF_FEATURE_SEAMLESS_BZ2("/bzip2") - IF_FEATURE_SEAMLESS_XZ("/xz") - " magic"); - } - if (unpack(rpm_fd, STDOUT_FILENO) < 0) - bb_error_msg_and_die("error unpacking"); - } -#endif if (ENABLE_FEATURE_CLEAN_UP) { close(rpm_fd); } - return 0; + if (SEAMLESS_COMPRESSION) { + check_errors_in_children(0); + return bb_got_signal; + } + return EXIT_SUCCESS; } diff --git a/archival/tar.c b/archival/tar.c index 5ddff7f..bd61abd 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -15,17 +15,138 @@ * Copyright (c) 1999 by David I. Bell * Permission is granted to use, distribute, or modify this source, * provided that this copyright notice remains intact. - * Permission to distribute sash derived code under the GPL has been granted. + * Permission to distribute sash derived code under GPL has been granted. * * Based in part on the tar implementation from busybox-0.28 * Copyright (C) 1995 Bruce Perens * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ +/* TODO: security with -C DESTDIR option can be enhanced. + * Consider tar file created via: + * $ tar cvf bug.tar anything.txt + * $ ln -s /tmp symlink + * $ tar --append -f bug.tar symlink + * $ rm symlink + * $ mkdir symlink + * $ tar --append -f bug.tar symlink/evil.py + * + * This will result in an archive which contains: + * $ tar --list -f bug.tar + * anything.txt + * symlink + * symlink/evil.py + * + * Untarring it puts evil.py in '/tmp' even if the -C DESTDIR is given. + * This doesn't feel right, and IIRC GNU tar doesn't do that. */ +//config:config TAR +//config: bool "tar" +//config: default y +//config: help +//config: tar is an archiving program. It's commonly used with gzip to +//config: create compressed archives. It's probably the most widely used +//config: UNIX archive program. +//config: +//config:config FEATURE_TAR_CREATE +//config: bool "Enable archive creation" +//config: default y +//config: depends on TAR +//config: help +//config: If you enable this option you'll be able to create +//config: tar archives using the `-c' option. +//config: +//config:config FEATURE_TAR_AUTODETECT +//config: bool "Autodetect compressed tarballs" +//config: default y +//config: depends on TAR && (FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA || FEATURE_SEAMLESS_XZ) +//config: help +//config: With this option tar can automatically detect compressed +//config: tarballs. Currently it works only on files (not pipes etc). +//config: +//config:config FEATURE_TAR_FROM +//config: bool "Enable -X (exclude from) and -T (include from) options)" +//config: default y +//config: depends on TAR +//config: help +//config: If you enable this option you'll be able to specify +//config: a list of files to include or exclude from an archive. +//config: +//config:config FEATURE_TAR_OLDGNU_COMPATIBILITY +//config: bool "Support for old tar header format" +//config: default y +//config: depends on TAR || DPKG +//config: help +//config: This option is required to unpack archives created in +//config: the old GNU format; help to kill this old format by +//config: repacking your ancient archives with the new format. +//config: +//config:config FEATURE_TAR_OLDSUN_COMPATIBILITY +//config: bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" +//config: default y +//config: depends on TAR || DPKG +//config: help +//config: This option is required to unpack archives created by some old +//config: version of Sun's tar (it was calculating checksum using signed +//config: arithmetic). It is said to be fixed in newer Sun tar, but "old" +//config: tarballs still exist. +//config: +//config:config FEATURE_TAR_GNU_EXTENSIONS +//config: bool "Support for GNU tar extensions (long filenames)" +//config: default y +//config: depends on TAR || DPKG +//config: help +//config: With this option busybox supports GNU long filenames and +//config: linknames. +//config: +//config:config FEATURE_TAR_LONG_OPTIONS +//config: bool "Enable long options" +//config: default y +//config: depends on TAR && LONG_OPTS +//config: help +//config: Enable use of long options, increases size by about 400 Bytes +//config: +//config:config FEATURE_TAR_TO_COMMAND +//config: bool "Support for writing to an external program" +//config: default y +//config: depends on TAR && FEATURE_TAR_LONG_OPTIONS +//config: help +//config: If you enable this option you'll be able to instruct tar to send +//config: the contents of each extracted file to the standard input of an +//config: external program. +//config: +//config:config FEATURE_TAR_UNAME_GNAME +//config: bool "Enable use of user and group names" +//config: default y +//config: depends on TAR +//config: help +//config: Enables use of user and group names in tar. This affects contents +//config: listings (-t) and preserving permissions when unpacking (-p). +//config: +200 bytes. +//config: +//config:config FEATURE_TAR_NOPRESERVE_TIME +//config: bool "Enable -m (do not preserve time) option" +//config: default y +//config: depends on TAR +//config: help +//config: With this option busybox supports GNU tar -m +//config: (do not preserve time) option. +//config: +//config:config FEATURE_TAR_SELINUX +//config: bool "Support for extracting SELinux labels" +//config: default n +//config: depends on TAR && SELINUX +//config: help +//config: With this option busybox supports restoring SELinux labels +//config: when extracting files from tar archives. + +//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_TAR) += tar.o + #include #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" /* FIXME: Stop using this non-standard feature */ #ifndef FNM_LEADING_DIR # define FNM_LEADING_DIR 0 @@ -41,8 +162,8 @@ #if !ENABLE_FEATURE_SEAMLESS_GZ && !ENABLE_FEATURE_SEAMLESS_BZ2 /* Do not pass gzip flag to writeTarFile() */ -#define writeTarFile(tar_fd, verboseFlag, dereferenceFlag, include, exclude, gzip) \ - writeTarFile(tar_fd, verboseFlag, dereferenceFlag, include, exclude) +#define writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude, gzip) \ + writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude) #endif @@ -245,7 +366,8 @@ static int writeTarHeader(struct TarBallInfo *tbInfo, PUT_OCTAL(header.uid, statbuf->st_uid); PUT_OCTAL(header.gid, statbuf->st_gid); memset(header.size, '0', sizeof(header.size)-1); /* Regular file size is handled later */ - PUT_OCTAL(header.mtime, statbuf->st_mtime); + /* users report that files with negative st_mtime cause trouble, so: */ + PUT_OCTAL(header.mtime, statbuf->st_mtime >= 0 ? statbuf->st_mtime : 0); /* Enter the user and group names */ safe_strncpy(header.uname, get_cached_username(statbuf->st_uid), sizeof(header.uname)); @@ -297,15 +419,42 @@ static int writeTarHeader(struct TarBallInfo *tbInfo, } else if (S_ISFIFO(statbuf->st_mode)) { header.typeflag = FIFOTYPE; } else if (S_ISREG(statbuf->st_mode)) { - if (sizeof(statbuf->st_size) > 4 - && statbuf->st_size > (off_t)0777777777777LL + /* header.size field is 12 bytes long */ + /* Does octal-encoded size fit? */ + uoff_t filesize = statbuf->st_size; + if (sizeof(filesize) <= 4 + || filesize <= (uoff_t)0777777777777LL + ) { + PUT_OCTAL(header.size, filesize); + } + /* Does base256-encoded size fit? + * It always does unless off_t is wider than 64 bits. + */ + else if (ENABLE_FEATURE_TAR_GNU_EXTENSIONS +#if ULLONG_MAX > 0xffffffffffffffffLL /* 2^64-1 */ + && (filesize <= 0x3fffffffffffffffffffffffLL) +#endif ) { + /* GNU tar uses "base-256 encoding" for very large numbers. + * Encoding is binary, with highest bit always set as a marker + * and sign in next-highest bit: + * 80 00 .. 00 - zero + * bf ff .. ff - largest positive number + * ff ff .. ff - minus 1 + * c0 00 .. 00 - smallest negative number + */ + char *p8 = header.size + sizeof(header.size); + do { + *--p8 = (uint8_t)filesize; + filesize >>= 8; + } while (p8 != header.size); + *p8 |= 0x80; + } else { bb_error_msg_and_die("can't store file '%s' " "of size %"OFF_FMT"u, aborting", fileName, statbuf->st_size); } header.typeflag = REGTYPE; - PUT_OCTAL(header.size, statbuf->st_size); } else { bb_error_msg("%s: unknown file type", fileName); return FALSE; @@ -378,17 +527,8 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb DBG("writeFileToTarball('%s')", fileName); - /* Strip leading '/' (must be before memorizing hardlink's name) */ - header_name = fileName; - while (header_name[0] == '/') { - static smallint warned; - - if (!warned) { - bb_error_msg("removing leading '/' from member names"); - warned = 1; - } - header_name++; - } + /* Strip leading '/' and such (must be before memorizing hardlink's name) */ + header_name = strip_unsafe_prefix(fileName); if (header_name[0] == '\0') return TRUE; @@ -529,7 +669,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip) xmove_fd(gzipDataPipe.rd, 0); xmove_fd(tar_fd, 1); /* exec gzip/bzip2 program/applet */ - BB_EXECLP(zip_exec, zip_exec, "-f", NULL); + BB_EXECLP(zip_exec, zip_exec, "-f", (char *)0); vfork_exec_errno = errno; _exit(EXIT_FAILURE); } @@ -560,7 +700,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip) /* gcc 4.2.1 inlines it, making code bigger */ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag, - int dereferenceFlag, const llist_t *include, + int recurseFlags, const llist_t *include, const llist_t *exclude, int gzip) { int errorFlag = FALSE; @@ -572,8 +712,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag, /* Store the stat info for the tarball's file, so * can avoid including the tarball into itself.... */ - if (fstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf) < 0) - bb_perror_msg_and_die("can't stat tar file"); + xfstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf, "can't stat tar file"); #if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2 if (gzip) @@ -584,8 +723,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag, /* Read the directory/files and iterate over them one at a time */ while (include) { - if (!recursive_action(include->data, ACTION_RECURSE | - (dereferenceFlag ? ACTION_FOLLOWLINKS : 0), + if (!recursive_action(include->data, recurseFlags, writeFileToTarball, writeFileToTarball, &tbInfo, 0) ) { errorFlag = TRUE; @@ -625,7 +763,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag, } #else int writeTarFile(int tar_fd, int verboseFlag, - int dereferenceFlag, const llist_t *include, + int recurseFlags, const llist_t *include, const llist_t *exclude, int gzip); #endif /* FEATURE_TAR_CREATE */ @@ -637,76 +775,32 @@ static llist_t *append_file_list_to_list(llist_t *list) llist_t *newlist = NULL; while (list) { - src_stream = xfopen_for_read(llist_pop(&list)); + src_stream = xfopen_stdin(llist_pop(&list)); while ((line = xmalloc_fgetline(src_stream)) != NULL) { /* kill trailing '/' unless the string is just "/" */ char *cp = last_char_is(line, '/'); if (cp > line) *cp = '\0'; - llist_add_to(&newlist, line); + llist_add_to_end(&newlist, line); } fclose(src_stream); } return newlist; } -#else -# define append_file_list_to_list(x) 0 -#endif - -#if ENABLE_FEATURE_SEAMLESS_Z -static char FAST_FUNC get_header_tar_Z(archive_handle_t *archive_handle) -{ - /* Can't lseek over pipes */ - archive_handle->seek = seek_by_read; - - /* do the decompression, and cleanup */ - if (xread_char(archive_handle->src_fd) != 0x1f - || xread_char(archive_handle->src_fd) != 0x9d - ) { - bb_error_msg_and_die("invalid magic"); - } - - open_transformer(archive_handle->src_fd, unpack_Z_stream, "uncompress"); - archive_handle->offset = 0; - while (get_header_tar(archive_handle) == EXIT_SUCCESS) - continue; - - /* Can only do one file at a time */ - return EXIT_FAILURE; -} -#else -# define get_header_tar_Z NULL -#endif - -#ifdef CHECK_FOR_CHILD_EXITCODE -/* Looks like it isn't needed - tar detects malformed (truncated) - * archive if e.g. bunzip2 fails */ -static int child_error; - -static void handle_SIGCHLD(int status) -{ - /* Actually, 'status' is a signo. We reuse it for other needs */ - - /* Wait for any child without blocking */ - if (wait_any_nohang(&status) < 0) - /* wait failed?! I'm confused... */ - return; - - if (WIFEXITED(status) && WEXITSTATUS(status) == 0) - /* child exited with 0 */ - return; - /* Cannot happen? - if (!WIFSIGNALED(status) && !WIFEXITED(status)) return; */ - child_error = 1; -} #endif //usage:#define tar_trivial_usage -//usage: "-[" IF_FEATURE_TAR_CREATE("c") "xt" IF_FEATURE_SEAMLESS_GZ("z") -//usage: IF_FEATURE_SEAMLESS_BZ2("j") IF_FEATURE_SEAMLESS_LZMA("a") -//usage: IF_FEATURE_SEAMLESS_Z("Z") IF_FEATURE_TAR_NOPRESERVE_TIME("m") "vO] " -//usage: IF_FEATURE_TAR_FROM("[-X FILE] ") -//usage: "[-f TARFILE] [-C DIR] [FILE]..." +//usage: "-[" IF_FEATURE_TAR_CREATE("c") "xt" +//usage: IF_FEATURE_SEAMLESS_Z("Z") +//usage: IF_FEATURE_SEAMLESS_GZ("z") +//usage: IF_FEATURE_SEAMLESS_XZ("J") +//usage: IF_FEATURE_SEAMLESS_BZ2("j") +//usage: IF_FEATURE_SEAMLESS_LZMA("a") +//usage: IF_FEATURE_TAR_CREATE("h") +//usage: IF_FEATURE_TAR_NOPRESERVE_TIME("m") +//usage: "vO] " +//usage: IF_FEATURE_TAR_FROM("[-X FILE] [-T FILE] ") +//usage: "[-f TARFILE] [-C DIR] [FILE]..." //usage:#define tar_full_usage "\n\n" //usage: IF_FEATURE_TAR_CREATE("Create, extract, ") //usage: IF_NOT_FEATURE_TAR_CREATE("Extract ") @@ -717,22 +811,24 @@ static void handle_SIGCHLD(int status) //usage: ) //usage: "\n x Extract" //usage: "\n t List" -//usage: "\nOptions:" //usage: "\n f Name of TARFILE ('-' for stdin/out)" //usage: "\n C Change to DIR before operation" //usage: "\n v Verbose" +//usage: IF_FEATURE_SEAMLESS_Z( +//usage: "\n Z (De)compress using compress" +//usage: ) //usage: IF_FEATURE_SEAMLESS_GZ( //usage: "\n z (De)compress using gzip" //usage: ) +//usage: IF_FEATURE_SEAMLESS_XZ( +//usage: "\n J (De)compress using xz" +//usage: ) //usage: IF_FEATURE_SEAMLESS_BZ2( //usage: "\n j (De)compress using bzip2" //usage: ) //usage: IF_FEATURE_SEAMLESS_LZMA( //usage: "\n a (De)compress using lzma" //usage: ) -//usage: IF_FEATURE_SEAMLESS_Z( -//usage: "\n Z (De)compress using compress" -//usage: ) //usage: "\n O Extract to stdout" //usage: IF_FEATURE_TAR_CREATE( //usage: "\n h Follow symlinks" @@ -756,6 +852,7 @@ static void handle_SIGCHLD(int status) // o no-same-owner // p same-permissions // k keep-old +// no-recursion // numeric-owner // no-same-permissions // overwrite @@ -772,9 +869,11 @@ enum { IF_FEATURE_TAR_FROM( OPTBIT_INCLUDE_FROM,) IF_FEATURE_TAR_FROM( OPTBIT_EXCLUDE_FROM,) IF_FEATURE_SEAMLESS_GZ( OPTBIT_GZIP ,) - IF_FEATURE_SEAMLESS_Z( OPTBIT_COMPRESS ,) // 16th bit + IF_FEATURE_SEAMLESS_XZ( OPTBIT_XZ ,) // 16th bit + IF_FEATURE_SEAMLESS_Z( OPTBIT_COMPRESS ,) IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,) #if ENABLE_FEATURE_TAR_LONG_OPTIONS + OPTBIT_NORECURSION, IF_FEATURE_TAR_TO_COMMAND(OPTBIT_2COMMAND ,) OPTBIT_NUMERIC_OWNER, OPTBIT_NOPRESERVE_PERM, @@ -796,12 +895,16 @@ enum { OPT_INCLUDE_FROM = IF_FEATURE_TAR_FROM( (1 << OPTBIT_INCLUDE_FROM)) + 0, // T OPT_EXCLUDE_FROM = IF_FEATURE_TAR_FROM( (1 << OPTBIT_EXCLUDE_FROM)) + 0, // X OPT_GZIP = IF_FEATURE_SEAMLESS_GZ( (1 << OPTBIT_GZIP )) + 0, // z + OPT_XZ = IF_FEATURE_SEAMLESS_XZ( (1 << OPTBIT_XZ )) + 0, // J OPT_COMPRESS = IF_FEATURE_SEAMLESS_Z( (1 << OPTBIT_COMPRESS )) + 0, // Z OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m + OPT_NORECURSION = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NORECURSION )) + 0, // no-recursion OPT_2COMMAND = IF_FEATURE_TAR_TO_COMMAND( (1 << OPTBIT_2COMMAND )) + 0, // to-command OPT_NUMERIC_OWNER = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NUMERIC_OWNER )) + 0, // numeric-owner OPT_NOPRESERVE_PERM = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions OPT_OVERWRITE = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_OVERWRITE )) + 0, // overwrite + + OPT_ANY_COMPRESS = (OPT_BZIP2 | OPT_LZMA | OPT_GZIP | OPT_XZ | OPT_COMPRESS), }; #if ENABLE_FEATURE_TAR_LONG_OPTIONS static const char tar_longopts[] ALIGN1 = @@ -834,12 +937,16 @@ static const char tar_longopts[] ALIGN1 = # if ENABLE_FEATURE_SEAMLESS_GZ "gzip\0" No_argument "z" # endif +# if ENABLE_FEATURE_SEAMLESS_XZ + "xz\0" No_argument "J" +# endif # if ENABLE_FEATURE_SEAMLESS_Z "compress\0" No_argument "Z" # endif # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME "touch\0" No_argument "m" # endif + "no-recursion\0" No_argument "\xfa" # if ENABLE_FEATURE_TAR_TO_COMMAND "to-command\0" Required_argument "\xfb" # endif @@ -860,7 +967,6 @@ static const char tar_longopts[] ALIGN1 = int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int tar_main(int argc UNUSED_PARAM, char **argv) { - char FAST_FUNC (*get_header_ptr)(archive_handle_t *) = get_header_tar; archive_handle_t *tar_handle; char *base_dir = NULL; const char *tar_filename = "-"; @@ -883,8 +989,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv) /* Prepend '-' to the first argument if required */ opt_complementary = "--:" // first arg is options "tt:vv:" // count -t,-v - "?:" // bail out with usage instead of error return - "X::T::" // cumulative lists + IF_FEATURE_TAR_FROM("X::T::") // cumulative lists #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM "\xff::" // cumulative lists for --exclude #endif @@ -928,6 +1033,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv) IF_FEATURE_SEAMLESS_LZMA("a" ) IF_FEATURE_TAR_FROM( "T:X:") IF_FEATURE_SEAMLESS_GZ( "z" ) + IF_FEATURE_SEAMLESS_XZ( "J" ) IF_FEATURE_SEAMLESS_Z( "Z" ) IF_FEATURE_TAR_NOPRESERVE_TIME("m") , &base_dir // -C dir @@ -957,6 +1063,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv) putenv((char*)"TAR_FILETYPE=f"); signal(SIGPIPE, SIG_IGN); tar_handle->action_data = data_extract_to_command; + IF_FEATURE_TAR_TO_COMMAND(tar_handle->tar__to_command_shell = xstrdup(get_shell_name());) } if (opt & OPT_KEEP_OLD) @@ -976,18 +1083,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv) tar_handle->ah_flags |= ARCHIVE_O_TRUNC; } - if (opt & OPT_GZIP) - get_header_ptr = get_header_tar_gz; - - if (opt & OPT_BZIP2) - get_header_ptr = get_header_tar_bz2; - - if (opt & OPT_LZMA) - get_header_ptr = get_header_tar_lzma; - - if (opt & OPT_COMPRESS) - get_header_ptr = get_header_tar_Z; - if (opt & OPT_NOPRESERVE_TIME) tar_handle->ah_flags &= ~ARCHIVE_RESTORE_DATE; @@ -1038,8 +1133,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv) tar_handle->src_fd = tar_fd; tar_handle->seek = seek_by_read; } else { - if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) { - get_header_ptr = get_header_tar; + if (ENABLE_FEATURE_TAR_AUTODETECT + && flags == O_RDONLY + && !(opt & OPT_ANY_COMPRESS) + ) { tar_handle->src_fd = open_zipped(tar_filename); if (tar_handle->src_fd < 0) bb_perror_msg_and_die("can't open '%s'", tar_filename); @@ -1052,10 +1149,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) if (base_dir) xchdir(base_dir); -#ifdef CHECK_FOR_CHILD_EXITCODE - /* We need to know whether child (gzip/bzip/etc) exits abnormally */ - signal(SIGCHLD, handle_SIGCHLD); -#endif + //if (SEAMLESS_COMPRESSION || OPT_COMPRESS) + // /* We need to know whether child (gzip/bzip/etc) exits abnormally */ + // signal(SIGCHLD, check_errors_in_children); /* Create an archive */ if (opt & OPT_CREATE) { @@ -1067,13 +1163,47 @@ int tar_main(int argc UNUSED_PARAM, char **argv) zipMode = 2; #endif /* NB: writeTarFile() closes tar_handle->src_fd */ - return writeTarFile(tar_handle->src_fd, verboseFlag, opt & OPT_DEREFERENCE, + return writeTarFile(tar_handle->src_fd, verboseFlag, + (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0) + | (opt & OPT_NORECURSION ? 0 : ACTION_RECURSE), tar_handle->accept, tar_handle->reject, zipMode); } - while (get_header_ptr(tar_handle) == EXIT_SUCCESS) - continue; + if (opt & OPT_ANY_COMPRESS) { + USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);) + USE_FOR_NOMMU(const char *xformer_prog;) + + if (opt & OPT_COMPRESS) + USE_FOR_MMU(xformer = unpack_Z_stream;) + USE_FOR_NOMMU(xformer_prog = "uncompress";) + if (opt & OPT_GZIP) + USE_FOR_MMU(xformer = unpack_gz_stream;) + USE_FOR_NOMMU(xformer_prog = "gunzip";) + if (opt & OPT_BZIP2) + USE_FOR_MMU(xformer = unpack_bz2_stream;) + USE_FOR_NOMMU(xformer_prog = "bunzip2";) + if (opt & OPT_LZMA) + USE_FOR_MMU(xformer = unpack_lzma_stream;) + USE_FOR_NOMMU(xformer_prog = "unlzma";) + if (opt & OPT_XZ) + USE_FOR_MMU(xformer = unpack_xz_stream;) + USE_FOR_NOMMU(xformer_prog = "unxz";) + + open_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog); + /* Can't lseek over pipes */ + tar_handle->seek = seek_by_read; + /*tar_handle->offset = 0; - already is */ + } + + /* Zero processed headers (== empty file) is not a valid tarball. + * We (ab)use bb_got_signal as exitcode here, + * because check_errors_in_children() uses _it_ as error indicator. + */ + bb_got_signal = EXIT_FAILURE; + + while (get_header_tar(tar_handle) == EXIT_SUCCESS) + bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */ /* Check that every file that should have been extracted was */ while (tar_handle->accept) { @@ -1088,5 +1218,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv) if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */) close(tar_handle->src_fd); - return EXIT_SUCCESS; + if (SEAMLESS_COMPRESSION || OPT_COMPRESS) { + /* Set bb_got_signal to 1 if a child died with !0 exitcode */ + check_errors_in_children(0); + } + + return bb_got_signal; } diff --git a/archival/unzip.c b/archival/unzip.c index 84081c0..fcfc9a4 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -7,20 +7,43 @@ * Loosely based on original busybox unzip applet by Laurence Anderson. * All options and features should work in this version. * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* For reference see * http://www.pkware.com/company/standards/appnote/ * http://www.info-zip.org/pub/infozip/doc/appnote-iz-latest.zip - */ - -/* TODO + * + * TODO * Zip64 + other methods */ +//config:config UNZIP +//config: bool "unzip" +//config: default y +//config: help +//config: unzip will list or extract files from a ZIP archive, +//config: commonly found on DOS/WIN systems. The default behavior +//config: (with no options) is to extract the archive into the +//config: current directory. Use the `-d' option to extract to a +//config: directory of your choice. + +//applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP)) +//kbuild:lib-$(CONFIG_UNZIP) += unzip.o + +//usage:#define unzip_trivial_usage +//usage: "[-lnopq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]" +//usage:#define unzip_full_usage "\n\n" +//usage: "Extract FILEs from ZIP archive\n" +//usage: "\n -l List contents (with -q for short form)" +//usage: "\n -n Never overwrite files (default: ask)" +//usage: "\n -o Overwrite" +//usage: "\n -p Print to stdout" +//usage: "\n -q Quiet" +//usage: "\n -x FILE Exclude FILEs" +//usage: "\n -d DIR Extract into DIR" + #include "libbb.h" -#include "unarchive.h" +#include "bb_archive.h" enum { #if BB_BIG_ENDIAN @@ -151,7 +174,17 @@ enum { zip_fd = 3 }; #if ENABLE_DESKTOP -#define PEEK_FROM_END 16384 +/* Seen in the wild: + * Self-extracting PRO2K3XP_32.exe contains 19078464 byte zip archive, + * where CDE was nearly 48 kbytes before EOF. + * (Surprisingly, it also apparently has *another* CDE structure + * closer to the end, with bogus cdf_offset). + * To make extraction work, bumped PEEK_FROM_END from 16k to 64k. + */ +#define PEEK_FROM_END (64*1024) + +/* This value means that we failed to find CDF */ +#define BAD_CDF_OFFSET ((uint32_t)0xffffffff) /* NB: does not preserve file position! */ static uint32_t find_cdf_offset(void) @@ -168,6 +201,7 @@ static uint32_t find_cdf_offset(void) xlseek(zip_fd, end, SEEK_SET); full_read(zip_fd, buf, PEEK_FROM_END); + cde_header.formatted.cdf_offset = BAD_CDF_OFFSET; p = buf; while (p <= buf + PEEK_FROM_END - CDE_HEADER_LEN - 4) { if (*p != 'P') { @@ -183,11 +217,17 @@ static uint32_t find_cdf_offset(void) /* we found CDE! */ memcpy(cde_header.raw, p + 1, CDE_HEADER_LEN); FIX_ENDIANNESS_CDE(cde_header); - free(buf); - return cde_header.formatted.cdf_offset; + /* + * I've seen .ZIP files with seemingly valid CDEs + * where cdf_offset points past EOF - ?? + * Ignore such CDEs: + */ + if (cde_header.formatted.cdf_offset < end + (p - buf)) + break; + cde_header.formatted.cdf_offset = BAD_CDF_OFFSET; } - //free(buf); - bb_error_msg_and_die("can't find file table"); + free(buf); + return cde_header.formatted.cdf_offset; }; static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) @@ -199,13 +239,15 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) if (!cdf_offset) cdf_offset = find_cdf_offset(); - xlseek(zip_fd, cdf_offset + 4, SEEK_SET); - xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); - FIX_ENDIANNESS_CDF(*cdf_ptr); - cdf_offset += 4 + CDF_HEADER_LEN - + cdf_ptr->formatted.file_name_length - + cdf_ptr->formatted.extra_field_length - + cdf_ptr->formatted.file_comment_length; + if (cdf_offset != BAD_CDF_OFFSET) { + xlseek(zip_fd, cdf_offset + 4, SEEK_SET); + xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); + FIX_ENDIANNESS_CDF(*cdf_ptr); + cdf_offset += 4 + CDF_HEADER_LEN + + cdf_ptr->formatted.file_name_length + + cdf_ptr->formatted.extra_field_length + + cdf_ptr->formatted.file_comment_length; + } xlseek(zip_fd, org, SEEK_SET); return cdf_offset; @@ -214,8 +256,9 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) static void unzip_skip(off_t skip) { - if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1) - bb_copyfd_exact_size(zip_fd, -1, skip); + if (skip != 0) + if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1) + bb_copyfd_exact_size(zip_fd, -1, skip); } static void unzip_create_leading_dirs(const char *fn) @@ -223,7 +266,7 @@ static void unzip_create_leading_dirs(const char *fn) /* Create all leading directories */ char *name = xstrdup(fn); if (bb_make_directory(dirname(name), 0777, FILEUTILS_RECUR)) { - bb_error_msg_and_die("exiting"); /* bb_make_directory is noisy */ + xfunc_die(); /* bb_make_directory is noisy */ } free(name); } @@ -237,15 +280,17 @@ static void unzip_extract(zip_header_t *zip_header, int dst_fd) bb_copyfd_exact_size(zip_fd, dst_fd, size); } else { /* Method 8 - inflate */ - inflate_unzip_result res; - if (inflate_unzip(&res, zip_header->formatted.cmpsize, zip_fd, dst_fd) < 0) + transformer_aux_data_t aux; + init_transformer_aux_data(&aux); + aux.bytes_in = zip_header->formatted.cmpsize; + if (inflate_unzip(&aux, zip_fd, dst_fd) < 0) bb_error_msg_and_die("inflate error"); /* Validate decompression - crc */ - if (zip_header->formatted.crc32 != (res.crc ^ 0xffffffffL)) { + if (zip_header->formatted.crc32 != (aux.crc32 ^ 0xffffffffL)) { bb_error_msg_and_die("crc error"); } /* Validate decompression - size */ - if (zip_header->formatted.ucmpsize != res.bytes_out) { + if (zip_header->formatted.ucmpsize != aux.bytes_out) { /* Don't die. Who knows, maybe len calculation * was botched somewhere. After all, crc matched! */ bb_error_msg("bad length"); @@ -253,6 +298,14 @@ static void unzip_extract(zip_header_t *zip_header, int dst_fd) } } +static void my_fgets80(char *buf80) +{ + fflush_all(); + if (!fgets(buf80, 80, stdin)) { + bb_perror_msg_and_die("can't read standard input"); + } +} + int unzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int unzip_main(int argc, char **argv) { @@ -263,6 +316,7 @@ int unzip_main(int argc, char **argv) IF_NOT_DESKTOP(const) smallint verbose = 0; smallint listing = 0; smallint overwrite = O_PROMPT; + smallint x_opt_seen; #if ENABLE_DESKTOP uint32_t cdf_offset; #endif @@ -276,8 +330,7 @@ int unzip_main(int argc, char **argv) llist_t *zreject = NULL; char *base_dir = NULL; int i, opt; - int opt_range = 0; - char key_buf[80]; + char key_buf[80]; /* must match size used by my_fgets80 */ struct stat stat_buf; /* -q, -l and -v: UnZip 5.52 of 28 February 2005, by Info-ZIP: @@ -321,82 +374,81 @@ int unzip_main(int argc, char **argv) * 204372 1 file */ + x_opt_seen = 0; /* '-' makes getopt return 1 for non-options */ while ((opt = getopt(argc, argv, "-d:lnopqxv")) != -1) { - switch (opt_range) { - case 0: /* Options */ - switch (opt) { - case 'l': /* List */ - listing = 1; - break; - - case 'n': /* Never overwrite existing files */ - overwrite = O_NEVER; - break; + switch (opt) { + case 'd': /* Extract to base directory */ + base_dir = optarg; + break; - case 'o': /* Always overwrite existing files */ - overwrite = O_ALWAYS; - break; + case 'l': /* List */ + listing = 1; + break; - case 'p': /* Extract files to stdout and fall through to set verbosity */ - dst_fd = STDOUT_FILENO; + case 'n': /* Never overwrite existing files */ + overwrite = O_NEVER; + break; - case 'q': /* Be quiet */ - quiet++; - break; + case 'o': /* Always overwrite existing files */ + overwrite = O_ALWAYS; + break; - case 'v': /* Verbose list */ - IF_DESKTOP(verbose++;) - listing = 1; - break; + case 'p': /* Extract files to stdout and fall through to set verbosity */ + dst_fd = STDOUT_FILENO; - case 1: /* The zip file */ - /* +5: space for ".zip" and NUL */ - src_fn = xmalloc(strlen(optarg) + 5); - strcpy(src_fn, optarg); - opt_range++; - break; + case 'q': /* Be quiet */ + quiet++; + break; - default: - bb_show_usage(); + case 'v': /* Verbose list */ + IF_DESKTOP(verbose++;) + listing = 1; + break; - } + case 'x': + x_opt_seen = 1; break; - case 1: /* Include files */ - if (opt == 1) { + case 1: + if (!src_fn) { + /* The zip file */ + /* +5: space for ".zip" and NUL */ + src_fn = xmalloc(strlen(optarg) + 5); + strcpy(src_fn, optarg); + } else if (!x_opt_seen) { + /* Include files */ llist_add_to(&zaccept, optarg); - break; - } - if (opt == 'd') { - base_dir = optarg; - opt_range += 2; - break; - } - if (opt == 'x') { - opt_range++; - break; - } - bb_show_usage(); - - case 2 : /* Exclude files */ - if (opt == 1) { + } else { + /* Exclude files */ llist_add_to(&zreject, optarg); - break; - } - if (opt == 'd') { /* Extract to base directory */ - base_dir = optarg; - opt_range++; - break; } - /* fall through */ + break; default: bb_show_usage(); } } - if (src_fn == NULL) { +#ifndef __GLIBC__ + /* + * This code is needed for non-GNU getopt + * which doesn't understand "-" in option string. + * The -x option won't work properly in this case: + * "unzip a.zip q -x w e" will be interpreted as + * "unzip a.zip q w e -x" = "unzip a.zip q w e" + */ + argv += optind; + if (argv[0]) { + /* +5: space for ".zip" and NUL */ + src_fn = xmalloc(strlen(argv[0]) + 5); + strcpy(src_fn, argv[0]); + while (*++argv) + llist_add_to(&zaccept, *argv); + } +#endif + + if (!src_fn) { bb_show_usage(); } @@ -407,17 +459,20 @@ int unzip_main(int argc, char **argv) if (overwrite == O_PROMPT) overwrite = O_NEVER; } else { - static const char extn[][5] = {"", ".zip", ".ZIP"}; - int orig_src_fn_len = strlen(src_fn); - int src_fd = -1; + static const char extn[][5] = { ".zip", ".ZIP" }; + char *ext = src_fn + strlen(src_fn); + int src_fd; - for (i = 0; (i < 3) && (src_fd == -1); i++) { - strcpy(src_fn + orig_src_fn_len, extn[i]); + i = 0; + for (;;) { src_fd = open(src_fn, O_RDONLY); - } - if (src_fd == -1) { - src_fn[orig_src_fn_len] = '\0'; - bb_error_msg_and_die("can't open %s, %s.zip, %s.ZIP", src_fn, src_fn, src_fn); + if (src_fd >= 0) + break; + if (++i > 2) { + *ext = '\0'; + bb_error_msg_and_die("can't open %s[.zip]", src_fn); + } + strcpy(ext, extn[i - 1]); } xmove_fd(src_fd, zip_fd); } @@ -504,21 +559,31 @@ int unzip_main(int argc, char **argv) bb_error_msg_and_die("zip flag 1 (encryption) is not supported"); } - { + if (cdf_offset != BAD_CDF_OFFSET) { cdf_header_t cdf_header; cdf_offset = read_next_cdf(cdf_offset, &cdf_header); + /* + * Note: cdf_offset can become BAD_CDF_OFFSET after the above call. + */ if (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) { /* 0x0008 - streaming. [u]cmpsize can be reliably gotten - * only from Central Directory. See unzip_doc.txt */ + * only from Central Directory. See unzip_doc.txt + */ zip_header.formatted.crc32 = cdf_header.formatted.crc32; zip_header.formatted.cmpsize = cdf_header.formatted.cmpsize; zip_header.formatted.ucmpsize = cdf_header.formatted.ucmpsize; } if ((cdf_header.formatted.version_made_by >> 8) == 3) { - /* this archive is created on Unix */ + /* This archive is created on Unix */ dir_mode = file_mode = (cdf_header.formatted.external_file_attributes >> 16); } } + if (cdf_offset == BAD_CDF_OFFSET + && (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) + ) { + /* If it's a streaming zip, we _require_ CDF */ + bb_error_msg_and_die("can't find file table"); + } #endif /* Read filename */ @@ -583,8 +648,8 @@ int unzip_main(int argc, char **argv) printf(" creating: %s\n", dst_fn); } unzip_create_leading_dirs(dst_fn); - if (bb_make_directory(dst_fn, dir_mode, 0)) { - bb_error_msg_and_die("exiting"); + if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) { + xfunc_die(); } } else { if (!S_ISDIR(stat_buf.st_mode)) { @@ -608,9 +673,7 @@ int unzip_main(int argc, char **argv) i = 'y'; } else { printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn); - if (!fgets(key_buf, sizeof(key_buf), stdin)) { - bb_perror_msg_and_die("can't read input"); - } + my_fgets80(key_buf); i = key_buf[0]; } } else { /* File is not regular file */ @@ -651,9 +714,7 @@ int unzip_main(int argc, char **argv) case 'r': /* Prompt for new name */ printf("new name: "); - if (!fgets(key_buf, sizeof(key_buf), stdin)) { - bb_perror_msg_and_die("can't read input"); - } + my_fgets80(key_buf); free(dst_fn); dst_fn = xstrdup(key_buf); chomp(dst_fn); diff --git a/TEST_config_nommu b/configs/TEST_nommu_defconfig similarity index 99% rename from TEST_config_nommu rename to configs/TEST_nommu_defconfig index 911f02f..b45afd9 100644 --- a/TEST_config_nommu +++ b/configs/TEST_nommu_defconfig @@ -79,7 +79,7 @@ CONFIG_PREFIX="./_install" # Busybox Library Tuning # CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_MD5_SMALL=1 CONFIG_FEATURE_FAST_TOP=y CONFIG_FEATURE_ETC_NETWORKS=y CONFIG_FEATURE_EDITING=y @@ -189,7 +189,6 @@ CONFIG_HOSTID=y CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y @@ -342,7 +341,6 @@ CONFIG_FEATURE_VI_READONLY=y CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -904,7 +902,6 @@ CONFIG_HUSH_FUNCTIONS=y CONFIG_HUSH_LOCAL=y CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_RANDOM_SUPPORT=y -CONFIG_LASH=y CONFIG_MSH=y CONFIG_SH_MATH_SUPPORT=y CONFIG_SH_MATH_SUPPORT_64=y diff --git a/TEST_config_noprintf b/configs/TEST_noprintf_defconfig similarity index 99% rename from TEST_config_noprintf rename to configs/TEST_noprintf_defconfig index ba003a1..809b60c 100644 --- a/TEST_config_noprintf +++ b/configs/TEST_noprintf_defconfig @@ -89,7 +89,7 @@ CONFIG_PREFIX="./_install" # Busybox Library Tuning # CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_MD5_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_EDITING=y @@ -211,7 +211,6 @@ CONFIG_FALSE=y # CONFIG_ID is not set # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set # CONFIG_LN is not set # CONFIG_LOGNAME is not set # CONFIG_LS is not set @@ -347,7 +346,6 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_SET is not set # CONFIG_FEATURE_VI_WIN_RESIZE is not set # CONFIG_FEATURE_VI_ASK_TERMINAL is not set -# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -904,7 +902,6 @@ CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_FEATURE_BASH_IS_ASH is not set # CONFIG_FEATURE_BASH_IS_HUSH is not set CONFIG_FEATURE_BASH_IS_NONE=y -# CONFIG_LASH is not set # CONFIG_MSH is not set # CONFIG_SH_MATH_SUPPORT is not set # CONFIG_SH_MATH_SUPPORT_64 is not set diff --git a/TEST_config_rh9 b/configs/TEST_rh9_defconfig similarity index 99% rename from TEST_config_rh9 rename to configs/TEST_rh9_defconfig index f376cd4..565b826 100644 --- a/TEST_config_rh9 +++ b/configs/TEST_rh9_defconfig @@ -88,7 +88,7 @@ CONFIG_PREFIX="./_install" # Busybox Library Tuning # CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_MD5_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_EDITING=y @@ -200,7 +200,6 @@ CONFIG_HOSTID=y CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y @@ -359,7 +358,6 @@ CONFIG_FEATURE_VI_READONLY=y CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -803,6 +801,7 @@ CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_ZCIP=y # @@ -917,7 +916,6 @@ CONFIG_HUSH_FUNCTIONS=y CONFIG_HUSH_LOCAL=y CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_RANDOM_SUPPORT=y -# CONFIG_LASH is not set CONFIG_MSH=y CONFIG_SH_MATH_SUPPORT=y CONFIG_SH_MATH_SUPPORT_64=y diff --git a/debian/config/pkg/udeb b/configs/android2_defconfig similarity index 57% rename from debian/config/pkg/udeb rename to configs/android2_defconfig index 4940749..4dfbdb5 100644 --- a/debian/config/pkg/udeb +++ b/configs/android2_defconfig @@ -1,7 +1,7 @@ +# Run "make android2_defconfig", then "make". # -# Automatically generated make config: don't edit -# Busybox version: 1.17.1 -# Tue Nov 9 10:36:38 2010 +# Tested with the standalone toolchain from ndk r6: +# android-ndk-r6/build/tools/make-standalone-toolchain.sh --platform=android-8 # CONFIG_HAVE_DOT_CONFIG=y @@ -16,31 +16,33 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_EXTRA_COMPAT is not set # CONFIG_INCLUDE_SUSv2 is not set # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y +# CONFIG_SHOW_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set -CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set +# CONFIG_INSTALL_NO_USR is not set # CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_SUPPORT is not set # CONFIG_UNICODE_USING_LOCALE is not set -CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -CONFIG_UNICODE_COMBINING_WCHARS=y -CONFIG_UNICODE_WIDE_WCHARS=y +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=0 +CONFIG_LAST_SUPPORTED_WCHAR=0 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y +# CONFIG_LONG_OPTS is not set +# CONFIG_FEATURE_DEVPTS is not set # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set @@ -58,8 +60,8 @@ CONFIG_FEATURE_SYSLOG=y # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" +# CONFIG_LFS is not set +CONFIG_CROSS_COMPILER_PREFIX="arm-linux-androideabi-" CONFIG_EXTRA_CFLAGS="" # @@ -73,9 +75,8 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Installation Options +# Installation Options ("make install" behavior) # -# CONFIG_INSTALL_NO_USR is not set CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set @@ -88,25 +89,29 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=1 +CONFIG_MD5_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_FEATURE_EDITING is not set +CONFIG_FEATURE_EDITING_MAX_LEN=0 # CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_HISTORY=0 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_TAB_COMPLETION is not set # CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_FEATURE_NON_POSIX_CP is not set -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y +# CONFIG_FEATURE_SKIP_ROOTFS is not set +# CONFIG_MONOTONIC_SYSCALL is not set +# CONFIG_IOCTL_HEX2STR_ERROR is not set +# CONFIG_FEATURE_HWIB is not set # # Applets @@ -115,48 +120,48 @@ CONFIG_FEATURE_HWIB=y # # Archival Utilities # -# CONFIG_FEATURE_SEAMLESS_XZ is not set +CONFIG_FEATURE_SEAMLESS_XZ=y CONFIG_FEATURE_SEAMLESS_LZMA=y CONFIG_FEATURE_SEAMLESS_BZ2=y CONFIG_FEATURE_SEAMLESS_GZ=y -# CONFIG_FEATURE_SEAMLESS_Z is not set +CONFIG_FEATURE_SEAMLESS_Z=y CONFIG_AR=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_FEATURE_AR_CREATE=y +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y -# CONFIG_GZIP is not set +CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +CONFIG_RPM=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set +CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y # # Coreutils @@ -167,58 +172,60 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y CONFIG_TR=y -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -# CONFIG_CHGRP is not set +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y -CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set +CONFIG_CKSUM=y +CONFIG_COMM=y CONFIG_CP=y -CONFIG_FEATURE_CP_LONG_OPTIONS=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set CONFIG_CUT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y +# CONFIG_DF is not set # CONFIG_FEATURE_DF_FANCY is not set CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -# CONFIG_DU is not set -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y +# CONFIG_ENV is not set # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -# CONFIG_EXPAND is not set +CONFIG_EXPAND=y # CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y +# CONFIG_EXPR is not set +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y -# CONFIG_FOLD is not set +CONFIG_FOLD=y # CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set +CONFIG_INSTALL=y # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y -# CONFIG_FEATURE_LS_FILETYPES is not set +CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y -# CONFIG_FEATURE_LS_RECURSIVE is not set +CONFIG_FEATURE_LS_RECURSIVE=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y @@ -227,14 +234,14 @@ CONFIG_FEATURE_LS_USERNAME=y CONFIG_MD5SUM=y CONFIG_MKDIR=y # CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set -# CONFIG_MKFIFO is not set +CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y # CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y CONFIG_PRINTF=y CONFIG_PWD=y CONFIG_READLINK=y @@ -243,42 +250,41 @@ CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y # CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y -# CONFIG_SHA512SUM is not set +CONFIG_SHA512SUM=y CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y # CONFIG_STAT is not set # CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set +CONFIG_STTY=y +CONFIG_SUM=y CONFIG_SYNC=y -# CONFIG_TAC is not set +CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TRUE=y -CONFIG_TTY=y +# CONFIG_TTY is not set CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set +CONFIG_UNEXPAND=y # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_UNIQ=y # CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_FEATURE_WC_LARGE=y # CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set +CONFIG_WHOAMI=y +CONFIG_YES=y # # Common options for cp and mv @@ -303,60 +309,53 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities # -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y # CONFIG_KBD_MODE is not set # CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETFONT is not set # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y # CONFIG_FEATURE_LOADFONT_PSF2 is not set # CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities # -# CONFIG_MKTEMP is not set -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set +CONFIG_WHICH=y # # Editors # -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y +CONFIG_PATCH=y # CONFIG_VI is not set CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_8BIT is not set # CONFIG_FEATURE_VI_COLON is not set # CONFIG_FEATURE_VI_YANKMARK is not set # CONFIG_FEATURE_VI_SEARCH is not set +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set # CONFIG_FEATURE_VI_USE_SIGNALS is not set # CONFIG_FEATURE_VI_DOT_CMD is not set # CONFIG_FEATURE_VI_READONLY is not set @@ -364,44 +363,51 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_SET is not set # CONFIG_FEATURE_VI_WIN_RESIZE is not set # CONFIG_FEATURE_VI_ASK_TERMINAL is not set -# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set +# CONFIG_AWK is not set +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_ED is not set +# CONFIG_SED is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # # Finding Utilities # -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_MAXDEPTH is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_USER is not set +# CONFIG_FEATURE_FIND_GROUP is not set +# CONFIG_FEATURE_FIND_NOT is not set +# CONFIG_FEATURE_FIND_DEPTH is not set +# CONFIG_FEATURE_FIND_PAREN is not set +# CONFIG_FEATURE_FIND_SIZE is not set +# CONFIG_FEATURE_FIND_PRUNE is not set # CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y +# CONFIG_FEATURE_FIND_PATH is not set # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_FEATURE_FIND_LINKS=y -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_FIND_LINKS is not set +# CONFIG_GREP is not set +# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set # CONFIG_FEATURE_GREP_FGREP_ALIAS is not set # CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities @@ -409,6 +415,9 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y # CONFIG_BOOTCHARTD is not set # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_KILL_REMOVED is not set @@ -416,33 +425,33 @@ CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set +CONFIG_FEATURE_INIT_COREDUMPS=y +CONFIG_FEATURE_INITRD=y CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -# CONFIG_MESG is not set +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y # # Login/Password Management Utilities # +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set # CONFIG_FEATURE_SHADOWPASSWDS is not set -CONFIG_USE_BB_PWD_GRP=y +# CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y +# CONFIG_USE_BB_CRYPT is not set # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_FEATURE_CHECK_NAMES is not set # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set # CONFIG_GETTY is not set # CONFIG_LOGIN is not set # CONFIG_PAM is not set @@ -462,18 +471,18 @@ CONFIG_LAST_SYSTEM_ID=0 # # Linux Ext2 FS Progs # -# CONFIG_CHATTR is not set +CONFIG_CHATTR=y # CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y # # Linux Module Utilities # CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_MODPROBE_SMALL=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y # CONFIG_INSMOD is not set # CONFIG_RMMOD is not set # CONFIG_LSMOD is not set @@ -495,34 +504,36 @@ CONFIG_MODINFO=y # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # CONFIG_BLOCKDEV=y -# CONFIG_REV is not set +CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set +CONFIG_BLKID=y +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set +CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set +# CONFIG_FEATURE_GPT_LABEL is not set +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +CONFIG_FLOCK=y CONFIG_FREERAMDISK=y # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set @@ -530,19 +541,19 @@ CONFIG_FREERAMDISK=y # CONFIG_FEATURE_MINIX2 is not set # CONFIG_MKFS_REISER is not set # CONFIG_MKFS_VFAT is not set -# CONFIG_GETOPT is not set -# CONFIG_FEATURE_GETOPT_LONG is not set -# CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y # CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_IPCRM is not set # CONFIG_IPCS is not set -# CONFIG_LOSETUP is not set -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set # CONFIG_FEATURE_MDEV_RENAME is not set @@ -552,97 +563,104 @@ CONFIG_FREERAMDISK=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y +# CONFIG_MOUNT is not set # CONFIG_FEATURE_MOUNT_FAKE is not set # CONFIG_FEATURE_MOUNT_VERBOSE is not set # CONFIG_FEATURE_MOUNT_HELPERS is not set # CONFIG_FEATURE_MOUNT_LABEL is not set # CONFIG_FEATURE_MOUNT_NFS is not set # CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y # CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y +# CONFIG_SWAPONOFF is not set # CONFIG_FEATURE_SWAPON_PRI is not set # CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_BTRFS=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # # Miscellaneous Utilities # # CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +CONFIG_NANDDUMP=y +CONFIG_SETSERIAL=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y # CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y +CONFIG_FEATURE_CHAT_SEND_ESCAPES=y +CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y +CONFIG_FEATURE_CHAT_CLR_ABORT=y +CONFIG_CHRT=y # CONFIG_CROND is not set # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set CONFIG_FEATURE_CROND_DIR="" # CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set +CONFIG_DEVMEM=y # CONFIG_EJECT is not set # CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set +CONFIG_FBSPLASH=y +CONFIG_FLASHCP=y +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y # CONFIG_FLASH_ERASEALL is not set # CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set +CONFIG_INOTIFYD=y # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set @@ -655,90 +673,98 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +CONFIG_MAN=y # CONFIG_MICROCOM is not set # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set +CONFIG_RAIDAUTORUN=y # CONFIG_READAHEAD is not set # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -# CONFIG_STRINGS is not set +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y # CONFIG_WALL is not set # CONFIG_WATCHDOG is not set # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y +# CONFIG_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING is not set +CONFIG_WHOIS=y +# CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -CONFIG_ARPING=y +CONFIG_ARP=y +# CONFIG_ARPING is not set # CONFIG_BRCTL is not set # CONFIG_FEATURE_BRCTL_FANCY is not set # CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set +CONFIG_DNSD=y # CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_HOSTNAME is not set +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_IFCONFIG is not set -# CONFIG_FEATURE_IFCONFIG_STATUS is not set +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y # CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set # CONFIG_INETD is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set @@ -751,47 +777,38 @@ CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NETSTAT is not set -# CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y # CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_PING is not set -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING is not set -# CONFIG_PSCAN is not set +CONFIG_PSCAN=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set +CONFIG_TCPSVD=y # CONFIG_TELNET is not set # CONFIG_FEATURE_TELNET_TTYPE is not set # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y +# CONFIG_TFTP is not set # CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTP_DEBUG is not set @@ -800,94 +817,103 @@ CONFIG_FEATURE_TFTP_PUT=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y # CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 +CONFIG_UDHCP_DEBUG=9 CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_ZCIP is not set # # Print Utilities # -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y # # Mail Utilities # -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +CONFIG_SENDMAIL=y # # Process Utilities # -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y +CONFIG_SMEMCAP=y +# CONFIG_FREE is not set +CONFIG_FUSER=y +# CONFIG_KILL is not set # CONFIG_KILLALL is not set # CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set # CONFIG_PGREP is not set CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set -CONFIG_PS=y +# CONFIG_PS is not set # CONFIG_FEATURE_PS_WIDE is not set # CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y # CONFIG_UPTIME is not set -# CONFIG_WATCH is not set +CONFIG_WATCH=y # # Runit Utilities # -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y # CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y # CONFIG_CHCON is not set # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set # CONFIG_GETENFORCE is not set @@ -907,23 +933,27 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -CONFIG_ASH=y +# CONFIG_ASH is not set # CONFIG_ASH_BASH_COMPAT is not set -CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +# CONFIG_ASH_JOB_CONTROL is not set # CONFIG_ASH_ALIAS is not set -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_BUILTIN_PRINTF is not set +# CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_RANDOM_SUPPORT is not set # CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set # CONFIG_HUSH_TICK is not set # CONFIG_HUSH_IF is not set @@ -931,35 +961,36 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_HUSH_CASE is not set # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set -CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +# CONFIG_FEATURE_SH_IS_ASH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_FEATURE_BASH_IS_ASH is not set # CONFIG_FEATURE_BASH_IS_HUSH is not set CONFIG_FEATURE_BASH_IS_NONE=y -# CONFIG_LASH is not set -# CONFIG_MSH is not set -CONFIG_SH_MATH_SUPPORT=y -CONFIG_SH_MATH_SUPPORT_64=y +# CONFIG_SH_MATH_SUPPORT is not set +# CONFIG_SH_MATH_SUPPORT_64 is not set # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_CTTYHACK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities # -CONFIG_SYSLOGD=y +# CONFIG_SYSLOGD is not set # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set CONFIG_KLOGD=y CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y +# CONFIG_LOGGER is not set diff --git a/configs/android_defconfig b/configs/android_defconfig new file mode 100644 index 0000000..e35830e --- /dev/null +++ b/configs/android_defconfig @@ -0,0 +1,1028 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.20.0.git +# Sun Nov 6 07:51:38 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_INCLUDE_SUSv2 is not set +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +# CONFIG_SHOW_USAGE is not set +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_INSTALL_NO_USR is not set +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_UNICODE_SUPPORT is not set +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=0 +CONFIG_LAST_SUPPORTED_WCHAR=0 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LONG_OPTS is not set +# CONFIG_FEATURE_DEVPTS is not set +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_PIDFILE is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +# CONFIG_LFS is not set +CONFIG_CROSS_COMPILER_PREFIX="arm-eabi-" +# +# Removed: +# warning flags: +# -Wno-multichar -W -Wall -Wno-unused -Winit-self -Wpointer-arith +# -Werror=return-type -Werror=non-virtual-dtor -Werror=address +# -Werror=sequence-point -Wstrict-aliasing=2 -Wno-undef -Wno-shadow +# bbox already adds these: +# -ffunction-sections -fomit-frame-pointer +# enabled implicitly by -Os: +# -frerun-cse-after-loop +# should be not needed, or even increases code size: +# -finline-functions -fno-inline-functions-called-once -finline-limit=64 +# -fstack-protector -fno-strict-aliasing -fno-exceptions -funwind-tables +# -fmessage-length=0 (only affects error message format) +# todo: do we need these? - +# -fno-short-enums +# -fgcse-after-reload +# -frename-registers +CONFIG_EXTRA_CFLAGS="-I$A/system/core/include -I$A/bionic/libc/arch-arm/include -I$A/bionic/libc/include -I$A/bionic/libc/kernel/common -I$A/bionic/libc/kernel/arch-arm -I$A/bionic/libm/include -I$A/bionic/libm/include/arch/arm -include $A/system/core/include/arch/linux-arm/AndroidConfig.h -I$A/system/core/include/arch/linux-arm/ -D__ANDROID__ -DSK_RELEASE -nostdlib -march=armv7-a -msoft-float -mfloat-abi=softfp -mfpu=neon -mthumb -mthumb-interwork -fpic -fno-short-enums -fgcse-after-reload -frename-registers" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_FEATURE_EDITING is not set +CONFIG_FEATURE_EDITING_MAX_LEN=0 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=0 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +# CONFIG_FEATURE_TAB_COMPLETION is not set +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +# CONFIG_FEATURE_NON_POSIX_CP is not set +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_FEATURE_SKIP_ROOTFS is not set +# CONFIG_MONOTONIC_SYSCALL is not set +# CONFIG_IOCTL_HEX2STR_ERROR is not set +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_FEATURE_AR_CREATE=y +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +CONFIG_RPM=y +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +# CONFIG_WHO is not set +# CONFIG_USERS is not set +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +# CONFIG_DF is not set +# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPAND=y +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +# CONFIG_TTY is not set +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +# CONFIG_KBD_MODE is not set +# CONFIG_LOADFONT is not set +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETFONT is not set +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +CONFIG_BOOTCHARTD=y +CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y +CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_COREDUMPS=y +CONFIG_FEATURE_INITRD=y +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +# CONFIG_FSCK is not set +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +CONFIG_MODPROBE_SMALL=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_REV=y +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +CONFIG_FLOCK=y +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +# CONFIG_MKFS_VFAT is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_PRI is not set +CONFIG_SWITCH_ROOT=y +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_BTRFS=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +# CONFIG_NANDWRITE is not set +CONFIG_NANDDUMP=y +CONFIG_SETSERIAL=y +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y +CONFIG_FEATURE_CHAT_SEND_ESCAPES=y +CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y +CONFIG_FEATURE_CHAT_CLR_ABORT=y +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +CONFIG_FBSPLASH=y +CONFIG_FLASHCP=y +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set +CONFIG_INOTIFYD=y +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +CONFIG_MAN=y +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +CONFIG_RAIDAUTORUN=y +# CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set +# CONFIG_RUNLEVEL is not set +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +# CONFIG_PING6 is not set +CONFIG_FEATURE_FANCY_PING=y +CONFIG_WHOIS=y +# CONFIG_FEATURE_IPV6 is not set +# CONFIG_FEATURE_UNIX_LOCAL is not set +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +# CONFIG_ETHER_WAKE is not set +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +# CONFIG_HOSTNAME is not set +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFENSLAVE is not set +# CONFIG_IFPLUGD is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +# CONFIG_NSLOOKUP is not set +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PSCAN=y +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y +CONFIG_TFTP=y +CONFIG_TFTPD=y + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +# CONFIG_TFTP_DEBUG is not set +CONFIG_TRACEROUTE=y +# CONFIG_TRACEROUTE6 is not set +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPC6 is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCP_PORT=y +CONFIG_UDHCP_DEBUG=9 +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set + +# +# Print Utilities +# +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +CONFIG_SENDMAIL=y + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y +CONFIG_SMEMCAP=y +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +CONFIG_FUSER=y +# CONFIG_KILL is not set +# CONFIG_KILLALL is not set +# CONFIG_KILLALL5 is not set +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +# CONFIG_ASH is not set +# CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_IDLE_TIMEOUT is not set +# CONFIG_ASH_JOB_CONTROL is not set +# CONFIG_ASH_ALIAS is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_BUILTIN_PRINTF is not set +# CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +# CONFIG_SH_MATH_SUPPORT is not set +# CONFIG_SH_MATH_SUPPORT_64 is not set +# CONFIG_FEATURE_SH_EXTRA_QUIET is not set +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +# CONFIG_LOGGER is not set diff --git a/packaging/busybox-dahlia.config b/configs/android_ndk_defconfig similarity index 60% rename from packaging/busybox-dahlia.config rename to configs/android_ndk_defconfig index 3b3be76..01cc2dd 100644 --- a/packaging/busybox-dahlia.config +++ b/configs/android_ndk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.17.1 -# Fri Apr 15 11:03:42 2011 +# Busybox version: 1.21.0.git +# Mon May 28 21:51:18 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -12,9 +12,9 @@ CONFIG_HAVE_DOT_CONFIG=y # # General Configuration # -# CONFIG_DESKTOP is not set -CONFIG_EXTRA_COMPAT=y -CONFIG_INCLUDE_SUSv2=y +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_INCLUDE_SUSv2 is not set # CONFIG_USE_PORTABLE_CODE is not set CONFIG_PLATFORM_LINUX=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y @@ -23,32 +23,33 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y # CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_SUPPORT is not set # CONFIG_UNICODE_USING_LOCALE is not set -CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=0 +CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_COMBINING_WCHARS is not set # CONFIG_UNICODE_WIDE_WCHARS is not set # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_DEVPTS is not set # CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_PIDFILE is not set +# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -59,9 +60,12 @@ CONFIG_FEATURE_HAVE_RPC=y # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" +# CONFIG_LFS is not set +CONFIG_CROSS_COMPILER_PREFIX="arm-linux-androideabi-" +CONFIG_SYSROOT="/opt/android-ndk/platforms/android-9/arch-arm" +CONFIG_EXTRA_CFLAGS="-DANDROID -D__ANDROID__ -DSK_RELEASE -nostdlib -march=armv7-a -msoft-float -mfloat-abi=softfp -mfpu=neon -mthumb -mthumb-interwork -fpic -fno-short-enums -fgcse-after-reload -frename-registers" +CONFIG_EXTRA_LDFLAGS="-Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker -dynamic-linker -Xlinker /system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined ${SYSROOT}/usr/lib/crtbegin_dynamic.o ${SYSROOT}/usr/lib/crtend_android.o" +CONFIG_EXTRA_LDLIBS="dl m c gcc" # # Debugging Options @@ -74,9 +78,8 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Installation Options +# Installation Options ("make install" behavior) # -# CONFIG_INSTALL_NO_USR is not set CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set @@ -89,25 +92,31 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 -CONFIG_FEATURE_FAST_TOP=y +CONFIG_MD5_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_FEATURE_EDITING is not set +CONFIG_FEATURE_EDITING_MAX_LEN=0 # CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_EDITING_HISTORY=0 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +# CONFIG_FEATURE_TAB_COMPLETION is not set # CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_FEATURE_NON_POSIX_CP is not set CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y +# CONFIG_FEATURE_SKIP_ROOTFS is not set +# CONFIG_MONOTONIC_SYSCALL is not set +# CONFIG_IOCTL_HEX2STR_ERROR is not set +# CONFIG_FEATURE_HWIB is not set # # Applets @@ -129,12 +138,13 @@ CONFIG_BZIP2=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y -CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 CONFIG_LZOP=y CONFIG_LZOP_COMPR_HIGH=y CONFIG_RPM2CPIO=y @@ -146,8 +156,8 @@ CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_TO_COMMAND=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set @@ -155,8 +165,8 @@ CONFIG_UNCOMPRESS=y CONFIG_UNLZMA=y CONFIG_FEATURE_LZMA_FAST=y CONFIG_LZMA=y -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_UNZIP=y # @@ -164,33 +174,41 @@ CONFIG_UNZIP=y # CONFIG_BASENAME=y CONFIG_CAT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_FEATURE_DATE_NANO=y -CONFIG_FEATURE_DATE_COMPAT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +# CONFIG_WHO is not set +# CONFIG_USERS is not set CONFIG_CAL=y CONFIG_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y -CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y CONFIG_CKSUM=y CONFIG_COMM=y CONFIG_CP=y -CONFIG_FEATURE_CP_LONG_OPTIONS=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set CONFIG_CUT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_FANCY=y +# CONFIG_DF is not set +# CONFIG_FEATURE_DF_FANCY is not set CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -199,9 +217,9 @@ CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FALSE=y @@ -209,13 +227,10 @@ CONFIG_FOLD=y CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set CONFIG_LN=y -CONFIG_LOGNAME=y +# CONFIG_LOGNAME is not set CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y @@ -227,11 +242,11 @@ CONFIG_FEATURE_LS_COLOR=y # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set CONFIG_NICE=y CONFIG_NOHUP=y CONFIG_OD=y @@ -243,7 +258,7 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y @@ -255,8 +270,8 @@ CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y CONFIG_SPLIT=y CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set CONFIG_STTY=y CONFIG_SUM=y CONFIG_SYNC=y @@ -265,19 +280,17 @@ CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TOUCH=y CONFIG_TRUE=y -CONFIG_TTY=y +# CONFIG_TTY is not set CONFIG_UNAME=y CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_UNIQ=y CONFIG_USLEEP=y CONFIG_UUDECODE=y CONFIG_UUENCODE=y CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y CONFIG_WHOAMI=y CONFIG_YES=y @@ -306,63 +319,51 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # CONFIG_CHVT=y CONFIG_FGCONSOLE=y -# CONFIG_CLEAR is not set +CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y +# CONFIG_KBD_MODE is not set +# CONFIG_LOADFONT is not set CONFIG_LOADKMAP=y CONFIG_OPENVT=y -# CONFIG_RESET is not set +CONFIG_RESET=y CONFIG_RESIZE=y CONFIG_FEATURE_RESIZE_PRINT=y CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETFONT is not set # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_SETKEYCODES=y CONFIG_SETLOGCONS=y CONFIG_SHOWKEY=y - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities # -# CONFIG_MKTEMP is not set CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set +CONFIG_WHICH=y # # Editors # -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y CONFIG_PATCH=y -CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -370,7 +371,14 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -412,81 +420,86 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_HALT is not set +CONFIG_BOOTCHARTD=y +CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y +CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" -# CONFIG_MESG is not set +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_COREDUMPS=y +CONFIG_FEATURE_INITRD=y +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y # # Login/Password Management Utilities # -CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +# CONFIG_FEATURE_SHADOWPASSWDS is not set # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_CRYPT is not set # CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=64900 -CONFIG_DELUSER=y -CONFIG_GETTY=y +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_GETTY is not set # CONFIG_LOGIN is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set -CONFIG_CHPASSWD=y +# CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set # CONFIG_SULOGIN is not set -CONFIG_VLOCK=y +# CONFIG_VLOCK is not set # # Linux Ext2 FS Progs # -# CONFIG_CHATTR is not set +CONFIG_CHATTR=y # CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y # # Linux Module Utilities # CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_DEPMOD=y +CONFIG_MODPROBE_SMALL=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set # # Options common to multiple modutils @@ -498,20 +511,27 @@ CONFIG_DEPMOD=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="/system/lib/modules" CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -526,67 +546,57 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set CONFIG_FEATURE_FDISK_ADVANCED=y -# CONFIG_FINDFS is not set +CONFIG_FINDFS=y CONFIG_FLOCK=y CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y +# CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set -CONFIG_MKFS_MINIX=y -CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set # CONFIG_MKFS_REISER is not set -CONFIG_MKFS_VFAT=y +# CONFIG_MKFS_VFAT is not set CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y CONFIG_FEATURE_HEXDUMP_REVERSE=y CONFIG_HD=y CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set CONFIG_RDEV=y CONFIG_READPROFILE=y CONFIG_RTCWAKE=y CONFIG_SCRIPT=y CONFIG_SCRIPTREPLAY=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set CONFIG_VOLUMEID=y @@ -615,13 +625,31 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set -CONFIG_UBIATTACH=y -CONFIG_UBIDETACH=y -CONFIG_ADJTIMEX=y -# CONFIG_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +# CONFIG_NANDWRITE is not set +CONFIG_NANDDUMP=y +CONFIG_SETSERIAL=y +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_ADJTIMEX is not set +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 CONFIG_CHAT=y CONFIG_FEATURE_CHAT_NOFAIL=y # CONFIG_FEATURE_CHAT_TTY_HIFI is not set @@ -643,28 +671,19 @@ CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVFSD_FG_NP is not set # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_DEVMEM=y +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set CONFIG_FBSPLASH=y CONFIG_FLASHCP=y CONFIG_FLASH_LOCK=y CONFIG_FLASH_UNLOCK=y -CONFIG_FLASH_ERASEALL=y -CONFIG_IONICE=y +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set CONFIG_INOTIFYD=y # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_DASHCMD=y -CONFIG_FEATURE_LESS_LINENUMS=y CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y @@ -676,70 +695,78 @@ CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set CONFIG_FEATURE_MAKEDEVS_TABLE=y CONFIG_MAN=y -CONFIG_MICROCOM=y -CONFIG_MOUNTPOINT=y -CONFIG_MT=y +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y +# CONFIG_READAHEAD is not set # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set CONFIG_RX=y CONFIG_SETSID=y CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y CONFIG_VOLNAME=y -CONFIG_WALL=y -CONFIG_WATCHDOG=y +# CONFIG_WALL is not set +# CONFIG_WATCHDOG is not set # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y -CONFIG_NC_110_COMPAT=y -CONFIG_FEATURE_IPV6=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +# CONFIG_PING6 is not set +CONFIG_FEATURE_FANCY_PING=y +CONFIG_WHOIS=y +# CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -CONFIG_FEATURE_BRCTL_FANCY=y -CONFIG_FEATURE_BRCTL_SHOW=y +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y +# CONFIG_ETHER_WAKE is not set CONFIG_FAKEIDENTD=y -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y CONFIG_FTPGET=y CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +# CONFIG_HOSTNAME is not set CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y CONFIG_FEATURE_HTTPD_USE_SENDFILE=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set CONFIG_FEATURE_HTTPD_CGI=y CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y CONFIG_FEATURE_HTTPD_ERROR_PAGES=y CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y +# CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" @@ -747,16 +774,16 @@ CONFIG_FEATURE_IFUPDOWN_IP=y CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set CONFIG_FEATURE_IFUPDOWN_MAPPING=y -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -CONFIG_INETD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y -CONFIG_FEATURE_INETD_RPC=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y @@ -764,7 +791,7 @@ CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_TUNNEL=y CONFIG_FEATURE_IP_RULE=y CONFIG_FEATURE_IP_SHORT_FORMS=y -CONFIG_FEATURE_IP_RARE_PROTOCOLS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set CONFIG_IPADDR=y CONFIG_IPLINK=y CONFIG_IPROUTE=y @@ -772,21 +799,16 @@ CONFIG_IPTUNNEL=y CONFIG_IPRULE=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -CONFIG_FEATURE_NAMEIF_EXTENDED=y +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y +# CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y CONFIG_PSCAN=y CONFIG_ROUTE=y -CONFIG_SLATTACH=y +# CONFIG_SLATTACH is not set CONFIG_TCPSVD=y CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y @@ -804,73 +826,86 @@ CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y -CONFIG_TFTP_DEBUG=y +# CONFIG_TFTP_DEBUG is not set CONFIG_TRACEROUTE=y # CONFIG_TRACEROUTE6 is not set CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y -CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -CONFIG_UDHCPD=y -CONFIG_DHCPRELAY=y -CONFIG_DUMPLEASES=y -CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y -CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPC6 is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCP_PORT=y -CONFIG_UDHCP_DEBUG=0 +CONFIG_UDHCP_DEBUG=9 CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_FEATURE_UDHCPC_FAST_REQUEST=y CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" CONFIG_UDPSVD=y CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_ZCIP=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set # # Print Utilities # -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y # # Mail Utilities # -# CONFIG_MAKEMIME is not set +CONFIG_MAKEMIME=y CONFIG_FEATURE_MIME_CHARSET="us-ascii" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y CONFIG_SENDMAIL=y # # Process Utilities # -# CONFIG_SMEMCAP is not set +CONFIG_IOSTAT=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y +CONFIG_SMEMCAP=y +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y +# CONFIG_KILL is not set +# CONFIG_KILLALL is not set # CONFIG_KILLALL5 is not set -CONFIG_NMETER=y -CONFIG_PGREP=y -# CONFIG_PIDOF is not set -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -CONFIG_PKILL=y +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y @@ -882,7 +917,6 @@ CONFIG_FEATURE_TOP_DECIMALS=y CONFIG_FEATURE_TOP_SMP_PROCESS=y CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_UPTIME=y CONFIG_WATCH=y # @@ -890,7 +924,7 @@ CONFIG_WATCH=y # CONFIG_RUNSV=y CONFIG_RUNSVDIR=y -CONFIG_FEATURE_RUNSVDIR_LOG=y +# CONFIG_FEATURE_RUNSVDIR_LOG is not set CONFIG_SV=y CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" CONFIG_SVLOGD=y @@ -918,23 +952,27 @@ CONFIG_SOFTLIMIT=y # # Shells # -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y +# CONFIG_ASH is not set +# CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_IDLE_TIMEOUT is not set +# CONFIG_ASH_JOB_CONTROL is not set +# CONFIG_ASH_ALIAS is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_BUILTIN_PRINTF is not set +# CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set # CONFIG_HUSH_TICK is not set # CONFIG_HUSH_IF is not set @@ -942,35 +980,36 @@ CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH_CASE is not set # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set -CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +# CONFIG_FEATURE_SH_IS_ASH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_FEATURE_BASH_IS_ASH is not set # CONFIG_FEATURE_BASH_IS_HUSH is not set CONFIG_FEATURE_BASH_IS_NONE=y -# CONFIG_LASH is not set -# CONFIG_MSH is not set -CONFIG_SH_MATH_SUPPORT=y -CONFIG_SH_MATH_SUPPORT_64=y -CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_SH_MATH_SUPPORT is not set +# CONFIG_SH_MATH_SUPPORT_64 is not set +# CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_CTTYHACK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities # -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_SYSLOGD_DUP=y -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set CONFIG_KLOGD=y CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y +# CONFIG_LOGGER is not set diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig new file mode 100644 index 0000000..aa346e3 --- /dev/null +++ b/configs/cygwin_defconfig @@ -0,0 +1,996 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.19.0.git +# Sun Jul 10 12:48:50 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=65533 +CONFIG_LAST_SUPPORTED_WCHAR=0 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=255 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +# CONFIG_MONOTONIC_SYSCALL is not set +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +# CONFIG_FEATURE_SEAMLESS_Z is not set +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +# CONFIG_LZOP_COMPR_HIGH is not set +CONFIG_RPM2CPIO=y +CONFIG_RPM=y +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +# CONFIG_UNCOMPRESS is not set +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_ID=y +CONFIG_GROUPS=y +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +# CONFIG_WHO is not set +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_KBD_MODE is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETFONT is not set +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set +# CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +# CONFIG_FEATURE_VI_8BIT is not set +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +# CONFIG_HALT is not set +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +# CONFIG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_USE_BB_PWD_GRP=y +CONFIG_USE_BB_SHADOW=y +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +# CONFIG_GETTY is not set +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# +# CONFIG_MODINFO is not set +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" + +# +# Linux System Utilities +# +# CONFIG_BLOCKDEV is not set +CONFIG_REV=y +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +# CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set +# CONFIG_DMESG is not set +# CONFIG_FEATURE_DMESG_PRETTY is not set +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FINDFS is not set +CONFIG_FLOCK=y +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +# CONFIG_MKFS_VFAT is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +CONFIG_IPCRM=y +# CONFIG_IPCS is not set +# CONFIG_LOSETUP is not set +# CONFIG_LSPCI is not set +# CONFIG_LSUSB is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set +CONFIG_RDEV=y +CONFIG_READPROFILE=y +# CONFIG_RTCWAKE is not set +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_PRI is not set +# CONFIG_SWITCH_ROOT is not set +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set +# CONFIG_FEATURE_MTAB_SUPPORT is not set +# CONFIG_VOLUMEID is not set +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +# CONFIG_BEEP is not set +CONFIG_FEATURE_BEEP_FREQ=0 +CONFIG_FEATURE_BEEP_LENGTH_MS=0 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y +CONFIG_FEATURE_CHAT_SEND_ESCAPES=y +CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y +CONFIG_FEATURE_CHAT_CLR_ABORT=y +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set +# CONFIG_INOTIFYD is not set +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +CONFIG_MAN=y +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +CONFIG_MT=y +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_SETSID=y +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +# CONFIG_NBDCLIENT is not set +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +# CONFIG_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING is not set +CONFIG_WHOIS=y +CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_UNIX_LOCAL is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +# CONFIG_ETHER_WAKE is not set +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +# CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFENSLAVE is not set +# CONFIG_IFPLUGD is not set +# CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_RULE is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPRULE is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +# CONFIG_NETSTAT is not set +# CONFIG_FEATURE_NETSTAT_WIDE is not set +# CONFIG_FEATURE_NETSTAT_PRG is not set +# CONFIG_NSLOOKUP is not set +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PSCAN=y +# CONFIG_ROUTE is not set +# CONFIG_SLATTACH is not set +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y +CONFIG_TFTP=y +CONFIG_TFTPD=y + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +# CONFIG_TFTP_DEBUG is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set + +# +# Print Utilities +# +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +CONFIG_SENDMAIL=y + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +# CONFIG_PMAP is not set +# CONFIG_POWERTOP is not set +CONFIG_PSTREE=y +CONFIG_PWDX=y +CONFIG_SMEMCAP=y +# CONFIG_FREE is not set +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +# CONFIG_FEATURE_PS_TIME is not set +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +# CONFIG_FEATURE_SHOW_THREADS is not set +# CONFIG_UPTIME is not set +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_CTTYHACK is not set +CONFIG_HUSH=y +CONFIG_HUSH_BASH_COMPAT=y +CONFIG_HUSH_BRACE_EXPANSION=y +CONFIG_HUSH_HELP=y +CONFIG_HUSH_INTERACTIVE=y +CONFIG_HUSH_SAVEHISTORY=y +CONFIG_HUSH_JOB=y +CONFIG_HUSH_TICK=y +CONFIG_HUSH_IF=y +CONFIG_HUSH_LOOPS=y +CONFIG_HUSH_CASE=y +CONFIG_HUSH_FUNCTIONS=y +CONFIG_HUSH_LOCAL=y +CONFIG_HUSH_RANDOM_SUPPORT=y +CONFIG_HUSH_EXPORT_N=y +CONFIG_HUSH_MODE_X=y +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_SYSLOGD_CFG=y +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +CONFIG_LOGGER=y diff --git a/debian/config/pkg/deb b/configs/freebsd_defconfig similarity index 69% rename from debian/config/pkg/deb rename to configs/freebsd_defconfig index fbd418b..ec3ed03 100644 --- a/debian/config/pkg/deb +++ b/configs/freebsd_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.17.1 -# Tue Nov 9 10:34:49 2010 +# Busybox version: 1.18.1 +# Tue Dec 21 19:47:40 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -12,10 +12,11 @@ CONFIG_HAVE_DOT_CONFIG=y # # General Configuration # -CONFIG_DESKTOP=y -CONFIG_EXTRA_COMPAT=y +# CONFIG_DESKTOP is not set +# CONFIG_EXTRA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_USE_PORTABLE_CODE=y +# CONFIG_PLATFORM_LINUX is not set CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set @@ -23,29 +24,30 @@ CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_FEATURE_INSTALLER=y -# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_INSTALL_NO_USR is not set +CONFIG_LOCALE_SUPPORT=y CONFIG_UNICODE_SUPPORT=y # CONFIG_UNICODE_USING_LOCALE is not set -CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set CONFIG_SUBST_WCHAR=63 CONFIG_LAST_SUPPORTED_WCHAR=767 -CONFIG_UNICODE_COMBINING_WCHARS=y -CONFIG_UNICODE_WIDE_WCHARS=y +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_UTMP is not set CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y # CONFIG_SELINUX is not set -CONFIG_FEATURE_PREFER_APPLETS=y -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y # CONFIG_FEATURE_HAVE_RPC is not set @@ -73,13 +75,12 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Installation Options +# Installation Options ("make install" behavior) # -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_INSTALL_APPLET_SYMLINKS is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -CONFIG_INSTALL_APPLET_DONT=y +# CONFIG_INSTALL_APPLET_DONT is not set # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set @@ -89,22 +90,23 @@ CONFIG_PREFIX="./_install" # Busybox Library Tuning # CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=1 -# CONFIG_FEATURE_FAST_TOP is not set +CONFIG_MD5_SMALL=1 +CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_HISTORY=30 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y +# CONFIG_MONOTONIC_SYSCALL is not set CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_HWIB=y @@ -115,18 +117,18 @@ CONFIG_FEATURE_HWIB=y # # Archival Utilities # -# CONFIG_FEATURE_SEAMLESS_XZ is not set +CONFIG_FEATURE_SEAMLESS_XZ=y CONFIG_FEATURE_SEAMLESS_LZMA=y CONFIG_FEATURE_SEAMLESS_BZ2=y CONFIG_FEATURE_SEAMLESS_GZ=y CONFIG_FEATURE_SEAMLESS_Z=y -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_FEATURE_AR_CREATE=y CONFIG_BUNZIP2=y CONFIG_BZIP2=y CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y +# CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set @@ -134,20 +136,20 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y -# CONFIG_LZOP is not set +CONFIG_LZOP=y # CONFIG_LZOP_COMPR_HIGH is not set CONFIG_RPM2CPIO=y CONFIG_RPM=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_TO_COMMAND=y -CONFIG_FEATURE_TAR_UNAME_GNAME=y +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set CONFIG_UNCOMPRESS=y @@ -163,33 +165,34 @@ CONFIG_UNZIP=y # CONFIG_BASENAME=y CONFIG_CAT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y +# CONFIG_FEATURE_DATE_COMPAT is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TR=y -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_BASE64 is not set CONFIG_CAL=y -# CONFIG_CATV is not set +CONFIG_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set +CONFIG_CKSUM=y +CONFIG_COMM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_CUT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_FANCY=y +# CONFIG_DF is not set +# CONFIG_FEATURE_DF_FANCY is not set CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -199,19 +202,19 @@ CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FALSE=y CONFIG_FOLD=y -# CONFIG_FSYNC is not set +CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y @@ -223,18 +226,18 @@ CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y -CONFIG_MKNOD=y +# CONFIG_MKNOD is not set CONFIG_MV=y CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set +CONFIG_NICE=y +CONFIG_NOHUP=y CONFIG_OD=y -# CONFIG_PRINTENV is not set +CONFIG_PRINTENV=y CONFIG_PRINTF=y CONFIG_PWD=y CONFIG_READLINK=y @@ -242,24 +245,24 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -# CONFIG_SEQ is not set +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y -# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y # CONFIG_STAT is not set # CONFIG_FEATURE_STAT_FORMAT is not set -CONFIG_STTY=y -# CONFIG_SUM is not set +# CONFIG_STTY is not set +CONFIG_SUM=y CONFIG_SYNC=y -CONFIG_TAC=y +# CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y @@ -268,15 +271,15 @@ CONFIG_TOUCH=y CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y CONFIG_UNIQ=y CONFIG_USLEEP=y CONFIG_UUDECODE=y CONFIG_UUENCODE=y CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHO=y +CONFIG_FEATURE_WC_LARGE=y +# CONFIG_WHO is not set CONFIG_WHOAMI=y CONFIG_YES=y @@ -298,35 +301,31 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Common options for md5sum, sha1sum, sha256sum, sha512sum # -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities # -CONFIG_CHVT=y +# CONFIG_CHVT is not set # CONFIG_FGCONSOLE is not set CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set # CONFIG_KBD_MODE is not set -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set CONFIG_RESET=y -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y # CONFIG_SETCONSOLE is not set # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETFONT is not set # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR="" -CONFIG_SETKEYCODES=y +# CONFIG_SETKEYCODES is not set # CONFIG_SETLOGCONS is not set # CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# # CONFIG_FEATURE_LOADFONT_PSF2 is not set # CONFIG_FEATURE_LOADFONT_RAW is not set @@ -334,26 +333,26 @@ CONFIG_SETKEYCODES=y # Debian Utilities # CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set +CONFIG_PIPE_PROGRESS=y CONFIG_RUN_PARTS=y CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set CONFIG_WHICH=y # # Editors # +CONFIG_PATCH=y CONFIG_AWK=y CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_PATCH=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=1024 @@ -368,7 +367,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -392,7 +390,7 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -402,10 +400,10 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities @@ -413,6 +411,9 @@ CONFIG_XARGS=y # CONFIG_BOOTCHARTD is not set # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +# CONFIG_HALT is not set +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" # CONFIG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set @@ -422,30 +423,30 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_EXTRA_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INITRD is not set -# CONFIG_HALT is not set -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" +CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set # # Login/Password Management Utilities # +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set # CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_USE_BB_PWD_GRP=y # CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_USE_BB_CRYPT_SHA=y -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_FEATURE_CHECK_NAMES is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y # CONFIG_DELUSER is not set +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y # CONFIG_GETTY is not set # CONFIG_LOGIN is not set # CONFIG_PAM is not set @@ -465,14 +466,10 @@ CONFIG_LAST_SYSTEM_ID=0 # # Linux Ext2 FS Progs # -# CONFIG_CHATTR is not set +CONFIG_CHATTR=y # CONFIG_FSCK is not set # CONFIG_LSATTR is not set # CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# # CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set @@ -484,10 +481,6 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# # CONFIG_FEATURE_2_4_MODULES is not set # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set @@ -504,13 +497,13 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities # -CONFIG_BLOCKDEV=y +# CONFIG_BLOCKDEV is not set CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_DMESG is not set +# CONFIG_FEATURE_DMESG_PRETTY is not set # CONFIG_FBSET is not set # CONFIG_FEATURE_FBSET_FANCY is not set # CONFIG_FEATURE_FBSET_READMODE is not set @@ -523,9 +516,10 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set +CONFIG_FLOCK=y # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set @@ -537,15 +531,15 @@ CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y # CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set +CONFIG_HD=y # CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_IPCRM is not set # CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set +# CONFIG_LOSETUP is not set +CONFIG_LSPCI=y +CONFIG_LSUSB=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set # CONFIG_FEATURE_MDEV_RENAME is not set @@ -555,67 +549,61 @@ CONFIG_LOSETUP=y # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y +# CONFIG_MOUNT is not set # CONFIG_FEATURE_MOUNT_FAKE is not set # CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set # CONFIG_FEATURE_MOUNT_NFS is not set # CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_PIVOT_ROOT is not set -CONFIG_RDATE=y +# CONFIG_RDATE is not set # CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set +CONFIG_READPROFILE=y # CONFIG_RTCWAKE is not set # CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set +CONFIG_SCRIPTREPLAY=y # CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y +# CONFIG_SWAPONOFF is not set # CONFIG_FEATURE_SWAPON_PRI is not set # CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set +# CONFIG_FEATURE_MOUNT_LOOP is not set # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +# CONFIG_VOLUMEID is not set +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # # Miscellaneous Utilities # # CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set -CONFIG_ADJTIMEX=y +# CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -627,12 +615,12 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set +CONFIG_CHRT=y # CONFIG_CROND is not set # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y CONFIG_DC=y CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVFSD is not set @@ -648,17 +636,17 @@ CONFIG_FEATURE_DC_LIBM=y # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set # CONFIG_FLASH_ERASEALL is not set -CONFIG_IONICE=y +# CONFIG_IONICE is not set # CONFIG_INOTIFYD is not set -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_LESS is not set -CONFIG_FEATURE_LESS_MAXLINES=0 -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set @@ -673,69 +661,71 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set -# CONFIG_MICROCOM is not set +CONFIG_MICROCOM=y # CONFIG_MOUNTPOINT is not set -CONFIG_MT=y +# CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set -# CONFIG_SETSID is not set +CONFIG_SETSID=y CONFIG_STRINGS=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_TIME=y -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set +# CONFIG_TIME is not set +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y # CONFIG_WALL is not set -CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG is not set # # Networking Utilities # +# CONFIG_NBDCLIENT is not set CONFIG_NC=y # CONFIG_NC_SERVER is not set # CONFIG_NC_EXTRA is not set # CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set # CONFIG_ARP is not set -CONFIG_ARPING=y -CONFIG_BRCTL=y +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set # CONFIG_FEATURE_BRCTL_FANCY is not set # CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set +CONFIG_DNSD=y # CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_HTTPD=y -# CONFIG_FEATURE_HTTPD_RANGES is not set +CONFIG_FEATURE_HTTPD_RANGES=y # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_SETUID is not set CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +# CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set # CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set # CONFIG_IFUPDOWN is not set @@ -754,12 +744,12 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_RULE is not set # CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set # CONFIG_IPADDR is not set @@ -770,29 +760,29 @@ CONFIG_FEATURE_IP_RULE=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y +# CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NETSTAT=y +# CONFIG_NETSTAT is not set # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set -CONFIG_NSLOOKUP=y +# CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y +# CONFIG_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING is not set +CONFIG_PSCAN=y +# CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set # CONFIG_TCPSVD is not set CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y CONFIG_TFTP=y -# CONFIG_TFTPD is not set +CONFIG_TFTPD=y # # Common options for tftp/tftpd @@ -802,25 +792,25 @@ CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_TFTP_DEBUG is not set -CONFIG_TRACEROUTE=y -CONFIG_TRACEROUTE6=y -CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_TRACEROUTE is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set -CONFIG_UDHCPD=y +# CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set -CONFIG_DUMPLEASES=y +# CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 -CONFIG_FEATURE_UDHCP_RFC3397=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set @@ -828,14 +818,15 @@ CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_ZCIP is not set # # Print Utilities # # CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set +CONFIG_LPR=y +CONFIG_LPQ=y # # Mail Utilities @@ -851,26 +842,30 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_SMEMCAP=y +# CONFIG_FREE is not set # CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set +CONFIG_KILLALL5=y # CONFIG_NMETER is not set -# CONFIG_PGREP is not set -CONFIG_PIDOF=y +CONFIG_PGREP=y +# CONFIG_PIDOF is not set # CONFIG_FEATURE_PIDOF_SINGLE is not set # CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PKILL is not set +CONFIG_PKILL=y CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set +CONFIG_FEATURE_PS_WIDE=y # CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -CONFIG_TOP=y +# CONFIG_TOP is not set # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set # CONFIG_FEATURE_TOP_SMP_CPU is not set @@ -878,7 +873,7 @@ CONFIG_TOP=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_UPTIME=y +# CONFIG_UPTIME is not set CONFIG_WATCH=y # @@ -915,22 +910,25 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # Shells # CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_JOB_CONTROL is not set +# CONFIG_ASH_ALIAS is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_BUILTIN_PRINTF is not set +# CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set # CONFIG_HUSH_TICK is not set # CONFIG_HUSH_IF is not set @@ -938,35 +936,34 @@ CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH_CASE is not set # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_NONE is not set # CONFIG_FEATURE_BASH_IS_ASH is not set # CONFIG_FEATURE_BASH_IS_HUSH is not set CONFIG_FEATURE_BASH_IS_NONE=y -# CONFIG_LASH is not set -# CONFIG_MSH is not set CONFIG_SH_MATH_SUPPORT=y CONFIG_SH_MATH_SUPPORT_64=y # CONFIG_FEATURE_SH_EXTRA_QUIET is not set -CONFIG_FEATURE_SH_STANDALONE=y +# CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_CTTYHACK is not set # # System Logging Utilities # CONFIG_SYSLOGD=y -# CONFIG_FEATURE_ROTATE_LOGFILE is not set +CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64 +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set CONFIG_LOGGER=y diff --git a/console-tools/Config.src b/console-tools/Config.src index 6e3191a..c657044 100644 --- a/console-tools/Config.src +++ b/console-tools/Config.src @@ -10,6 +10,7 @@ INSERT config CHVT bool "chvt" default y + select PLATFORM_LINUX help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) @@ -17,6 +18,7 @@ config CHVT config FGCONSOLE bool "fgconsole" default y + select PLATFORM_LINUX help This program prints active (foreground) console number. @@ -29,12 +31,14 @@ config CLEAR config DEALLOCVT bool "deallocvt" default y + select PLATFORM_LINUX help This program deallocates unused virtual consoles. config DUMPKMAP bool "dumpkmap" default y + select PLATFORM_LINUX help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. @@ -42,18 +46,21 @@ config DUMPKMAP config KBD_MODE bool "kbd_mode" default y + select PLATFORM_LINUX help This program reports and sets keyboard mode. config LOADFONT bool "loadfont" default y + select PLATFORM_LINUX help This program loads a console font from standard input. config LOADKMAP bool "loadkmap" default y + select PLATFORM_LINUX help This program loads a keyboard translation table from standard input. @@ -61,6 +68,7 @@ config LOADKMAP config OPENVT bool "openvt" default y + select PLATFORM_LINUX help This program is used to start a command on an unused virtual terminal. @@ -92,6 +100,7 @@ config FEATURE_RESIZE_PRINT config SETCONSOLE bool "setconsole" default y + select PLATFORM_LINUX help This program redirects the system console to another device, like the current tty while logged in via telnet. @@ -106,6 +115,7 @@ config FEATURE_SETCONSOLE_LONG_OPTIONS config SETFONT bool "setfont" default y + select PLATFORM_LINUX help Allows to load console screen map. Useful for i18n. @@ -127,6 +137,7 @@ config DEFAULT_SETFONT_DIR config SETKEYCODES bool "setkeycodes" default y + select PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. @@ -134,12 +145,14 @@ config SETKEYCODES config SETLOGCONS bool "setlogcons" default y + select PLATFORM_LINUX help This program redirects the output console of kernel messages. config SHOWKEY bool "showkey" default y + select PLATFORM_LINUX help Shows keys pressed. diff --git a/console-tools/Kbuild.src b/console-tools/Kbuild.src index 17f6606..94de9ad 100644 --- a/console-tools/Kbuild.src +++ b/console-tools/Kbuild.src @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# Licensed under the GPL v2, see the file LICENSE in this tarball. +# Licensed under GPLv2, see file LICENSE in this source tree. lib-y:= diff --git a/console-tools/chvt.c b/console-tools/chvt.c index 977c269..b9c974f 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -4,8 +4,14 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define chvt_trivial_usage +//usage: "N" +//usage:#define chvt_full_usage "\n\n" +//usage: "Change the foreground virtual terminal to /dev/ttyN" + #include "libbb.h" int chvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/console-tools/clear.c b/console-tools/clear.c index cac7163..ac22b78 100644 --- a/console-tools/clear.c +++ b/console-tools/clear.c @@ -4,8 +4,14 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define clear_trivial_usage +//usage: "" +//usage:#define clear_full_usage "\n\n" +//usage: "Clear screen" + #include "libbb.h" int clear_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index 0974883..b131c0a 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c @@ -5,11 +5,16 @@ * Copyright (C) 2003 by Tito Ragusa * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* no options, no getopt */ +//usage:#define deallocvt_trivial_usage +//usage: "[N]" +//usage:#define deallocvt_full_usage "\n\n" +//usage: "Deallocate unused virtual terminal /dev/ttyN" + #include "libbb.h" /* From */ diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c index a03b593..bf8d690 100644 --- a/console-tools/dumpkmap.c +++ b/console-tools/dumpkmap.c @@ -4,11 +4,19 @@ * * Copyright (C) Arne Bernin * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * */ /* no options, no getopt */ +//usage:#define dumpkmap_trivial_usage +//usage: "> keymap" +//usage:#define dumpkmap_full_usage "\n\n" +//usage: "Print a binary keyboard translation table to stdout" +//usage: +//usage:#define dumpkmap_example_usage +//usage: "$ dumpkmap > keymap\n" + #include "libbb.h" /* From */ @@ -28,47 +36,56 @@ int dumpkmap_main(int argc UNUSED_PARAM, char **argv) { struct kbentry ke; int i, j, fd; - RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS); +#define flags bb_common_bufsiz1 /* When user accidentally runs "dumpkmap FILE" * instead of "dumpkmap >FILE", we'd dump binary stuff to tty. - * Let's prevent it: */ + * Let's prevent it: + */ if (argv[1]) bb_show_usage(); /* bb_warn_ignoring_args(argv[1]);*/ fd = get_console_fd_or_die(); +#if 0 write(STDOUT_FILENO, "bkeymap", 7); - /* Here we want to set everything to 0 except for indexes: - * [0-2] [4-6] [8-10] [12] */ - memset(flags, 0x00, MAX_NR_KEYMAPS); + * [0-2] [4-6] [8-10] [12] + */ + /*memset(flags, 0x00, MAX_NR_KEYMAPS); - already is */ memset(flags, 0x01, 13); flags[3] = flags[7] = flags[11] = 0; - /* dump flags */ write(STDOUT_FILENO, flags, MAX_NR_KEYMAPS); +#define flags7 flags +#else + /* Same effect */ + /* 0 1 2 3 4 5 6 7 8 9 a b c=12 */ + memcpy(flags, "bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1", + /* Can use sizeof, or sizeof-1. sizeof is even, using that */ + /****/ sizeof("bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1") + ); + write(STDOUT_FILENO, flags, 7 + MAX_NR_KEYMAPS); +#define flags7 (flags + 7) +#endif - for (i = 0; i < MAX_NR_KEYMAPS; i++) { - if (flags[i] == 1) { + for (i = 0; i < 13; i++) { + if (flags7[i]) { for (j = 0; j < NR_KEYS; j++) { ke.kb_index = j; ke.kb_table = i; if (!ioctl_or_perror(fd, KDGKBENT, &ke, - "ioctl failed with %s, %s, %p", - (char *)&ke.kb_index, - (char *)&ke.kb_table, - &ke.kb_value) + "ioctl(KDGKBENT{%d,%d}) failed", + j, i) ) { - write(STDOUT_FILENO, (void*)&ke.kb_value, 2); + write(STDOUT_FILENO, &ke.kb_value, 2); } } } } if (ENABLE_FEATURE_CLEAN_UP) { close(fd); - RELEASE_CONFIG_BUFFER(flags); } return EXIT_SUCCESS; } diff --git a/console-tools/fgconsole.c b/console-tools/fgconsole.c index 75fd98f..54355be 100644 --- a/console-tools/fgconsole.c +++ b/console-tools/fgconsole.c @@ -4,9 +4,14 @@ * * Copyright (C) 2010 by Grigory Batalov * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define fgconsole_trivial_usage +//usage: "" +//usage:#define fgconsole_full_usage "\n\n" +//usage: "Get active console" + #include "libbb.h" /* From */ diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c index e1d8523..1385367 100644 --- a/console-tools/kbd_mode.c +++ b/console-tools/kbd_mode.c @@ -6,8 +6,19 @@ * written using Andries Brouwer 's kbd_mode from * console-utils v0.2.3, licensed under GNU GPLv2 * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define kbd_mode_trivial_usage +//usage: "[-a|k|s|u] [-C TTY]" +//usage:#define kbd_mode_full_usage "\n\n" +//usage: "Report or set the keyboard mode\n" +//usage: "\n -a Default (ASCII)" +//usage: "\n -k Medium-raw (keyboard)" +//usage: "\n -s Raw (scancode)" +//usage: "\n -u Unicode (utf-8)" +//usage: "\n -C TTY Affect TTY instead of /dev/tty" + #include "libbb.h" #include @@ -16,9 +27,9 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv) { enum { SCANCODE = (1 << 0), - ASCII = (1 << 1), + ASCII = (1 << 1), MEDIUMRAW = (1 << 2), - UNICODE = (1 << 3), + UNICODE = (1 << 3), }; int fd; unsigned opt; diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index e51142c..032506d 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -7,8 +7,28 @@ * Loads the console font, and possibly the corresponding screen map(s). * (Adapted for busybox by Matej Vela.) * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ + +//usage:#define loadfont_trivial_usage +//usage: "< font" +//usage:#define loadfont_full_usage "\n\n" +//usage: "Load a console font from stdin" +/* //usage: "\n -C TTY Affect TTY instead of /dev/tty" */ +//usage: +//usage:#define loadfont_example_usage +//usage: "$ loadfont < /etc/i18n/fontname\n" +//usage: +//usage:#define setfont_trivial_usage +//usage: "FONT [-m MAPFILE] [-C TTY]" +//usage:#define setfont_full_usage "\n\n" +//usage: "Load a console font\n" +//usage: "\n -m MAPFILE Load console screen map" +//usage: "\n -C TTY Affect TTY instead of /dev/tty" +//usage: +//usage:#define setfont_example_usage +//usage: "$ setfont -m koi8-r /etc/i18n/fontname\n" + #include "libbb.h" #include @@ -136,7 +156,7 @@ static void do_loadfont(int fd, unsigned char *inbuf, int height, int width, int * Example: * At the font position for a capital A-ring glyph, we * may have: - * 00C5,212B,FFFE,0041,030A,FFFF + * 00C5,212B,FFFE,0041,030A,FFFF * Some font positions may be described by sequences only, * namely when there is no precomposed Unicode value for the glyph. */ @@ -159,7 +179,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, int glyph; uint16_t unicode; - maxct = tailsz; /* more than enough */ + maxct = tailsz; /* more than enough */ up = xmalloc(maxct * sizeof(*up)); for (glyph = 0; glyph < fontsize; glyph++) { @@ -209,7 +229,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, } /* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP - this printf did not work on many kernels */ + * this printf did not work on many kernels */ advice.advised_hashsize = 0; advice.advised_hashstep = 0; @@ -255,10 +275,10 @@ static void do_load(int fd, unsigned char *buffer, size_t len) } else #endif #if ENABLE_FEATURE_LOADFONT_RAW - if (len == 9780) { /* file with three code pages? */ + if (len == 9780) { /* file with three code pages? */ charsize = height = 16; font += 40; - } else if ((len & 0377) == 0) { /* bare font */ + } else if ((len & 0377) == 0) { /* bare font */ charsize = height = len / 256; } else #endif diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 8f1a915..66ec3b0 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c @@ -4,8 +4,18 @@ * * Copyright (C) 1998 Enrique Zanardi * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define loadkmap_trivial_usage +//usage: "< keymap" +//usage:#define loadkmap_full_usage "\n\n" +//usage: "Load a binary keyboard translation table from stdin\n" +/* //usage: "\n -C TTY Affect TTY instead of /dev/tty" */ +//usage: +//usage:#define loadkmap_example_usage +//usage: "$ loadkmap < /etc/i18n/lang-keymap\n" + #include "libbb.h" #define BINARY_KEYMAP_MAGIC "bkeymap" @@ -38,6 +48,7 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv) if (argv[1]) bb_show_usage(); /* bb_warn_ignoring_args(argv[1]); */ + fd = get_console_fd_or_die(); /* or maybe: opt = getopt32(argv, "C:", &tty_name); @@ -51,14 +62,24 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv) xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS); for (i = 0; i < MAX_NR_KEYMAPS; i++) { - if (flags[i] == 1) { - xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t)); - for (j = 0; j < NR_KEYS; j++) { - ke.kb_index = j; - ke.kb_table = i; - ke.kb_value = ibuff[j]; - ioctl(fd, KDSKBENT, &ke); - } + if (flags[i] != 1) + continue; + xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t)); + for (j = 0; j < NR_KEYS; j++) { + ke.kb_index = j; + ke.kb_table = i; + ke.kb_value = ibuff[j]; + /* + * Note: table[idx:0] can contain special value + * K_ALLOCATED (marks allocated tables in kernel). + * dumpkmap saves the value as-is; but attempts + * to load it here fail, since it isn't a valid + * key value: it is K(KT_SPEC,126) == 2<<8 + 126, + * whereas last valid KT_SPEC is + * K_BARENUMLOCK == K(KT_SPEC,19). + * So far we just ignore these errors: + */ + ioctl(fd, KDSKBENT, &ke); } } diff --git a/console-tools/openvt.c b/console-tools/openvt.c index e3ea71b..e523566 100644 --- a/console-tools/openvt.c +++ b/console-tools/openvt.c @@ -5,9 +5,21 @@ * busyboxed by Quy Tonthat * hacked by Tito * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define openvt_trivial_usage +//usage: "[-c N] [-sw] [PROG ARGS]" +//usage:#define openvt_full_usage "\n\n" +//usage: "Start PROG on a new virtual terminal\n" +//usage: "\n -c N Use specified VT" +//usage: "\n -s Switch to the VT" +/* //usage: "\n -l Run PROG as login shell (by prepending '-')" */ +//usage: "\n -w Wait for PROG to exit" +//usage: +//usage:#define openvt_example_usage +//usage: "openvt 2 /bin/ash\n" + #include #include "libbb.h" @@ -144,9 +156,7 @@ int openvt_main(int argc UNUSED_PARAM, char **argv) if (!argv[0]) { argv--; - argv[0] = getenv("SHELL"); - if (!argv[0]) - argv[0] = (char *) DEFAULT_SHELL; + argv[0] = (char *) get_shell_name(); /*argv[1] = NULL; - already is */ } diff --git a/console-tools/reset.c b/console-tools/reset.c index f0ea5cb..65940bd 100644 --- a/console-tools/reset.c +++ b/console-tools/reset.c @@ -5,14 +5,21 @@ * Copyright (C) 1999-2004 by Erik Andersen * Written by Erik Andersen and Kent Robotti * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#include "libbb.h" - /* BTW, which "standard" package has this utility? It doesn't seem * to be ncurses, coreutils, console-tools... then what? */ +//usage:#define reset_trivial_usage +//usage: "" +//usage:#define reset_full_usage "\n\n" +//usage: "Reset the screen" + +#include "libbb.h" + +#define ESC "\033" + #if ENABLE_STTY int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; #endif @@ -26,15 +33,15 @@ int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) /* no options, no getopt */ - if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) { + if (/*isatty(STDIN_FILENO) &&*/ isatty(STDOUT_FILENO)) { /* See 'man 4 console_codes' for details: * "ESC c" -- Reset - * "ESC ( K" -- Select user mapping - * "ESC [ J" -- Erase to the end of screen + * "ESC ( B" -- Select G0 Character Set (B = US) * "ESC [ 0 m" -- Reset all display attributes + * "ESC [ J" -- Erase to the end of screen * "ESC [ ? 25 h" -- Make cursor visible */ - printf("\033c\033(K\033[J\033[0m\033[?25h"); + printf(ESC"c" ESC"(B" ESC"[0m" ESC"[J" ESC"[?25h"); /* http://bugs.busybox.net/view.php?id=1414: * people want it to reset echo etc: */ #if ENABLE_STTY diff --git a/console-tools/resize.c b/console-tools/resize.c index 828b5bb..4b0d63a 100644 --- a/console-tools/resize.c +++ b/console-tools/resize.c @@ -4,9 +4,15 @@ * * Copyright 2006 Bernhard Reutner-Fischer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* no options, no getopt */ + +//usage:#define resize_trivial_usage +//usage: "" +//usage:#define resize_full_usage "\n\n" +//usage: "Resize the screen" + #include "libbb.h" #define ESC "\033" @@ -17,7 +23,7 @@ static void onintr(int sig UNUSED_PARAM) { tcsetattr(STDERR_FILENO, TCSANOW, old_termios_p); - exit(EXIT_FAILURE); + _exit(EXIT_FAILURE); } int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -53,6 +59,7 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) */ fprintf(stderr, ESC"7" ESC"[r" ESC"[999;999H" ESC"[6n"); alarm(3); /* Just in case terminal won't answer */ +//BUG: death by signal won't restore termios scanf(ESC"[%hu;%huR", &w.ws_row, &w.ws_col); fprintf(stderr, ESC"8"); diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c index 8ad9948..c0051dc 100644 --- a/console-tools/setconsole.c +++ b/console-tools/setconsole.c @@ -5,9 +5,15 @@ * Copyright (C) 2004,2005 Enrik Berkhan * Copyright (C) 2008 Bernhard Reutner-Fischer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define setconsole_trivial_usage +//usage: "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]" +//usage:#define setconsole_full_usage "\n\n" +//usage: "Redirect system console output to DEVICE (default: /dev/tty)\n" +//usage: "\n -r Reset output to /dev/console" + #include "libbb.h" int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -34,6 +40,6 @@ int setconsole_main(int argc UNUSED_PARAM, char **argv) device = DEV_CONSOLE; } - xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL); + xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL); return EXIT_SUCCESS; } diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index b6a9a32..a6a7c23 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c @@ -6,8 +6,20 @@ * * Adjusted for BusyBox by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define setkeycodes_trivial_usage +//usage: "SCANCODE KEYCODE..." +//usage:#define setkeycodes_full_usage "\n\n" +//usage: "Set entries into the kernel's scancode-to-keycode map,\n" +//usage: "allowing unusual keyboards to generate usable keycodes.\n\n" +//usage: "SCANCODE may be either xx or e0xx (hexadecimal),\n" +//usage: "and KEYCODE is given in decimal." +//usage: +//usage:#define setkeycodes_example_usage +//usage: "$ setkeycodes e030 127\n" + #include "libbb.h" /* From */ diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c index dd44591..c76a5a4 100644 --- a/console-tools/setlogcons.c +++ b/console-tools/setlogcons.c @@ -6,9 +6,14 @@ * * Based on setlogcons (kbd-1.12) by Andries E. Brouwer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define setlogcons_trivial_usage +//usage: "N" +//usage:#define setlogcons_full_usage "\n\n" +//usage: "Redirect the kernel output to console N (0 for current)" + #include "libbb.h" int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -17,9 +22,10 @@ int setlogcons_main(int argc UNUSED_PARAM, char **argv) struct { char fn; char subarg; - } arg = { 11, /* redirect kernel messages */ - 0 /* to specified console (current as default) */ - }; + } arg = { + 11, /* redirect kernel messages */ + 0 /* to specified console (current as default) */ + }; if (argv[1]) arg.subarg = xatou_range(argv[1], 0, 63); diff --git a/console-tools/showkey.c b/console-tools/showkey.c index 681114d..69b785e 100644 --- a/console-tools/showkey.c +++ b/console-tools/showkey.c @@ -4,135 +4,147 @@ * * Copyright (C) 2008 by Vladimir Dronnikov * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ +//usage:#define showkey_trivial_usage +//usage: "[-a | -k | -s]" +//usage:#define showkey_full_usage "\n\n" +//usage: "Show keys pressed\n" +//usage: "\n -a Display decimal/octal/hex values of the keys" +//usage: "\n -k Display interpreted keycodes (default)" +//usage: "\n -s Display raw scan-codes" + #include "libbb.h" #include -// set raw tty mode -// also used by microcom -// libbb candidates? -static void xget1(int fd, struct termios *t, struct termios *oldt) -{ - tcgetattr(fd, oldt); - *t = *oldt; - cfmakeraw(t); -} - -static int xset1(int fd, struct termios *tio, const char *device) -{ - int ret = tcsetattr(fd, TCSAFLUSH, tio); - - if (ret) { - bb_perror_msg("can't tcsetattr for %s", device); - } - return ret; -} -/* - * GLOBALS - */ struct globals { int kbmode; struct termios tio, tio0; }; #define G (*ptr_to_globals) -#define kbmode (G.kbmode) -#define tio (G.tio) -#define tio0 (G.tio0) +#define kbmode (G.kbmode) +#define tio (G.tio) +#define tio0 (G.tio0) #define INIT_G() do { \ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ } while (0) -static void signal_handler(int signo) +// set raw tty mode +// also used by microcom +// libbb candidates? +static void xget1(struct termios *t, struct termios *oldt) +{ + tcgetattr(STDIN_FILENO, oldt); + *t = *oldt; + cfmakeraw(t); +} + +static void xset1(struct termios *t) { - // restore keyboard and console settings - xset1(STDIN_FILENO, &tio0, "stdin"); - xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode); - // alarmed? -> exit 0 - exit(SIGALRM == signo); + int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t); + if (ret) { + bb_perror_msg("can't tcsetattr for stdin"); + } } int showkey_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int showkey_main(int argc UNUSED_PARAM, char **argv) { enum { - OPT_a = (1<<0), // display the decimal/octal/hex values of the keys - OPT_k = (1<<1), // display only the interpreted keycodes (default) - OPT_s = (1<<2), // display only the raw scan-codes + OPT_a = (1<<0), // display the decimal/octal/hex values of the keys + OPT_k = (1<<1), // display only the interpreted keycodes (default) + OPT_s = (1<<2), // display only the raw scan-codes }; + INIT_G(); + // FIXME: aks are all mutually exclusive getopt32(argv, "aks"); - INIT_G(); - - // get keyboard settings - xioctl(STDIN_FILENO, KDGKBMODE, &kbmode); - printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n", - kbmode == K_RAW ? "RAW" : - (kbmode == K_XLATE ? "XLATE" : - (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" : - (kbmode == K_UNICODE ? "UNICODE" : "?UNKNOWN?"))) - , (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress" - ); // prepare for raw mode - xget1(STDIN_FILENO, &tio, &tio0); + xget1(&tio, &tio0); // put stdin in raw mode - xset1(STDIN_FILENO, &tio, "stdin"); + xset1(&tio); + +#define press_keys "Press any keys, program terminates %s:\r\n\n" if (option_mask32 & OPT_a) { - char c; // just read stdin char by char - while (1 == safe_read(STDIN_FILENO, &c, 1)) { - printf("%3d 0%03o 0x%02x\r\n", c, c, c); + unsigned char c; + + printf(press_keys, "on EOF (ctrl-D)"); + + // read and show byte values + while (1 == read(STDIN_FILENO, &c, 1)) { + printf("%3u 0%03o 0x%02x\r\n", c, c, c); if (04 /*CTRL-D*/ == c) break; } + } else { - // we should exit on any signal - bb_signals(BB_FATAL_SIGS, signal_handler); + // we assume a PC keyboard + xioctl(STDIN_FILENO, KDGKBMODE, &kbmode); + printf("Keyboard mode was %s.\r\n\n", + kbmode == K_RAW ? "RAW" : + (kbmode == K_XLATE ? "XLATE" : + (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" : + (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN"))) + ); + // set raw keyboard mode xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW)); + // we should exit on any signal; signals should interrupt read + bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo); + + // inform user that program ends after time of inactivity + printf(press_keys, "10s after last keypress"); + // read and show scancodes - while (1) { + while (!bb_got_signal) { char buf[18]; int i, n; + // setup 10s watchdog alarm(10); + // read scancodes n = read(STDIN_FILENO, buf, sizeof(buf)); i = 0; while (i < n) { - char c = buf[i]; - // show raw scancodes ordered? -> if (option_mask32 & OPT_s) { + // show raw scancodes printf("0x%02x ", buf[i++]); - // show interpreted scancodes (default) ? -> } else { + // show interpreted scancodes (default) + char c = buf[i]; int kc; - if (i+2 < n && (c & 0x7f) == 0 - && (buf[i+1] & 0x80) != 0 - && (buf[i+2] & 0x80) != 0) { + if (i+2 < n + && (c & 0x7f) == 0 + && (buf[i+1] & 0x80) != 0 + && (buf[i+2] & 0x80) != 0 + ) { kc = ((buf[i+1] & 0x7f) << 7) | (buf[i+2] & 0x7f); i += 3; } else { kc = (c & 0x7f); i++; } - printf("keycode %3d %s", kc, (c & 0x80) ? "release" : "press"); + printf("keycode %3u %s", kc, (c & 0x80) ? "release" : "press"); } } puts("\r"); } + + // restore keyboard mode + xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode); } - // cleanup - signal_handler(SIGALRM); + // restore console settings + xset1(&tio0); - // should never be here! return EXIT_SUCCESS; } diff --git a/coreutils/Config.src b/coreutils/Config.src index d4c9e05..0c44c4b 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src @@ -269,19 +269,6 @@ config FEATURE_FANCY_HEAD help This enables the head options (-c, -q, and -v). -config HOSTID - bool "hostid" - default y - help - hostid prints the numeric identifier (in hexadecimal) for - the current host. - -config ID - bool "id" - default y - help - id displays the current user and group ID names. - config INSTALL bool "install" default y @@ -295,11 +282,11 @@ config FEATURE_INSTALL_LONG_OPTIONS help Support long options for the install applet. -config LENGTH - bool "length" - default y - help - length is used to print out the length of a specified string. +####config LENGTH +#### bool "length" +#### default y +#### help +#### length is used to print out the length of a specified string. config LN bool "ln" @@ -527,6 +514,12 @@ config SHA512SUM help Compute and check SHA512 message digest +config SHA3SUM + bool "sha3sum" + default y + help + Compute and check SHA3 (512-bit) message digest + config SLEEP bool "sleep" default y @@ -591,6 +584,7 @@ config FEATURE_SPLIT_FANCY config STAT bool "stat" default y + select PLATFORM_LINUX # statfs() help display file or filesystem status. @@ -660,13 +654,6 @@ config FEATURE_TEE_USE_BLOCK_IO help Enable this option for a faster tee, at expense of size. -config TOUCH - bool "touch" - default y - help - touch is used to create or change the access and/or - modification timestamp of specified files. - config TRUE bool "true" default y @@ -737,13 +724,6 @@ config FEATURE_WC_LARGE help Use "unsigned long long" in wc for counter variables. -config WHO - bool "who" - default y - depends on FEATURE_UTMP - help - who is used to show who is logged on. - config WHOAMI bool "whoami" default y @@ -792,13 +772,13 @@ config FEATURE_HUMAN_READABLE help Allow df, du, and ls to have human readable output. -comment "Common options for md5sum, sha1sum, sha256sum, sha512sum" - depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM +comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum" + depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM config FEATURE_MD5_SHA1_SUM_CHECK bool "Enable -c, -s and -w options" default y - depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM + depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM help Enabling the -c options allows files to be checked against pre-calculated hash values. diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index 1c846a7..ec4ef7d 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# Licensed under the GPL v2, see the file LICENSE in this tarball. +# Licensed under GPLv2, see file LICENSE in this source tree. libs-y += libcoreutils/ @@ -35,11 +35,8 @@ lib-$(CONFIG_EXPAND) += expand.o lib-$(CONFIG_FALSE) += false.o lib-$(CONFIG_FOLD) += fold.o lib-$(CONFIG_FSYNC) += fsync.o -lib-$(CONFIG_HEAD) += head.o -lib-$(CONFIG_HOSTID) += hostid.o -lib-$(CONFIG_ID) += id.o lib-$(CONFIG_INSTALL) += install.o -lib-$(CONFIG_LENGTH) += length.o +#lib-$(CONFIG_LENGTH) += length.o lib-$(CONFIG_LN) += ln.o lib-$(CONFIG_LOGNAME) += logname.o lib-$(CONFIG_LS) += ls.o @@ -64,6 +61,7 @@ lib-$(CONFIG_SEQ) += seq.o lib-$(CONFIG_SHA1SUM) += md5_sha1_sum.o lib-$(CONFIG_SHA256SUM) += md5_sha1_sum.o lib-$(CONFIG_SHA512SUM) += md5_sha1_sum.o +lib-$(CONFIG_SHA3SUM) += md5_sha1_sum.o lib-$(CONFIG_SLEEP) += sleep.o lib-$(CONFIG_SPLIT) += split.o lib-$(CONFIG_SORT) += sort.o @@ -72,9 +70,7 @@ lib-$(CONFIG_STTY) += stty.o lib-$(CONFIG_SUM) += sum.o lib-$(CONFIG_SYNC) += sync.o lib-$(CONFIG_TAC) += tac.o -lib-$(CONFIG_TAIL) += tail.o lib-$(CONFIG_TEE) += tee.o -lib-$(CONFIG_TOUCH) += touch.o lib-$(CONFIG_TRUE) += true.o lib-$(CONFIG_TTY) += tty.o lib-$(CONFIG_UNAME) += uname.o @@ -84,6 +80,5 @@ lib-$(CONFIG_USLEEP) += usleep.o lib-$(CONFIG_UUDECODE) += uudecode.o lib-$(CONFIG_UUENCODE) += uuencode.o lib-$(CONFIG_WC) += wc.o -lib-$(CONFIG_WHO) += who.o lib-$(CONFIG_WHOAMI) += whoami.o lib-$(CONFIG_YES) += yes.o diff --git a/coreutils/basename.c b/coreutils/basename.c index b79d561..1f7a137 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) @@ -28,6 +28,19 @@ //config: leaving just the filename itself. Enable this option if you wish //config: to enable the 'basename' utility. +//usage:#define basename_trivial_usage +//usage: "FILE [SUFFIX]" +//usage:#define basename_full_usage "\n\n" +//usage: "Strip directory path and .SUFFIX from FILE\n" +//usage: +//usage:#define basename_example_usage +//usage: "$ basename /usr/local/bin/foo\n" +//usage: "foo\n" +//usage: "$ basename /usr/local/bin/\n" +//usage: "bin\n" +//usage: "$ basename /foo/bar.txt .txt\n" +//usage: "bar" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ @@ -38,6 +51,11 @@ int basename_main(int argc, char **argv) size_t m, n; char *s; + if (argv[1] && strcmp(argv[1], "--") == 0) { + argv++; + argc--; + } + if ((unsigned)(argc-2) >= 2) { bb_show_usage(); } diff --git a/coreutils/cal.c b/coreutils/cal.c index c98229c..12c46b1 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c @@ -4,7 +4,7 @@ * * See original copyright at the end of this file * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant with -j and -y extensions (from util-linux). */ @@ -16,6 +16,14 @@ * * Major size reduction... over 50% (>1.5k) on i386. */ + +//usage:#define cal_trivial_usage +//usage: "[-jy] [[MONTH] YEAR]" +//usage:#define cal_full_usage "\n\n" +//usage: "Display a calendar\n" +//usage: "\n -j Use julian dates" +//usage: "\n -y Display the entire year" + #include "libbb.h" #include "unicode.h" @@ -35,7 +43,7 @@ static const unsigned char days_in_month[] ALIGN1 = { }; static const unsigned char sep1752[] ALIGN1 = { - 1, 2, 14, 15, 16, + 1, 2, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 }; @@ -138,7 +146,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv) if (julian) *hp++ = ' '; { - char *two_wchars = unicode_conv_to_printable_fixedwidth(NULL, buf, 2); + char *two_wchars = unicode_conv_to_printable_fixedwidth(/*NULL,*/ buf, 2); strcpy(hp, two_wchars); free(two_wchars); } @@ -157,10 +165,10 @@ int cal_main(int argc UNUSED_PARAM, char **argv) char lineout[30]; day_array(month, year, dp); - len = sprintf(lineout, "%s %d", month_names[month - 1], year); + len = sprintf(lineout, "%s %u", month_names[month - 1], year); printf("%*s%s\n%s\n", - ((7*julian + WEEK_LEN) - len) / 2, "", - lineout, day_headings); + ((7*julian + WEEK_LEN) - len) / 2, "", + lineout, day_headings); for (row = 0; row < 6; row++) { build_row(lineout, dp)[0] = '\0'; dp += 7; @@ -173,10 +181,11 @@ int cal_main(int argc UNUSED_PARAM, char **argv) sprintf(lineout, "%u", year); center(lineout, - (WEEK_LEN * 3 + HEAD_SEP * 2) - + julian * (J_WEEK_LEN * 2 + HEAD_SEP - - (WEEK_LEN * 3 + HEAD_SEP * 2)), - 0); + (WEEK_LEN * 3 + HEAD_SEP * 2) + + julian * (J_WEEK_LEN * 2 + HEAD_SEP + - (WEEK_LEN * 3 + HEAD_SEP * 2)), + 0 + ); puts("\n"); /* two \n's */ for (i = 0; i < 12; i++) { day_array(i + 1, year, days[i]); diff --git a/coreutils/cat.c b/coreutils/cat.c index ab68258..00c38d4 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c @@ -4,7 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2, see file License in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ @@ -22,6 +22,15 @@ //config: cat is used to concatenate files and print them to the standard //config: output. Enable this option if you wish to enable the 'cat' utility. +//usage:#define cat_trivial_usage +//usage: "[FILE]..." +//usage:#define cat_full_usage "\n\n" +//usage: "Concatenate FILEs and print them to stdout" +//usage: +//usage:#define cat_example_usage +//usage: "$ cat /proc/uptime\n" +//usage: "110716.72 17.67" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/catv.c b/coreutils/catv.c index ff3139c..e3499c5 100644 --- a/coreutils/catv.c +++ b/coreutils/catv.c @@ -4,12 +4,20 @@ * * Copyright (C) 2006 Rob Landley * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* See "Cat -v considered harmful" at * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */ +//usage:#define catv_trivial_usage +//usage: "[-etv] [FILE]..." +//usage:#define catv_full_usage "\n\n" +//usage: "Display nonprinting characters as ^x or M-x\n" +//usage: "\n -e End each line with $" +//usage: "\n -t Show tabs as ^I" +//usage: "\n -v Don't use ^x or M-x escapes" + #include "libbb.h" int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -17,14 +25,23 @@ int catv_main(int argc UNUSED_PARAM, char **argv) { int retval = EXIT_SUCCESS; int fd; - unsigned flags; - - flags = getopt32(argv, "etv"); + unsigned opts; #define CATV_OPT_e (1<<0) #define CATV_OPT_t (1<<1) #define CATV_OPT_v (1<<2) - flags ^= CATV_OPT_v; + typedef char BUG_const_mismatch[ + CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS + ? 1 : -1 + ]; + + opts = getopt32(argv, "etv"); argv += optind; +#if 0 /* These consts match, we can just pass "opts" to visible() */ + if (opts & CATV_OPT_e) + flags |= VISIBLE_ENDLINE; + if (opts & CATV_OPT_t) + flags |= VISIBLE_SHOW_TABS; +#endif /* Read from stdin if there's nothing else to do. */ if (!argv[0]) @@ -42,29 +59,17 @@ int catv_main(int argc UNUSED_PARAM, char **argv) res = read(fd, read_buf, COMMON_BUFSIZE); if (res < 0) retval = EXIT_FAILURE; - if (res < 1) + if (res <= 0) break; for (i = 0; i < res; i++) { unsigned char c = read_buf[i]; - - if (c > 126 && (flags & CATV_OPT_v)) { - if (c == 127) { - printf("^?"); - continue; - } - printf("M-"); - c -= 128; - } - if (c < 32) { - if (c == 10) { - if (flags & CATV_OPT_e) - bb_putchar('$'); - } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) { - printf("^%c", c+'@'); - continue; - } + if (opts & CATV_OPT_v) { + putchar(c); + } else { + char buf[sizeof("M-^c")]; + visible(c, buf, opts); + fputs(buf, stdout); } - bb_putchar(c); } } if (ENABLE_FEATURE_CLEAN_UP && fd) diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c index 7f39048..7076db6 100644 --- a/coreutils/chgrp.c +++ b/coreutils/chgrp.c @@ -4,13 +4,35 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 defects - none? */ /* BB_AUDIT GNU defects - unsupported long options. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */ +//usage:#define chgrp_trivial_usage +//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..." +//usage:#define chgrp_full_usage "\n\n" +//usage: "Change the group membership of each FILE to GROUP\n" +//usage: "\n -R Recurse" +//usage: "\n -h Affect symlinks instead of symlink targets" +//usage: "\n -L Traverse all symlinks to directories" +//usage: "\n -H Traverse symlinks on command line only" +//usage: "\n -P Don't traverse symlinks (default)" +//usage: IF_DESKTOP( +//usage: "\n -c List changed files" +//usage: "\n -v Verbose" +//usage: "\n -f Hide errors" +//usage: ) +//usage: +//usage:#define chgrp_example_usage +//usage: "$ ls -l /tmp/foo\n" +//usage: "-r--r--r-- 1 andersen andersen 0 Apr 12 18:25 /tmp/foo\n" +//usage: "$ chgrp root /tmp/foo\n" +//usage: "$ ls -l /tmp/foo\n" +//usage: "-r--r--r-- 1 andersen root 0 Apr 12 18:25 /tmp/foo\n" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ diff --git a/coreutils/chmod.c b/coreutils/chmod.c index c04201e..5ee45b9 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c @@ -7,13 +7,35 @@ * Reworked by (C) 2002 Vladimir Oleynik * to correctly parse '-rwxgoa' * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* BB_AUDIT GNU defects - unsupported long options. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */ +//usage:#define chmod_trivial_usage +//usage: "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..." +//usage:#define chmod_full_usage "\n\n" +//usage: "Each MODE is one or more of the letters ugoa, one of the\n" +//usage: "symbols +-= and one or more of the letters rwxst\n" +//usage: "\n -R Recurse" +//usage: IF_DESKTOP( +//usage: "\n -c List changed files" +//usage: "\n -v List all files" +//usage: "\n -f Hide errors" +//usage: ) +//usage: +//usage:#define chmod_example_usage +//usage: "$ ls -l /tmp/foo\n" +//usage: "-rw-rw-r-- 1 root root 0 Apr 12 18:25 /tmp/foo\n" +//usage: "$ chmod u+x /tmp/foo\n" +//usage: "$ ls -l /tmp/foo\n" +//usage: "-rwxrw-r-- 1 root root 0 Apr 12 18:25 /tmp/foo*\n" +//usage: "$ chmod 444 /tmp/foo\n" +//usage: "$ ls -l /tmp/foo\n" +//usage: "-r--r--r-- 1 root root 0 Apr 12 18:25 /tmp/foo\n" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ diff --git a/coreutils/chown.c b/coreutils/chown.c index 717e4b1..1a91276 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -4,12 +4,37 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 defects - none? */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */ +//usage:#define chown_trivial_usage +//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..." +//usage:#define chown_full_usage "\n\n" +//usage: "Change the owner and/or group of each FILE to OWNER and/or GROUP\n" +//usage: "\n -R Recurse" +//usage: "\n -h Affect symlinks instead of symlink targets" +//usage: "\n -L Traverse all symlinks to directories" +//usage: "\n -H Traverse symlinks on command line only" +//usage: "\n -P Don't traverse symlinks (default)" +//usage: IF_DESKTOP( +//usage: "\n -c List changed files" +//usage: "\n -v List all files" +//usage: "\n -f Hide errors" +//usage: ) +//usage: +//usage:#define chown_example_usage +//usage: "$ ls -l /tmp/foo\n" +//usage: "-r--r--r-- 1 andersen andersen 0 Apr 12 18:25 /tmp/foo\n" +//usage: "$ chown root /tmp/foo\n" +//usage: "$ ls -l /tmp/foo\n" +//usage: "-r--r--r-- 1 root andersen 0 Apr 12 18:25 /tmp/foo\n" +//usage: "$ chown root.root /tmp/foo\n" +//usage: "ls -l /tmp/foo\n" +//usage: "-r--r--r-- 1 root root 0 Apr 12 18:25 /tmp/foo\n" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ @@ -101,8 +126,8 @@ int chown_main(int argc UNUSED_PARAM, char **argv) /* This matches coreutils behavior (almost - see below) */ param.chown_func = chown; if (OPT_NODEREF - /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */ - IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) + /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */ + IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) ) { param.chown_func = lchown; } diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 046c2fa..633e66b 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c @@ -4,11 +4,24 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ +//usage:#define chroot_trivial_usage +//usage: "NEWROOT [PROG ARGS]" +//usage:#define chroot_full_usage "\n\n" +//usage: "Run PROG with root directory set to NEWROOT" +//usage: +//usage:#define chroot_example_usage +//usage: "$ ls -l /bin/ls\n" +//usage: "lrwxrwxrwx 1 root root 12 Apr 13 00:46 /bin/ls -> /BusyBox\n" +//usage: "# mount /dev/hdc1 /mnt -t minix\n" +//usage: "# chroot /mnt\n" +//usage: "# ls -l /bin/ls\n" +//usage: "-rwxr-xr-x 1 root root 40816 Feb 5 07:45 /bin/ls*\n" + #include "libbb.h" int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -18,16 +31,13 @@ int chroot_main(int argc UNUSED_PARAM, char **argv) if (!*argv) bb_show_usage(); xchroot(*argv); - xchdir("/"); ++argv; if (!*argv) { /* no 2nd param (PROG), use shell */ argv -= 2; - argv[0] = getenv("SHELL"); - if (!argv[0]) { - argv[0] = (char *) DEFAULT_SHELL; - } - argv[1] = (char *) "-i"; + argv[0] = (char *) get_shell_name(); + argv[1] = (char *) "-i"; /* GNU coreutils 8.4 compat */ + /*argv[2] = NULL; - already is */ } BB_EXECVP_or_die(argv); diff --git a/coreutils/cksum.c b/coreutils/cksum.c index 8e65b1c..ac0b0c3 100644 --- a/coreutils/cksum.c +++ b/coreutils/cksum.c @@ -4,10 +4,18 @@ * * Copyright (C) 2006 by Rob Sullivan, with ideas from code by Walter Harms * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define cksum_trivial_usage +//usage: "FILES..." +//usage:#define cksum_full_usage "\n\n" +//usage: "Calculate the CRC32 checksums of FILES" + #include "libbb.h" +/* This is a NOEXEC applet. Be very careful! */ + int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int cksum_main(int argc UNUSED_PARAM, char **argv) { @@ -16,7 +24,6 @@ int cksum_main(int argc UNUSED_PARAM, char **argv) off_t length, filesize; int bytes_read; int exit_code = EXIT_SUCCESS; - uint8_t *cp; #if ENABLE_DESKTOP getopt32(argv, ""); /* coreutils 6.9 compat */ @@ -37,11 +44,8 @@ int cksum_main(int argc UNUSED_PARAM, char **argv) #define read_buf bb_common_bufsiz1 while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) { - cp = (uint8_t *) read_buf; length += bytes_read; - do { - crc = (crc << 8) ^ crc32_table[(crc >> 24) ^ *cp++]; - } while (--bytes_read); + crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table); } close(fd); diff --git a/coreutils/comm.c b/coreutils/comm.c index 221cbfb..cd45095 100644 --- a/coreutils/comm.c +++ b/coreutils/comm.c @@ -4,9 +4,17 @@ * * Copyright (C) 2005 by Robert Sullivan * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define comm_trivial_usage +//usage: "[-123] FILE1 FILE2" +//usage:#define comm_full_usage "\n\n" +//usage: "Compare FILE1 with FILE2\n" +//usage: "\n -1 Suppress lines unique to FILE1" +//usage: "\n -2 Suppress lines unique to FILE2" +//usage: "\n -3 Suppress lines common to both files" + #include "libbb.h" #define COMM_OPT_1 (1 << 0) diff --git a/coreutils/cp.c b/coreutils/cp.c index d7c8d91..de2e512 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c @@ -5,7 +5,7 @@ * Copyright (C) 2000 by Matt Kraai * SELinux support by Yuichi Nakamura * - * Licensed under GPL v2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */ @@ -15,6 +15,23 @@ * Size reduction. */ +//usage:#define cp_trivial_usage +//usage: "[OPTIONS] SOURCE... DEST" +//usage:#define cp_full_usage "\n\n" +//usage: "Copy SOURCE(s) to DEST\n" +//usage: "\n -a Same as -dpR" +//usage: IF_SELINUX( +//usage: "\n -c Preserve security context" +//usage: ) +//usage: "\n -R,-r Recurse" +//usage: "\n -d,-P Preserve symlinks (default if -R)" +//usage: "\n -L Follow all symlinks" +//usage: "\n -H Follow symlinks on command line" +//usage: "\n -p Preserve file attributes if possible" +//usage: "\n -f Overwrite" +//usage: "\n -i Prompt before overwrite" +//usage: "\n -l,-s Create (sym)links" + #include "libbb.h" #include "libcoreutils/coreutils.h" diff --git a/coreutils/cut.c b/coreutils/cut.c index 53f343a..84449c7 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -6,9 +6,26 @@ * Written by Mark Whitley * debloated by Bernhard Reutner-Fischer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define cut_trivial_usage +//usage: "[OPTIONS] [FILE]..." +//usage:#define cut_full_usage "\n\n" +//usage: "Print selected fields from each input FILE to stdout\n" +//usage: "\n -b LIST Output only bytes from LIST" +//usage: "\n -c LIST Output only characters from LIST" +//usage: "\n -d CHAR Use CHAR instead of tab as the field delimiter" +//usage: "\n -s Output only the lines containing delimiter" +//usage: "\n -f N Print only these fields" +//usage: "\n -n Ignored" +//usage: +//usage:#define cut_example_usage +//usage: "$ echo \"Hello world\" | cut -f 1 -d ' '\n" +//usage: "Hello\n" +//usage: "$ echo \"Hello world\" | cut -f 2 -d ' '\n" +//usage: "world\n" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ @@ -37,7 +54,6 @@ static int cmpfunc(const void *a, const void *b) { return (((struct cut_list *) a)->startpos - ((struct cut_list *) b)->startpos); - } static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, unsigned nlists) @@ -196,7 +212,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv) if (opt & CUT_OPT_SUPPRESS_FLGS) { bb_error_msg_and_die ("suppressing non-delimited lines makes sense%s", - _op_on_field); + _op_on_field); } if (delim != '\t') { bb_error_msg_and_die @@ -225,7 +241,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv) if (!ntok[0]) { s = BOL; } else { - s = xatoi_u(ntok); + s = xatoi_positive(ntok); /* account for the fact that arrays are zero based, while * the user expects the first char on the line to be char #1 */ if (s != 0) @@ -238,7 +254,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv) } else if (!ltok[0]) { e = EOL; } else { - e = xatoi_u(ltok); + e = xatoi_positive(ltok); /* if the user specified and end position of 0, * that means "til the end of the line" */ if (e == 0) diff --git a/coreutils/date.c b/coreutils/date.c index c737f09..767e0d4 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -7,7 +7,7 @@ * iso-format handling added by Robert Griebl * bugfixes and cleanup by Bernhard Reutner-Fischer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* This 'date' command supports only 2 time setting formats, @@ -19,38 +19,7 @@ /* Input parsing code is always bulky - used heavy duty libc stuff as much as possible, missed out a lot of bounds checking */ -/* Default input handling to save surprising some people */ - -/* GNU coreutils 6.9 man page: - * date [OPTION]... [+FORMAT] - * date [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]] - * -d, --date=STRING - * display time described by STRING, not `now' - * -f, --file=DATEFILE - * like --date once for each line of DATEFILE - * -r, --reference=FILE - * display the last modification time of FILE - * -R, --rfc-2822 - * output date and time in RFC 2822 format. - * Example: Mon, 07 Aug 2006 12:34:56 -0600 - * --rfc-3339=TIMESPEC - * output date and time in RFC 3339 format. - * TIMESPEC='date', 'seconds', or 'ns' - * Date and time components are separated by a single space: - * 2006-08-07 12:34:56-06:00 - * -s, --set=STRING - * set time described by STRING - * -u, --utc, --universal - * print or set Coordinated Universal Time - * - * Busybox: - * long options are not supported - * -f is not supported - * -I seems to roughly match --rfc-3339, but -I has _optional_ param - * (thus "-I seconds" doesn't work, only "-Iseconds"), - * and does not support -Ins - * -D FMT is a bbox extension for _input_ conversion of -d DATE - */ +//applet:IF_DATE(APPLET(date, BB_DIR_BIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_DATE) += date.o @@ -69,10 +38,12 @@ //config: Enable option (-I) to output an ISO-8601 compliant //config: date/time string. //config: +//config:# defaults to "no": stat's nanosecond field is a bit non-portable //config:config FEATURE_DATE_NANO //config: bool "Support %[num]N nanosecond format specifier" //config: default n -//config: depends on DATE +//config: depends on DATE # syscall(__NR_clock_gettime) +//config: select PLATFORM_LINUX //config: help //config: Support %[num]N format specifier. Adds ~250 bytes of code. //config: @@ -92,6 +63,80 @@ //config: the same format. With it on, 'date DATE' additionally supports //config: MMDDhhmm[[YY]YY][.ss] format. +/* GNU coreutils 6.9 man page: + * date [OPTION]... [+FORMAT] + * date [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]] + * -d, --date=STRING + * display time described by STRING, not `now' + * -f, --file=DATEFILE + * like --date once for each line of DATEFILE + * -r, --reference=FILE + * display the last modification time of FILE + * -R, --rfc-2822 + * output date and time in RFC 2822 format. + * Example: Mon, 07 Aug 2006 12:34:56 -0600 + * --rfc-3339=TIMESPEC + * output date and time in RFC 3339 format. + * TIMESPEC='date', 'seconds', or 'ns' + * Date and time components are separated by a single space: + * 2006-08-07 12:34:56-06:00 + * -s, --set=STRING + * set time described by STRING + * -u, --utc, --universal + * print or set Coordinated Universal Time + * + * Busybox: + * long options are not supported + * -f is not supported + * -I seems to roughly match --rfc-3339, but -I has _optional_ param + * (thus "-I seconds" doesn't work, only "-Iseconds"), + * and does not support -Ins + * -D FMT is a bbox extension for _input_ conversion of -d DATE + */ + +//usage:#define date_trivial_usage +//usage: "[OPTIONS] [+FMT] [TIME]" +//usage:#define date_full_usage "\n\n" +//usage: "Display time (using +FMT), or set time\n" +//usage: IF_NOT_LONG_OPTS( +//usage: "\n [-s] TIME Set time to TIME" +//usage: "\n -u Work in UTC (don't convert to local time)" +//usage: "\n -R Output RFC-2822 compliant date string" +//usage: ) IF_LONG_OPTS( +//usage: "\n [-s,--set] TIME Set time to TIME" +//usage: "\n -u,--utc Work in UTC (don't convert to local time)" +//usage: "\n -R,--rfc-2822 Output RFC-2822 compliant date string" +//usage: ) +//usage: IF_FEATURE_DATE_ISOFMT( +//usage: "\n -I[SPEC] Output ISO-8601 compliant date string" +//usage: "\n SPEC='date' (default) for date only," +//usage: "\n 'hours', 'minutes', or 'seconds' for date and" +//usage: "\n time to the indicated precision" +//usage: ) +//usage: IF_NOT_LONG_OPTS( +//usage: "\n -r FILE Display last modification time of FILE" +//usage: "\n -d TIME Display TIME, not 'now'" +//usage: ) IF_LONG_OPTS( +//usage: "\n -r,--reference FILE Display last modification time of FILE" +//usage: "\n -d,--date TIME Display TIME, not 'now'" +//usage: ) +//usage: IF_FEATURE_DATE_ISOFMT( +//usage: "\n -D FMT Use FMT for -d TIME conversion" +//usage: ) +//usage: "\n" +//usage: "\nRecognized TIME formats:" +//usage: "\n hh:mm[:ss]" +//usage: "\n [YYYY.]MM.DD-hh:mm[:ss]" +//usage: "\n YYYY-MM-DD hh:mm[:ss]" +//usage: "\n [[[[[YY]YY]MM]DD]hh]mm[.ss]" +//usage: IF_FEATURE_DATE_COMPAT( +//usage: "\n 'date TIME' form accepts MMDDhhmm[[YY]YY][.ss] instead" +//usage: ) +//usage: +//usage:#define date_example_usage +//usage: "$ date\n" +//usage: "Wed Apr 12 18:52:41 MDT 2000\n" + #include "libbb.h" #if ENABLE_FEATURE_DATE_NANO # include @@ -208,6 +253,10 @@ int date_main(int argc UNUSED_PARAM, char **argv) ts.tv_sec = statbuf.st_mtime; #if ENABLE_FEATURE_DATE_NANO ts.tv_nsec = statbuf.st_mtim.tv_nsec; + /* Some toolchains use .st_mtimensec instead of st_mtim.tv_nsec. + * If you need #define _SVID_SOURCE 1 to enable st_mtim.tv_nsec, + * drop a mail to project mailing list please + */ #endif } else { #if ENABLE_FEATURE_DATE_NANO @@ -236,7 +285,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) } /* Correct any day of week and day of year etc. fields */ - tm_time.tm_isdst = -1; /* Be sure to recheck dst */ + /* Be sure to recheck dst (but not if date is time_t format) */ + if (date_str[0] != '@') + tm_time.tm_isdst = -1; ts.tv_sec = validate_tm_time(date_str, &tm_time); maybe_set_utc(opt); @@ -300,7 +351,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) scale = 1; pres = 9; if (n) { - pres = xatoi_u(p); + pres = xatoi_positive(p); if (pres == 0) pres = 9; m = 9 - pres; diff --git a/coreutils/dd.c b/coreutils/dd.c index 7c1a0c0..2838f63 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -5,9 +5,41 @@ * * Copyright (C) 2000,2001 Matt Kraai * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define dd_trivial_usage +//usage: "[if=FILE] [of=FILE] " IF_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" +//usage: " [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]") +//usage:#define dd_full_usage "\n\n" +//usage: "Copy a file with converting and formatting\n" +//usage: "\n if=FILE Read from FILE instead of stdin" +//usage: "\n of=FILE Write to FILE instead of stdout" +//usage: "\n bs=N Read and write N bytes at a time" +//usage: IF_FEATURE_DD_IBS_OBS( +//usage: "\n ibs=N Read N bytes at a time" +//usage: ) +//usage: IF_FEATURE_DD_IBS_OBS( +//usage: "\n obs=N Write N bytes at a time" +//usage: ) +//usage: "\n count=N Copy only N input blocks" +//usage: "\n skip=N Skip N input blocks" +//usage: "\n seek=N Skip N output blocks" +//usage: IF_FEATURE_DD_IBS_OBS( +//usage: "\n conv=notrunc Don't truncate output file" +//usage: "\n conv=noerror Continue after read errors" +//usage: "\n conv=sync Pad blocks with zeros" +//usage: "\n conv=fsync Physically write data out before finishing" +//usage: "\n conv=swab Swap every pair of bytes" +//usage: ) +//usage: "\n" +//usage: "\nN may be suffixed by c (1), w (2), b (512), kD (1000), k (1024), MD, M, GD, G" +//usage: +//usage:#define dd_example_usage +//usage: "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n" +//usage: "4+0 records in\n" +//usage: "4+0 records out\n" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ @@ -24,7 +56,7 @@ static const struct suffix_mult dd_suffixes[] = { { "b", 512 }, { "kD", 1000 }, { "k", 1024 }, - { "K", 1024 }, /* compat with coreutils dd */ + { "K", 1024 }, /* compat with coreutils dd */ { "MD", 1000000 }, { "M", 1048576 }, { "GD", 1000000000 }, @@ -119,13 +151,14 @@ int dd_main(int argc UNUSED_PARAM, char **argv) enum { /* Must be in the same order as OP_conv_XXX! */ /* (see "flags |= (1 << what)" below) */ - FLAG_NOTRUNC = 1 << 0, - FLAG_SYNC = 1 << 1, - FLAG_NOERROR = 1 << 2, - FLAG_FSYNC = 1 << 3, + FLAG_NOTRUNC = (1 << 0) * ENABLE_FEATURE_DD_IBS_OBS, + FLAG_SYNC = (1 << 1) * ENABLE_FEATURE_DD_IBS_OBS, + FLAG_NOERROR = (1 << 2) * ENABLE_FEATURE_DD_IBS_OBS, + FLAG_FSYNC = (1 << 3) * ENABLE_FEATURE_DD_IBS_OBS, + FLAG_SWAB = (1 << 4) * ENABLE_FEATURE_DD_IBS_OBS, /* end of conv flags */ - FLAG_TWOBUFS = 1 << 4, - FLAG_COUNT = 1 << 5, + FLAG_TWOBUFS = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS, + FLAG_COUNT = 1 << 6, }; static const char keywords[] ALIGN1 = "bs\0""count\0""seek\0""skip\0""if\0""of\0" @@ -135,7 +168,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) ; #if ENABLE_FEATURE_DD_IBS_OBS static const char conv_words[] ALIGN1 = - "notrunc\0""sync\0""noerror\0""fsync\0"; + "notrunc\0""sync\0""noerror\0""fsync\0""swab\0"; #endif enum { OP_bs = 0, @@ -153,11 +186,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv) OP_conv_sync, OP_conv_noerror, OP_conv_fsync, + OP_conv_swab, /* Unimplemented conv=XXX: */ //nocreat do not create the output file //excl fail if the output file already exists //fdatasync physically write output file data before finishing - //swab swap every pair of input bytes //lcase change upper case to lower case //ucase change lower case to upper case //block pad newline-terminated records with spaces to cbs-size @@ -165,22 +198,33 @@ int dd_main(int argc UNUSED_PARAM, char **argv) //ascii from EBCDIC to ASCII //ebcdic from ASCII to EBCDIC //ibm from ASCII to alternate EBCDIC + /* Partially implemented: */ + //swab swap every pair of input bytes: will abort on non-even reads #endif }; - int exitcode = EXIT_FAILURE; - size_t ibs = 512, obs = 512; - ssize_t n, w; - char *ibuf, *obuf; - /* And these are all zeroed at once! */ + smallint exitcode = EXIT_FAILURE; + int i; + size_t ibs = 512; + char *ibuf; +#if ENABLE_FEATURE_DD_IBS_OBS + size_t obs = 512; + char *obuf; +#else +# define obs ibs +# define obuf ibuf +#endif + /* These are all zeroed at once! */ struct { int flags; size_t oc; + ssize_t prev_read_size; /* for detecting swab failure */ off_t count; off_t seek, skip; const char *infile, *outfile; } Z; #define flags (Z.flags ) #define oc (Z.oc ) +#define prev_read_size (Z.prev_read_size) #define count (Z.count ) #define seek (Z.seek ) #define skip (Z.skip ) @@ -191,10 +235,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv) INIT_G(); //fflush_all(); - is this needed because of NOEXEC? - for (n = 1; argv[n]; n++) { + for (i = 1; argv[i]; i++) { int what; char *val; - char *arg = argv[n]; + char *arg = argv[i]; #if ENABLE_DESKTOP /* "dd --". NB: coreutils 6.9 will complain if they see @@ -223,6 +267,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) } if (what == OP_conv) { while (1) { + int n; /* find ',', replace them with NUL so we can use val for * index_in_strings() without copying. * We rely on val being non-null, else strchr would fault. @@ -230,20 +275,21 @@ int dd_main(int argc UNUSED_PARAM, char **argv) arg = strchr(val, ','); if (arg) *arg = '\0'; - what = index_in_strings(conv_words, val); - if (what < 0) + n = index_in_strings(conv_words, val); + if (n < 0) bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv"); - flags |= (1 << what); + flags |= (1 << n); if (!arg) /* no ',' left, so this was the last specifier */ break; /* *arg = ','; - to preserve ps listing? */ val = arg + 1; /* skip this keyword and ',' */ } - continue; /* we trashed 'what', can't fall through */ + /*continue;*/ } #endif if (what == OP_bs) { - ibs = obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes); + ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes); + obs = ibs; /*continue;*/ } /* These can be large: */ @@ -268,14 +314,17 @@ int dd_main(int argc UNUSED_PARAM, char **argv) outfile = val; /*continue;*/ } - } /* end of "for (argv[n])" */ + } /* end of "for (argv[i])" */ //XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever - ibuf = obuf = xmalloc(ibs); + ibuf = xmalloc(ibs); + obuf = ibuf; +#if ENABLE_FEATURE_DD_IBS_OBS if (ibs != obs) { flags |= FLAG_TWOBUFS; obuf = xmalloc(obs); } +#endif #if ENABLE_FEATURE_DD_SIGNAL_HANDLING signal_SA_RESTART_empty_mask(SIGUSR1, dd_output_status); @@ -284,12 +333,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv) G.begin_time_us = monotonic_us(); #endif - if (infile != NULL) + if (infile) { xmove_fd(xopen(infile, O_RDONLY), ifd); - else { + } else { infile = bb_msg_standard_input; } - if (outfile != NULL) { + if (outfile) { int oflag = O_WRONLY | O_CREAT; if (!seek && !(flags & FLAG_NOTRUNC)) @@ -314,13 +363,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv) } if (skip) { if (lseek(ifd, skip * ibs, SEEK_CUR) < 0) { - while (skip-- > 0) { - n = safe_read(ifd, ibuf, ibs); + do { + ssize_t n = safe_read(ifd, ibuf, ibs); if (n < 0) goto die_infile; if (n == 0) break; - } + } while (--skip != 0); } } if (seek) { @@ -329,6 +378,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv) } while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) { + ssize_t n; + n = safe_read(ifd, ibuf, ibs); if (n == 0) break; @@ -343,6 +394,27 @@ int dd_main(int argc UNUSED_PARAM, char **argv) * conv=noerror just ignores input bad blocks */ n = 0; } + if (flags & FLAG_SWAB) { + uint16_t *p16; + ssize_t n2; + + /* Our code allows only last read to be odd-sized */ + if (prev_read_size & 1) + bb_error_msg_and_die("can't swab %lu byte buffer", + (unsigned long)prev_read_size); + prev_read_size = n; + + /* If n is odd, last byte is not swapped: + * echo -n "qwe" | dd conv=swab + * prints "wqe". + */ + p16 = (void*) ibuf; + n2 = (n >> 1); + while (--n2 >= 0) { + *p16 = bswap_16(*p16); + p16++; + } + } if ((size_t)n == ibs) G.in_full++; else { @@ -369,8 +441,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv) oc = 0; } } - } else if (write_and_stats(ibuf, n, obs, outfile)) - goto out_status; + } else { + if (write_and_stats(ibuf, n, obs, outfile)) + goto out_status; + } if (flags & FLAG_FSYNC) { if (fsync(ofd) < 0) @@ -379,9 +453,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv) } if (ENABLE_FEATURE_DD_IBS_OBS && oc) { - w = full_write_or_warn(obuf, oc, outfile); - if (w < 0) goto out_status; - if (w > 0) G.out_part++; + if (write_and_stats(obuf, oc, obs, outfile)) + goto out_status; } if (close(ifd) < 0) { die_infile: @@ -397,5 +470,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv) out_status: dd_output_status(0); + if (ENABLE_FEATURE_CLEAN_UP) { + free(obuf); + if (flags & FLAG_TWOBUFS) + free(ibuf); + } + return exitcode; } diff --git a/coreutils/df.c b/coreutils/df.c index 5eeb5b4..5e9a867 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -5,7 +5,7 @@ * Copyright (C) 1999-2004 by Erik Andersen * based on original code by (I think) Bruce Perens . * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */ @@ -22,6 +22,40 @@ * Implement -P and -B; better coreutils compat; cleanup */ +//usage:#define df_trivial_usage +//usage: "[-Pk" +//usage: IF_FEATURE_HUMAN_READABLE("mh") +//usage: IF_FEATURE_DF_FANCY("ai] [-B SIZE") +//usage: "] [FILESYSTEM]..." +//usage:#define df_full_usage "\n\n" +//usage: "Print filesystem usage statistics\n" +//usage: "\n -P POSIX output format" +//usage: "\n -k 1024-byte blocks (default)" +//usage: IF_FEATURE_HUMAN_READABLE( +//usage: "\n -m 1M-byte blocks" +//usage: "\n -h Human readable (e.g. 1K 243M 2G)" +//usage: ) +//usage: IF_FEATURE_DF_FANCY( +//usage: "\n -a Show all filesystems" +//usage: "\n -i Inodes" +//usage: "\n -B SIZE Blocksize" +//usage: ) +//usage: +//usage:#define df_example_usage +//usage: "$ df\n" +//usage: "Filesystem 1K-blocks Used Available Use% Mounted on\n" +//usage: "/dev/sda3 8690864 8553540 137324 98% /\n" +//usage: "/dev/sda1 64216 36364 27852 57% /boot\n" +//usage: "$ df /dev/sda3\n" +//usage: "Filesystem 1K-blocks Used Available Use% Mounted on\n" +//usage: "/dev/sda3 8690864 8553540 137324 98% /\n" +//usage: "$ POSIXLY_CORRECT=sure df /dev/sda3\n" +//usage: "Filesystem 512B-blocks Used Available Use% Mounted on\n" +//usage: "/dev/sda3 17381728 17107080 274648 98% /\n" +//usage: "$ POSIXLY_CORRECT=yep df -P /dev/sda3\n" +//usage: "Filesystem 512-blocks Used Available Capacity Mounted on\n" +//usage: "/dev/sda3 17381728 17107080 274648 98% /\n" + #include #include #include "libbb.h" @@ -76,9 +110,9 @@ int df_main(int argc UNUSED_PARAM, char **argv) df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */ /* From the manpage of df from coreutils-6.10: - Disk space is shown in 1K blocks by default, unless the environment - variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used. - */ + * Disk space is shown in 1K blocks by default, unless the environment + * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used. + */ if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ df_disp_hr = 512; @@ -160,7 +194,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) } /* GNU coreutils 6.10 skips certain mounts, try to be compatible. */ - if (strcmp(device, "rootfs") == 0) + if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0) continue; #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY @@ -178,7 +212,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) { uni_stat_t uni_stat; char *uni_dev = unicode_conv_to_printable(&uni_stat, device); - if (uni_stat.unicode_width > 20) { + if (uni_stat.unicode_width > 20 && !(opt & OPT_POSIX)) { printf("%s\n%20s", uni_dev, ""); } else { printf("%s%*s", uni_dev, 20 - (int)uni_stat.unicode_width, ""); @@ -186,8 +220,8 @@ int df_main(int argc UNUSED_PARAM, char **argv) free(uni_dev); } #else - if (printf("\n%-20s" + 1, device) > 20) - printf("\n%-20s", ""); + if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX)) + printf("\n%-20s", ""); #endif #if ENABLE_FEATURE_HUMAN_READABLE diff --git a/coreutils/dirname.c b/coreutils/dirname.c index 94c22a7..101067c 100644 --- a/coreutils/dirname.c +++ b/coreutils/dirname.c @@ -4,12 +4,23 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */ +//usage:#define dirname_trivial_usage +//usage: "FILENAME" +//usage:#define dirname_full_usage "\n\n" +//usage: "Strip non-directory suffix from FILENAME" +//usage: +//usage:#define dirname_example_usage +//usage: "$ dirname /tmp/foo\n" +//usage: "/tmp\n" +//usage: "$ dirname /tmp/foo/\n" +//usage: "/tmp\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index e06ecc4..07398bd 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c @@ -9,11 +9,29 @@ * * dos2unix filters reading input from stdin and writing output to stdout. * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define dos2unix_trivial_usage +//usage: "[-ud] [FILE]" +//usage:#define dos2unix_full_usage "\n\n" +//usage: "Convert FILE in-place from DOS to Unix format.\n" +//usage: "When no file is given, use stdin/stdout.\n" +//usage: "\n -u dos2unix" +//usage: "\n -d unix2dos" +//usage: +//usage:#define unix2dos_trivial_usage +//usage: "[-ud] [FILE]" +//usage:#define unix2dos_full_usage "\n\n" +//usage: "Convert FILE in-place from Unix to DOS format.\n" +//usage: "When no file is given, use stdin/stdout.\n" +//usage: "\n -u dos2unix" +//usage: "\n -d unix2dos" + #include "libbb.h" +/* This is a NOEXEC applet. Be very careful! */ + enum { CT_UNIX2DOS = 1, CT_DOS2UNIX @@ -39,12 +57,10 @@ static void convert(char *fn, int conv_type) fstat(fileno(in), &st); temp_fn = xasprintf("%sXXXXXX", resolved_fn); - i = mkstemp(temp_fn); - if (i == -1 - || fchmod(i, st.st_mode) == -1 - ) { + i = xmkstemp(temp_fn); + if (fchmod(i, st.st_mode) == -1) bb_simple_perror_msg_and_die(temp_fn); - } + out = xfdopen_for_write(i); } diff --git a/coreutils/du.c b/coreutils/du.c index 5894ed4..9c6ff88 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -6,7 +6,7 @@ * Copyright (C) 1999,2000,2001 by John Beppu * Copyright (C) 2002 Edward Betts * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant (unless default blocksize set to 1k) */ @@ -23,6 +23,40 @@ * 4) Fixed busybox bug #1284 involving long overflow with human_readable. */ +//usage:#define du_trivial_usage +//usage: "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..." +//usage:#define du_full_usage "\n\n" +//usage: "Summarize disk space used for each FILE and/or directory\n" +//usage: "\n -a Show file sizes too" +//usage: "\n -L Follow all symlinks" +//usage: "\n -H Follow symlinks on command line" +//usage: "\n -d N Limit output to directories (and files with -a) of depth < N" +//usage: "\n -c Show grand total" +//usage: "\n -l Count sizes many times if hard linked" +//usage: "\n -s Display only a total for each argument" +//usage: "\n -x Skip directories on different filesystems" +//usage: IF_FEATURE_HUMAN_READABLE( +//usage: "\n -h Sizes in human readable format (e.g., 1K 243M 2G)" +//usage: "\n -m Sizes in megabytes" +//usage: ) +//usage: "\n -k Sizes in kilobytes" IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") +//usage: IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K( +//usage: "\n Default unit is 512 bytes" +//usage: ) +//usage: +//usage:#define du_example_usage +//usage: "$ du\n" +//usage: "16 ./CVS\n" +//usage: "12 ./kernel-patches/CVS\n" +//usage: "80 ./kernel-patches\n" +//usage: "12 ./tests/CVS\n" +//usage: "36 ./tests\n" +//usage: "12 ./scripts/CVS\n" +//usage: "16 ./scripts\n" +//usage: "12 ./docs/CVS\n" +//usage: "104 ./docs\n" +//usage: "2417 .\n" + #include "libbb.h" enum { @@ -52,9 +86,14 @@ struct globals { dev_t dir_dev; } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) +#define INIT_G() do { } while (0) -static void print(unsigned long size, const char *filename) +/* FIXME? coreutils' du rounds sizes up: + * for example, 1025k file is shown as "2" by du -m. + * We round to nearest. + */ +static void print(unsigned long long size, const char *filename) { /* TODO - May not want to defer error checking here. */ #if ENABLE_FEATURE_HUMAN_READABLE @@ -68,15 +107,15 @@ static void print(unsigned long size, const char *filename) size++; size >>= 1; } - printf("%lu\t%s\n", size, filename); + printf("%llu\t%s\n", size, filename); #endif } /* tiny recursive du */ -static unsigned long du(const char *filename) +static unsigned long long du(const char *filename) { struct stat statbuf; - unsigned long sum; + unsigned long long sum; if (lstat(filename, &statbuf) != 0) { bb_simple_perror_msg(filename); @@ -153,10 +192,12 @@ static unsigned long du(const char *filename) int du_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int du_main(int argc UNUSED_PARAM, char **argv) { - unsigned long total; + unsigned long long total; int slink_depth_save; unsigned opt; + INIT_G(); + #if ENABLE_FEATURE_HUMAN_READABLE IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 1024;) IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 512;) diff --git a/coreutils/echo.c b/coreutils/echo.c index 6903996..9663894 100644 --- a/coreutils/echo.c +++ b/coreutils/echo.c @@ -5,7 +5,7 @@ * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Original copyright notice is retained at the end of this file. */ @@ -23,128 +23,161 @@ * The previous version did not allow 4-digit octals. */ +//usage:#define echo_trivial_usage +//usage: IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..." +//usage:#define echo_full_usage "\n\n" +//usage: "Print the specified ARGs to stdout" +//usage: IF_FEATURE_FANCY_ECHO( "\n" +//usage: "\n -n Suppress trailing newline" +//usage: "\n -e Interpret backslash escapes (i.e., \\t=tab)" +//usage: "\n -E Don't interpret backslash escapes (default)" +//usage: ) +//usage: +//usage:#define echo_example_usage +//usage: "$ echo \"Erik is cool\"\n" +//usage: "Erik is cool\n" +//usage: IF_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" +//usage: "Erik\n" +//usage: "is\n" +//usage: "cool\n" +//usage: "$ echo \"Erik\\nis\\ncool\"\n" +//usage: "Erik\\nis\\ncool\n") + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ /* NB: can be used by shell even if not enabled as applet */ +/* + * NB2: we don't use stdio, we need better error handing. + * Examples include writing into non-opened stdout and error on write. + * + * With stdio, output gets shoveled into stdout buffer, and even + * fflush cannot clear it out. It seems that even if libc receives + * EBADF on write attempts, it feels determined to output data no matter what. + * If echo is called by shell, it will try writing again later, and possibly + * will clobber future output. Not good. + * + * Solaris has fpurge which discards buffered input. glibc has __fpurge. + * But this function is not standard. + */ + int echo_main(int argc UNUSED_PARAM, char **argv) { + char **pp; const char *arg; + char *out; + char *buffer; + unsigned buflen; #if !ENABLE_FEATURE_FANCY_ECHO enum { eflag = '\\', nflag = 1, /* 1 -- print '\n' */ }; - /* We must check that stdout is not closed. - * The reason for this is highly non-obvious. - * echo_main is used from shell. Shell must correctly handle "echo foo" - * if stdout is closed. With stdio, output gets shoveled into - * stdout buffer, and even fflush cannot clear it out. It seems that - * even if libc receives EBADF on write attempts, it feels determined - * to output data no matter what. So it will try later, - * and possibly will clobber future output. Not good. */ -// TODO: check fcntl() & O_ACCMODE == O_WRONLY or O_RDWR? - if (fcntl(1, F_GETFL) == -1) - return 1; /* match coreutils 6.10 (sans error msg to stderr) */ - //if (dup2(1, 1) != 1) - old way - // return 1; - - arg = *++argv; - if (!arg) - goto newline_ret; + argv++; #else - const char *p; char nflag = 1; char eflag = 0; - /* We must check that stdout is not closed. */ - if (fcntl(1, F_GETFL) == -1) - return 1; + while ((arg = *++argv) != NULL) { + char n, e; - while (1) { - arg = *++argv; - if (!arg) - goto newline_ret; - if (*arg != '-') - break; + if (arg[0] != '-') + break; /* not an option arg, echo it */ /* If it appears that we are handling options, then make sure * that all of the options specified are actually valid. * Otherwise, the string should just be echoed. */ - p = arg + 1; - if (!*p) /* A single '-', so echo it. */ - goto just_echo; - + arg++; + n = nflag; + e = eflag; do { - if (!strrchr("neE", *p)) + if (*arg == 'n') + n = 0; + else if (*arg == 'e') + e = '\\'; + else if (*arg != 'E') { + /* "-ccc" arg with one of c's invalid, echo it */ + /* arg consisting from just "-" also handled here */ goto just_echo; - } while (*++p); - - /* All of the options in this arg are valid, so handle them. */ - p = arg + 1; - do { - if (*p == 'n') - nflag = 0; - if (*p == 'e') - eflag = '\\'; - } while (*++p); + } + } while (*++arg); + nflag = n; + eflag = e; } just_echo: #endif - while (1) { - /* arg is already == *argv and isn't NULL */ + + buflen = 0; + pp = argv; + while ((arg = *pp) != NULL) { + buflen += strlen(arg) + 1; + pp++; + } + out = buffer = xmalloc(buflen + 1); /* +1 is needed for "no args" case */ + + while ((arg = *argv) != NULL) { int c; if (!eflag) { /* optimization for very common case */ - fputs(arg, stdout); - } else while ((c = *arg++)) { - if (c == eflag) { /* Check for escape seq. */ + out = stpcpy(out, arg); + } else + while ((c = *arg++) != '\0') { + if (c == eflag) { + /* This is an "\x" sequence */ + if (*arg == 'c') { - /* '\c' means cancel newline and + /* "\c" means cancel newline and * ignore all subsequent chars. */ - goto ret; + goto do_write; } -#if !ENABLE_FEATURE_FANCY_ECHO - /* SUSv3 specifies that octal escapes must begin with '0'. */ - if ( ((int)(unsigned char)(*arg) - '0') >= 8) /* '8' or bigger */ -#endif - { - /* Since SUSv3 mandates a first digit of 0, 4-digit octals - * of the form \0### are accepted. */ - if (*arg == '0') { - /* NB: don't turn "...\0" into "...\" */ - if (arg[1] && ((unsigned char)(arg[1]) - '0') < 8) { - arg++; - } + /* Since SUSv3 mandates a first digit of 0, 4-digit octals + * of the form \0### are accepted. */ + if (*arg == '0') { + if ((unsigned char)(arg[1] - '0') < 8) { + /* 2nd char is 0..7: skip leading '0' */ + arg++; } - /* bb_process_escape_sequence handles NUL correctly - * ("...\" case). */ - c = bb_process_escape_sequence(&arg); + } + /* bb_process_escape_sequence handles NUL correctly + * ("...\" case). */ + { + /* optimization: don't force arg to be on-stack, + * use another variable for that. ~30 bytes win */ + const char *z = arg; + c = bb_process_escape_sequence(&z); + arg = z; } } - bb_putchar(c); + *out++ = c; } - arg = *++argv; - if (!arg) + if (!*++argv) break; - bb_putchar(' '); + *out++ = ' '; } - newline_ret: if (nflag) { - bb_putchar('\n'); + *out++ = '\n'; } - ret: - return fflush_all(); + + do_write: + /* Careful to error out on partial writes too (think ENOSPC!) */ + errno = 0; + /*r =*/ full_write(STDOUT_FILENO, buffer, out - buffer); + free(buffer); + if (/*WRONG:r < 0*/ errno) { + bb_perror_msg(bb_msg_write_error); + return 1; + } + return 0; } -/*- +/* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -230,7 +263,7 @@ int echo_main(int argc, char **argv) goto just_echo; do { - if (!strrchr("neE", *p)) + if (!strchr("neE", *p)) goto just_echo; } while (*++p); @@ -256,27 +289,23 @@ int echo_main(int argc, char **argv) /* optimization for very common case */ p += strlen(arg); } else while ((c = *arg++)) { - if (c == eflag) { /* Check for escape seq. */ + if (c == eflag) { + /* This is an "\x" sequence */ + if (*arg == 'c') { - /* '\c' means cancel newline and + /* "\c" means cancel newline and * ignore all subsequent chars. */ cur_io->iov_len = p - (char*)cur_io->iov_base; cur_io++; goto ret; } -#if !ENABLE_FEATURE_FANCY_ECHO - /* SUSv3 specifies that octal escapes must begin with '0'. */ - if ( (((unsigned char)*arg) - '1') >= 7) -#endif - { - /* Since SUSv3 mandates a first digit of 0, 4-digit octals - * of the form \0### are accepted. */ - if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) { - arg++; - } - /* bb_process_escape_sequence can handle nul correctly */ - c = bb_process_escape_sequence( (void*) &arg); + /* Since SUSv3 mandates a first digit of 0, 4-digit octals + * of the form \0### are accepted. */ + if (*arg == '0' && (unsigned char)(arg[1] - '0') < 8) { + arg++; } + /* bb_process_escape_sequence can handle nul correctly */ + c = bb_process_escape_sequence( (void*) &arg); } *p++ = c; } diff --git a/coreutils/env.c b/coreutils/env.c index d4eab19..807ef13 100644 --- a/coreutils/env.c +++ b/coreutils/env.c @@ -3,9 +3,9 @@ * env implementation for busybox * * Copyright (c) 1988, 1993, 1994 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Original copyright notice is retained at the end of this file. * @@ -31,6 +31,14 @@ /* This is a NOEXEC applet. Be very careful! */ +//usage:#define env_trivial_usage +//usage: "[-iu] [-] [name=value]... [PROG ARGS]" +//usage:#define env_full_usage "\n\n" +//usage: "Print the current environment or run PROG after setting up\n" +//usage: "the specified environment\n" +//usage: "\n -, -i Start with an empty environment" +//usage: "\n -u Remove variable from the environment" + #include "libbb.h" #if ENABLE_FEATURE_ENV_LONG_OPTIONS @@ -103,8 +111,8 @@ int env_main(int argc UNUSED_PARAM, char **argv) * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. + * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change + * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change * * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/coreutils/expand.c b/coreutils/expand.c index b874b6a..8d376ff 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c @@ -3,7 +3,7 @@ * * Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * David MacKenzie * @@ -20,6 +20,35 @@ * * Caveat: this versions of expand and unexpand don't accept tab lists. */ + +//usage:#define expand_trivial_usage +//usage: "[-i] [-t N] [FILE]..." +//usage:#define expand_full_usage "\n\n" +//usage: "Convert tabs to spaces, writing to stdout\n" +//usage: IF_FEATURE_EXPAND_LONG_OPTIONS( +//usage: "\n -i,--initial Don't convert tabs after non blanks" +//usage: "\n -t,--tabs=N Tabstops every N chars" +//usage: ) +//usage: IF_NOT_FEATURE_EXPAND_LONG_OPTIONS( +//usage: "\n -i Don't convert tabs after non blanks" +//usage: "\n -t Tabstops every N chars" +//usage: ) + +//usage:#define unexpand_trivial_usage +//usage: "[-fa][-t N] [FILE]..." +//usage:#define unexpand_full_usage "\n\n" +//usage: "Convert spaces to tabs, writing to stdout\n" +//usage: IF_FEATURE_UNEXPAND_LONG_OPTIONS( +//usage: "\n -a,--all Convert all blanks" +//usage: "\n -f,--first-only Convert only leading blanks" +//usage: "\n -t,--tabs=N Tabstops every N chars" +//usage: ) +//usage: IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS( +//usage: "\n -a Convert all blanks" +//usage: "\n -f Convert only leading blanks" +//usage: "\n -t N Tabstops every N chars" +//usage: ) + #include "libbb.h" #include "unicode.h" @@ -49,11 +78,7 @@ static void expand(FILE *file, unsigned tab_size, unsigned opt) unsigned len; *ptr = '\0'; # if ENABLE_UNICODE_SUPPORT - { - uni_stat_t uni_stat; - printable_string(&uni_stat, ptr_strbeg); - len = uni_stat.unicode_width; - } + len = unicode_strwidth(ptr_strbeg); # else len = ptr - ptr_strbeg; # endif @@ -109,12 +134,9 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt) printf("%*s%.*s", len, "", n, ptr); # if ENABLE_UNICODE_SUPPORT { - char c; - uni_stat_t uni_stat; - c = ptr[n]; + char c = ptr[n]; ptr[n] = '\0'; - printable_string(&uni_stat, ptr); - len = uni_stat.unicode_width; + len = unicode_strwidth(ptr); ptr[n] = c; } # else diff --git a/coreutils/expr.c b/coreutils/expr.c index f40edad..c986f93 100644 --- a/coreutils/expr.c +++ b/coreutils/expr.c @@ -11,7 +11,7 @@ * - reduced 464 bytes. * - 64 math support * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* This program evaluates expressions. Each token (operator, operand, @@ -25,6 +25,41 @@ /* no getopt needed */ +//usage:#define expr_trivial_usage +//usage: "EXPRESSION" +//usage:#define expr_full_usage "\n\n" +//usage: "Print the value of EXPRESSION to stdout\n" +//usage: "\n" +//usage: "EXPRESSION may be:\n" +//usage: " ARG1 | ARG2 ARG1 if it is neither null nor 0, otherwise ARG2\n" +//usage: " ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" +//usage: " ARG1 < ARG2 1 if ARG1 is less than ARG2, else 0. Similarly:\n" +//usage: " ARG1 <= ARG2\n" +//usage: " ARG1 = ARG2\n" +//usage: " ARG1 != ARG2\n" +//usage: " ARG1 >= ARG2\n" +//usage: " ARG1 > ARG2\n" +//usage: " ARG1 + ARG2 Sum of ARG1 and ARG2. Similarly:\n" +//usage: " ARG1 - ARG2\n" +//usage: " ARG1 * ARG2\n" +//usage: " ARG1 / ARG2\n" +//usage: " ARG1 % ARG2\n" +//usage: " STRING : REGEXP Anchored pattern match of REGEXP in STRING\n" +//usage: " match STRING REGEXP Same as STRING : REGEXP\n" +//usage: " substr STRING POS LENGTH Substring of STRING, POS counted from 1\n" +//usage: " index STRING CHARS Index in STRING where any CHARS is found, or 0\n" +//usage: " length STRING Length of STRING\n" +//usage: " quote TOKEN Interpret TOKEN as a string, even if\n" +//usage: " it is a keyword like 'match' or an\n" +//usage: " operator like '/'\n" +//usage: " (EXPRESSION) Value of EXPRESSION\n" +//usage: "\n" +//usage: "Beware that many operators need to be escaped or quoted for shells.\n" +//usage: "Comparisons are arithmetic if both ARGs are numbers, else\n" +//usage: "lexicographical. Pattern matches return the string matched between\n" +//usage: "\$ and \$ or null; if \$ and \$ are not used, they return the number\n" +//usage: "of characters matched or 0." + #include "libbb.h" #include "xregex.h" @@ -65,6 +100,7 @@ struct globals { char **args; } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) +#define INIT_G() do { } while (0) /* forward declarations */ static VALUE *eval(void); @@ -341,7 +377,6 @@ static VALUE *eval6(void) freev(i2); } return v; - } /* Handle : operator (pattern matching). @@ -485,6 +520,8 @@ int expr_main(int argc UNUSED_PARAM, char **argv) { VALUE *v; + INIT_G(); + xfunc_error_retval = 2; /* coreutils compat */ G.args = argv + 1; if (*G.args == NULL) { diff --git a/coreutils/false.c b/coreutils/false.c index f448ebf..59c2f32 100644 --- a/coreutils/false.c +++ b/coreutils/false.c @@ -4,12 +4,22 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/000095399/utilities/false.html */ +//usage:#define false_trivial_usage +//usage: "" +//usage:#define false_full_usage "\n\n" +//usage: "Return an exit code of FALSE (1)" +//usage: +//usage:#define false_example_usage +//usage: "$ false\n" +//usage: "$ echo $?\n" +//usage: "1\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/fold.c b/coreutils/fold.c index cbea31f..0e73063 100644 --- a/coreutils/fold.c +++ b/coreutils/fold.c @@ -7,11 +7,22 @@ Modified for busybox based on coreutils v 5.0 Copyright (C) 2003 Glenn McGrath - Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define fold_trivial_usage +//usage: "[-bs] [-w WIDTH] [FILE]..." +//usage:#define fold_full_usage "\n\n" +//usage: "Wrap input lines in each FILE (or stdin), writing to stdout\n" +//usage: "\n -b Count bytes rather than columns" +//usage: "\n -s Break at spaces" +//usage: "\n -w Use WIDTH columns instead of 80" + #include "libbb.h" #include "unicode.h" +/* This is a NOEXEC applet. Be very careful! */ + /* Must match getopt32 call */ #define FLAG_COUNT_BYTES 1 #define FLAG_BREAK_SPACES 2 diff --git a/coreutils/fsync.c b/coreutils/fsync.c index 53900f8..652a41c 100644 --- a/coreutils/fsync.c +++ b/coreutils/fsync.c @@ -4,8 +4,15 @@ * * Copyright (C) 2008 Nokia Corporation. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define fsync_trivial_usage +//usage: "[-d] FILE..." +//usage:#define fsync_full_usage "\n\n" +//usage: "Write files' buffered blocks to disk\n" +//usage: "\n -d Avoid syncing metadata" + #include "libbb.h" #ifndef O_NOATIME # define O_NOATIME 0 @@ -27,7 +34,7 @@ int fsync_main(int argc UNUSED_PARAM, char **argv) status = EXIT_SUCCESS; do { - int fd = open3_or_warn(*argv, O_NOATIME | O_NOCTTY | O_RDONLY, 0); + int fd = open_or_warn(*argv, O_NOATIME | O_NOCTTY | O_RDONLY); if (fd == -1) { status = EXIT_FAILURE; diff --git a/coreutils/head.c b/coreutils/head.c index cc28374..9388b02 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -4,15 +4,143 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */ +//kbuild:lib-$(CONFIG_HEAD) += head.o + +//usage:#define head_trivial_usage +//usage: "[OPTIONS] [FILE]..." +//usage:#define head_full_usage "\n\n" +//usage: "Print first 10 lines of each FILE (or stdin) to stdout.\n" +//usage: "With more than one FILE, precede each with a filename header.\n" +//usage: "\n -n N[kbm] Print first N lines" +//usage: IF_FEATURE_FANCY_HEAD( +//usage: "\n -n -N[kbm] Print all except N last lines" +//usage: "\n -c [-]N[kbm] Print first N bytes" +//usage: "\n -q Never print headers" +//usage: "\n -v Always print headers" +//usage: ) +//usage: "\n" +//usage: "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)." +//usage: +//usage:#define head_example_usage +//usage: "$ head -n 2 /etc/passwd\n" +//usage: "root:x:0:0:root:/root:/bin/bash\n" +//usage: "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n" + #include "libbb.h" +/* This is a NOEXEC applet. Be very careful! */ + +#if !ENABLE_FEATURE_FANCY_HEAD +# define print_first_N(fp,count,bytes) print_first_N(fp,count) +#endif +static void +print_first_N(FILE *fp, unsigned long count, bool count_bytes) +{ +#if !ENABLE_FEATURE_FANCY_HEAD + const int count_bytes = 0; +#endif + while (count) { + int c = getc(fp); + if (c == EOF) + break; + if (count_bytes || (c == '\n')) + --count; + putchar(c); + } +} + +#if ENABLE_FEATURE_FANCY_HEAD +static void +print_except_N_last_bytes(FILE *fp, unsigned count) +{ + unsigned char *circle = xmalloc(++count); + unsigned head = 0; + for(;;) { + int c; + c = getc(fp); + if (c == EOF) + goto ret; + circle[head++] = c; + if (head == count) + break; + } + for (;;) { + int c; + if (head == count) + head = 0; + putchar(circle[head]); + c = getc(fp); + if (c == EOF) + goto ret; + circle[head] = c; + head++; + } + ret: + free(circle); +} + +static void +print_except_N_last_lines(FILE *fp, unsigned count) +{ + char **circle = xzalloc((++count) * sizeof(circle[0])); + unsigned head = 0; + for(;;) { + char *c; + c = xmalloc_fgets(fp); + if (!c) + goto ret; + circle[head++] = c; + if (head == count) + break; + } + for (;;) { + char *c; + if (head == count) + head = 0; + fputs(circle[head], stdout); + c = xmalloc_fgets(fp); + if (!c) + goto ret; + free(circle[head]); + circle[head++] = c; + } + ret: + head = 0; + for(;;) { + free(circle[head++]); + if (head == count) + break; + } + free(circle); +} +#else +/* Must never be called */ +void print_except_N_last_bytes(FILE *fp, unsigned count); +void print_except_N_last_lines(FILE *fp, unsigned count); +#endif + +#if !ENABLE_FEATURE_FANCY_HEAD +# define eat_num(negative_N,p) eat_num(p) +#endif +static unsigned long +eat_num(bool *negative_N, const char *p) +{ +#if ENABLE_FEATURE_FANCY_HEAD + if (*p == '-') { + *negative_N = 1; + p++; + } +#endif + return xatoul_sfx(p, bkm_suffixes); +} + static const char head_opts[] ALIGN1 = "n:" #if ENABLE_FEATURE_FANCY_HEAD @@ -20,29 +148,25 @@ static const char head_opts[] ALIGN1 = #endif ; -static const struct suffix_mult head_suffixes[] = { - { "b", 512 }, - { "k", 1024 }, - { "m", 1024*1024 }, - { "", 0 } -}; - #define header_fmt_str "\n==> %s <==\n" int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int head_main(int argc, char **argv) { unsigned long count = 10; - unsigned long i; #if ENABLE_FEATURE_FANCY_HEAD - int count_bytes = 0; int header_threshhold = 1; + bool count_bytes = 0; + bool negative_N = 0; +#else +# define header_threshhold 1 +# define count_bytes 0 +# define negative_N 0 #endif FILE *fp; const char *fmt; char *p; int opt; - int c; int retval = EXIT_SUCCESS; #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD @@ -52,7 +176,7 @@ int head_main(int argc, char **argv) ) { --argc; ++argv; - p = (*argv) + 1; + p = argv[0] + 1; goto GET_COUNT; } #endif @@ -76,7 +200,7 @@ int head_main(int argc, char **argv) #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD GET_COUNT: #endif - count = xatoul_sfx(p, head_suffixes); + count = eat_num(&negative_N, p); break; default: bb_show_usage(); @@ -89,19 +213,17 @@ int head_main(int argc, char **argv) *--argv = (char*)"-"; fmt = header_fmt_str + 1; -#if ENABLE_FEATURE_FANCY_HEAD if (argc <= header_threshhold) { +#if ENABLE_FEATURE_FANCY_HEAD header_threshhold = 0; - } #else - if (argc <= 1) { fmt += 11; /* "" */ - } - /* Now define some things here to avoid #ifdefs in the code below. - * These should optimize out of the if conditions below. */ -#define header_threshhold 1 -#define count_bytes 0 #endif + } + if (negative_N) { + if (count >= INT_MAX / sizeof(char*)) + bb_error_msg("count is too big: %lu", count); + } do { fp = fopen_or_warn_stdin(*argv); @@ -112,18 +234,20 @@ int head_main(int argc, char **argv) if (header_threshhold) { printf(fmt, *argv); } - i = count; - while (i && ((c = getc(fp)) != EOF)) { - if (count_bytes || (c == '\n')) { - --i; + if (negative_N) { + if (count_bytes) { + print_except_N_last_bytes(fp, count); + } else { + print_except_N_last_lines(fp, count); } - putchar(c); + } else { + print_first_N(fp, count, count_bytes); } + die_if_ferror_stdout(); if (fclose_if_not_stdin(fp)) { bb_simple_perror_msg(*argv); retval = EXIT_FAILURE; } - die_if_ferror_stdout(); } else { retval = EXIT_FAILURE; } diff --git a/coreutils/hostid.c b/coreutils/hostid.c index a537e3a..e5b1f51 100644 --- a/coreutils/hostid.c +++ b/coreutils/hostid.c @@ -4,11 +4,27 @@ * * Copyright (C) 2000 Edward Betts . * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ +//config:config HOSTID +//config: bool "hostid" +//config: default y +//config: help +//config: hostid prints the numeric identifier (in hexadecimal) for +//config: the current host. + +//applet:IF_HOSTID(APPLET_NOFORK(hostid, hostid, BB_DIR_USR_BIN, BB_SUID_DROP, hostid)) + +//kbuild:lib-$(CONFIG_HOSTID) += hostid.o + +//usage:#define hostid_trivial_usage +//usage: "" +//usage:#define hostid_full_usage "\n\n" +//usage: "Print out a unique 32-bit identifier for the machine" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ @@ -20,7 +36,8 @@ int hostid_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) bb_show_usage(); } - printf("%lx\n", gethostid()); + /* POSIX says gethostid returns a "32-bit identifier" */ + printf("%08x\n", (unsigned)(uint32_t)gethostid()); return fflush_all(); } diff --git a/coreutils/id.c b/coreutils/id.c index ec9227d..1f3e1c4 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -5,7 +5,7 @@ * Copyright (C) 2000 by Randolph Chung * Copyright (C) 2008 by Tito Ragusa * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant. */ @@ -15,15 +15,59 @@ * Added -G option Tito Ragusa (C) 2008 for SUSv3. */ +//config:config ID +//config: bool "id" +//config: default y +//config: help +//config: id displays the current user and group ID names. + +//config:config GROUPS +//config: bool "groups" +//config: default y +//config: help +//config: Print the group names associated with current user id. + +//kbuild:lib-$(CONFIG_GROUPS) += id.o +//kbuild:lib-$(CONFIG_ID) += id.o + +//applet:IF_GROUPS(APPLET_NOEXEC(groups, id, BB_DIR_USR_BIN, BB_SUID_DROP, groups)) +//applet:IF_ID( APPLET_NOEXEC(id, id, BB_DIR_USR_BIN, BB_SUID_DROP, id )) + +//usage:#define id_trivial_usage +//usage: "[OPTIONS] [USER]" +//usage:#define id_full_usage "\n\n" +//usage: "Print information about USER or the current user\n" +//usage: IF_SELINUX( +//usage: "\n -Z Security context" +//usage: ) +//usage: "\n -u User ID" +//usage: "\n -g Group ID" +//usage: "\n -G Supplementary group IDs" +//usage: "\n -n Print names instead of numbers" +//usage: "\n -r Print real ID instead of effective ID" +//usage: +//usage:#define id_example_usage +//usage: "$ id\n" +//usage: "uid=1000(andersen) gid=1000(andersen)\n" + +//usage:#define groups_trivial_usage +//usage: "[USER]" +//usage:#define groups_full_usage "\n\n" +//usage: "Print the group memberships of USER or for the current process" +//usage: +//usage:#define groups_example_usage +//usage: "$ groups\n" +//usage: "andersen lp dialout cdrom floppy\n" + #include "libbb.h" +/* This is a NOEXEC applet. Be very careful! */ + #if !ENABLE_USE_BB_PWD_GRP -#if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0) -#if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30) +#if defined(__UCLIBC__) && UCLIBC_VERSION < KERNEL_VERSION(0, 9, 30) #error "Sorry, you need at least uClibc version 0.9.30 for id applet to build" #endif #endif -#endif enum { PRINT_REAL = (1 << 0), @@ -71,7 +115,7 @@ static int print_user(uid_t id, const char *prefix) /* On error set *n < 0 and return >= 0 * If *n is too small, update it and return < 0 - * (ok to trash groups[] in both cases) + * (ok to trash groups[] in both cases) * Otherwise fill in groups[] and return >= 0 */ static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n) @@ -85,20 +129,19 @@ static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n) m = getgrouplist(username, rgid, groups, n); /* I guess *n < 0 might indicate error. Anyway, * malloc'ing -1 bytes won't be good, so: */ - //if (*n < 0) - // return 0; - //return m; - //commented out here, happens below anyway - } else { - /* On error -1 is returned, which ends up in *n */ - int nn = getgroups(*n, groups); - /* 0: nn <= *n, groups[] was big enough; -1 otherwise */ - m = - (nn > *n); - *n = nn; + if (*n < 0) + return 0; + return m; } - if (*n < 0) - return 0; /* error, don't return < 0! */ - return m; + + *n = getgroups(*n, groups); + if (*n >= 0) + return *n; + /* Error */ + if (errno == EINVAL) /* *n is too small? */ + *n = getgroups(0, groups); /* get needed *n */ + /* if *n >= 0, return -1 (got new *n), else return 0 (error): */ + return -(*n >= 0); } int id_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -116,11 +159,22 @@ int id_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_SELINUX security_context_t scontext = NULL; #endif - /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/ - /* Don't allow more than one username */ - opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG" - IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G"); - opt = getopt32(argv, "rnugG" IF_SELINUX("Z")); + + if (ENABLE_GROUPS && (!ENABLE_ID || applet_name[0] == 'g')) { + /* TODO: coreutils groups prepend "USER : " prefix, + * and accept many usernames. Example: + * # groups root root + * root : root + * root : root + */ + opt = option_mask32 = getopt32(argv, "") | JUST_ALL_GROUPS | NAME_NOT_NUMBER; + } else { + /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/ + /* Don't allow more than one username */ + opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG" + IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G"); + opt = getopt32(argv, "rnugG" IF_SELINUX("Z")); + } username = argv[optind]; if (username) { @@ -157,11 +211,11 @@ int id_main(int argc UNUSED_PARAM, char **argv) /* We are supplying largish buffer, trying * to not run get_groups() twice. That might be slow * ("user database in remote SQL server" case) */ - groups = xmalloc(64 * sizeof(gid_t)); + groups = xmalloc(64 * sizeof(groups[0])); n = 64; if (get_groups(username, rgid, groups, &n) < 0) { /* Need bigger buffer after all */ - groups = xrealloc(groups, n * sizeof(gid_t)); + groups = xrealloc(groups, n * sizeof(groups[0])); get_groups(username, rgid, groups, &n); } if (n > 0) { @@ -174,10 +228,9 @@ int id_main(int argc UNUSED_PARAM, char **argv) prefix = ","; } } else if (n < 0) { /* error in get_groups() */ - if (!ENABLE_DESKTOP) + if (ENABLE_DESKTOP) bb_error_msg_and_die("can't get groups"); - else - return EXIT_FAILURE; + return EXIT_FAILURE; } if (ENABLE_FEATURE_CLEAN_UP) free(groups); diff --git a/coreutils/install.c b/coreutils/install.c index ab9feff..445497f 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -3,9 +3,26 @@ * Copyright (C) 2003 by Glenn McGrath * SELinux support: by Yuichi Nakamura * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +/* -v, -b, -c are ignored */ +//usage:#define install_trivial_usage +//usage: "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST" +//usage:#define install_full_usage "\n\n" +//usage: "Copy files and set attributes\n" +//usage: "\n -c Just copy (default)" +//usage: "\n -d Create directories" +//usage: "\n -D Create leading target directories" +//usage: "\n -s Strip symbol table" +//usage: "\n -p Preserve date" +//usage: "\n -o USER Set ownership" +//usage: "\n -g GRP Set group ownership" +//usage: "\n -m MODE Set permissions" +//usage: IF_SELINUX( +//usage: "\n -Z Set security context" +//usage: ) + #include "libbb.h" #include "libcoreutils/coreutils.h" diff --git a/coreutils/length.c b/coreutils/length.c.disabled similarity index 57% rename from coreutils/length.c rename to coreutils/length.c.disabled index 015b221..aee898d 100644 --- a/coreutils/length.c +++ b/coreutils/length.c.disabled @@ -1,10 +1,19 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */ +//usage:#define length_trivial_usage +//usage: "STRING" +//usage:#define length_full_usage "\n\n" +//usage: "Print STRING's length" +//usage: +//usage:#define length_example_usage +//usage: "$ length Hello\n" +//usage: "5\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/libcoreutils/Kbuild.src b/coreutils/libcoreutils/Kbuild.src index 981b606..2042d5f 100644 --- a/coreutils/libcoreutils/Kbuild.src +++ b/coreutils/libcoreutils/Kbuild.src @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2004 by Erik Andersen # -# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. +# Licensed under GPLv2 or later, see file LICENSE in this source tree. lib-y:= diff --git a/coreutils/libcoreutils/coreutils.h b/coreutils/libcoreutils/coreutils.h index 99b67b1..307d033 100644 --- a/coreutils/libcoreutils/coreutils.h +++ b/coreutils/libcoreutils/coreutils.h @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #ifndef COREUTILS_H diff --git a/coreutils/ln.c b/coreutils/ln.c index f977aa1..3b822e8 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c @@ -4,23 +4,42 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */ +//usage:#define ln_trivial_usage +//usage: "[OPTIONS] TARGET... LINK|DIR" +//usage:#define ln_full_usage "\n\n" +//usage: "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n" +//usage: "\n -s Make symlinks instead of hardlinks" +//usage: "\n -f Remove existing destinations" +//usage: "\n -n Don't dereference symlinks - treat like normal file" +//usage: "\n -b Make a backup of the target (if exists) before link operation" +//usage: "\n -S suf Use suffix instead of ~ when making backup files" +//usage: "\n -T 2nd arg must be a DIR" +//usage: "\n -v Verbose" +//usage: +//usage:#define ln_example_usage +//usage: "$ ln -s BusyBox /tmp/ls\n" +//usage: "$ ls -l /tmp/ls\n" +//usage: "lrwxrwxrwx 1 root root 7 Apr 12 18:39 ls -> BusyBox*\n" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ -#define LN_SYMLINK 1 -#define LN_FORCE 2 -#define LN_NODEREFERENCE 4 -#define LN_BACKUP 8 -#define LN_SUFFIX 16 +#define LN_SYMLINK (1 << 0) +#define LN_FORCE (1 << 1) +#define LN_NODEREFERENCE (1 << 2) +#define LN_BACKUP (1 << 3) +#define LN_SUFFIX (1 << 4) +#define LN_VERBOSE (1 << 5) +#define LN_LINKFILE (1 << 6) int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ln_main(int argc, char **argv) @@ -35,13 +54,22 @@ int ln_main(int argc, char **argv) int (*link_func)(const char *, const char *); opt_complementary = "-1"; /* min one arg */ - opts = getopt32(argv, "sfnbS:", &suffix); + opts = getopt32(argv, "sfnbS:vT", &suffix); last = argv[argc - 1]; argv += optind; + argc -= optind; + + if ((opts & LN_LINKFILE) && argc > 2) { + bb_error_msg_and_die("-T accepts 2 args max"); + } - if (argc == optind + 1) { + if (!argv[1]) { + /* "ln PATH/TO/FILE" -> "ln PATH/TO/FILE FILE" */ *--argv = last; + /* xstrdup is needed: "ln -s PATH/TO/FILE/" is equivalent to + * "ln -s PATH/TO/FILE/ FILE", not "ln -s PATH/TO/FILE FILE" + */ last = bb_get_last_path_component_strip(xstrdup(last)); } @@ -50,9 +78,12 @@ int ln_main(int argc, char **argv) src = last; if (is_directory(src, - (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE, - NULL) + (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE + ) ) { + if (opts & LN_LINKFILE) { + bb_error_msg_and_die("'%s' is a directory", src); + } src_name = xstrdup(*argv); src = concat_path_file(src, bb_get_last_path_component_strip(src_name)); free(src_name); @@ -93,6 +124,10 @@ int ln_main(int argc, char **argv) link_func = symlink; } + if (opts & LN_VERBOSE) { + printf("'%s' -> '%s'\n", src, *argv); + } + if (link_func(*argv, src) != 0) { bb_simple_perror_msg(src); status = EXIT_FAILURE; diff --git a/coreutils/logname.c b/coreutils/logname.c index 8357b9a..10b9615 100644 --- a/coreutils/logname.c +++ b/coreutils/logname.c @@ -4,7 +4,7 @@ * * Copyright (C) 2000 Edward Betts . * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ @@ -20,6 +20,15 @@ * a diagnostic message and an error return. */ +//usage:#define logname_trivial_usage +//usage: "" +//usage:#define logname_full_usage "\n\n" +//usage: "Print the name of the current user" +//usage: +//usage:#define logname_example_usage +//usage: "$ logname\n" +//usage: "root\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/ls.c b/coreutils/ls.c index 1197f7d..166473d 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -1,9 +1,8 @@ /* vi: set sw=4 ts=4: */ /* - * tiny-ls.c version 0.1.0: A minimalist 'ls' * Copyright (C) 1996 Brian Candler * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* [date unknown. Perhaps before year 2000] @@ -29,6 +28,70 @@ * [2009-03] * ls sorts listing now, and supports almost all options. */ + +//usage:#define ls_trivial_usage +//usage: "[-1AaCxd" +//usage: IF_FEATURE_LS_FOLLOWLINKS("LH") +//usage: IF_FEATURE_LS_RECURSIVE("R") +//usage: IF_FEATURE_LS_FILETYPES("Fp") "lins" +//usage: IF_FEATURE_LS_TIMESTAMPS("e") +//usage: IF_FEATURE_HUMAN_READABLE("h") +//usage: IF_FEATURE_LS_SORTFILES("rSXv") +//usage: IF_FEATURE_LS_TIMESTAMPS("ctu") +//usage: IF_SELINUX("kKZ") "]" +//usage: IF_FEATURE_AUTOWIDTH(" [-w WIDTH]") " [FILE]..." +//usage:#define ls_full_usage "\n\n" +//usage: "List directory contents\n" +//usage: "\n -1 One column output" +//usage: "\n -a Include entries which start with ." +//usage: "\n -A Like -a, but exclude . and .." +//usage: "\n -C List by columns" +//usage: "\n -x List by lines" +//usage: "\n -d List directory entries instead of contents" +//usage: IF_FEATURE_LS_FOLLOWLINKS( +//usage: "\n -L Follow symlinks" +//usage: "\n -H Follow symlinks on command line" +//usage: ) +//usage: IF_FEATURE_LS_RECURSIVE( +//usage: "\n -R Recurse" +//usage: ) +//usage: IF_FEATURE_LS_FILETYPES( +//usage: "\n -p Append / to dir entries" +//usage: "\n -F Append indicator (one of */=@|) to entries" +//usage: ) +//usage: "\n -l Long listing format" +//usage: "\n -i List inode numbers" +//usage: "\n -n List numeric UIDs and GIDs instead of names" +//usage: "\n -s List allocated blocks" +//usage: IF_FEATURE_LS_TIMESTAMPS( +//usage: "\n -e List full date and time" +//usage: ) +//usage: IF_FEATURE_HUMAN_READABLE( +//usage: "\n -h List sizes in human readable format (1K 243M 2G)" +//usage: ) +//usage: IF_FEATURE_LS_SORTFILES( +//usage: "\n -r Sort in reverse order" +//usage: "\n -S Sort by size" +//usage: "\n -X Sort by extension" +//usage: "\n -v Sort by version" +//usage: ) +//usage: IF_FEATURE_LS_TIMESTAMPS( +//usage: "\n -c With -l: sort by ctime" +//usage: "\n -t With -l: sort by mtime" +//usage: "\n -u With -l: sort by atime" +//usage: ) +//usage: IF_SELINUX( +//usage: "\n -k List security context" +//usage: "\n -K List security context in long format" +//usage: "\n -Z List security context and permission" +//usage: ) +//usage: IF_FEATURE_AUTOWIDTH( +//usage: "\n -w N Assume the terminal is N columns wide" +//usage: ) +//usage: IF_FEATURE_LS_COLOR( +//usage: "\n --color[={always,never,auto}] Control coloring" +//usage: ) + #include "libbb.h" #include "unicode.h" @@ -52,15 +115,13 @@ enum { - TERMINAL_WIDTH = 80, /* use 79 if terminal has linefold bug */ -COLUMN_GAP = 2, /* includes the file type char */ -/* what is the overall style of the listing */ -STYLE_COLUMNS = 1 << 21, /* fill columns */ -STYLE_LONG = 2 << 21, /* one record per line, extended info */ -STYLE_SINGLE = 3 << 21, /* one record per line */ -STYLE_MASK = STYLE_SINGLE, +SPLIT_FILE = 0, +SPLIT_DIR = 1, +SPLIT_SUBDIR = 2, + +/* Bits in G.all_fmt: */ /* 51306 lrwxrwxrwx 1 root root 2 May 11 01:43 /bin/view -> vi* */ /* what file information will be listed */ @@ -72,77 +133,75 @@ LIST_ID_NAME = 1 << 4, LIST_ID_NUMERIC = 1 << 5, LIST_CONTEXT = 1 << 6, LIST_SIZE = 1 << 7, -//LIST_DEV = 1 << 8, - unused, synonym to LIST_SIZE -LIST_DATE_TIME = 1 << 9, -LIST_FULLTIME = 1 << 10, -LIST_FILENAME = 1 << 11, -LIST_SYMLINK = 1 << 12, -LIST_FILETYPE = 1 << 13, -LIST_EXEC = 1 << 14, -LIST_MASK = (LIST_EXEC << 1) - 1, +LIST_DATE_TIME = 1 << 8, +LIST_FULLTIME = 1 << 9, +LIST_SYMLINK = 1 << 10, +LIST_FILETYPE = 1 << 11, /* show / suffix for dirs */ +LIST_CLASSIFY = 1 << 12, /* requires LIST_FILETYPE, also show *,|,@,= suffixes */ +LIST_MASK = (LIST_CLASSIFY << 1) - 1, /* what files will be displayed */ -DISP_DIRNAME = 1 << 15, /* 2 or more items? label directories */ -DISP_HIDDEN = 1 << 16, /* show filenames starting with . */ -DISP_DOT = 1 << 17, /* show . and .. */ -DISP_NOLIST = 1 << 18, /* show directory as itself, not contents */ -DISP_RECURSIVE = 1 << 19, /* show directory and everything below it */ -DISP_ROWS = 1 << 20, /* print across rows */ +DISP_DIRNAME = 1 << 13, /* 2 or more items? label directories */ +DISP_HIDDEN = 1 << 14, /* show filenames starting with . */ +DISP_DOT = 1 << 15, /* show . and .. */ +DISP_NOLIST = 1 << 16, /* show directory as itself, not contents */ +DISP_RECURSIVE = 1 << 17, /* show directory and everything below it */ +DISP_ROWS = 1 << 18, /* print across rows */ DISP_MASK = ((DISP_ROWS << 1) - 1) & ~(DISP_DIRNAME - 1), -/* how will the files be sorted (CONFIG_FEATURE_LS_SORTFILES) */ -SORT_FORWARD = 0, /* sort in reverse order */ -SORT_REVERSE = 1 << 27, /* sort in reverse order */ - -SORT_NAME = 0, /* sort by file name */ -SORT_SIZE = 1 << 28, /* sort by file size */ -SORT_ATIME = 2 << 28, /* sort by last access time */ -SORT_CTIME = 3 << 28, /* sort by last change time */ -SORT_MTIME = 4 << 28, /* sort by last modification time */ -SORT_VERSION = 5 << 28, /* sort by version */ -SORT_EXT = 6 << 28, /* sort by file name extension */ -SORT_DIR = 7 << 28, /* sort by file or directory */ -SORT_MASK = (7 << 28) * ENABLE_FEATURE_LS_SORTFILES, +/* what is the overall style of the listing */ +STYLE_COLUMNAR = 1 << 19, /* many records per line */ +STYLE_LONG = 2 << 19, /* one record per line, extended info */ +STYLE_SINGLE = 3 << 19, /* one record per line */ +STYLE_MASK = STYLE_SINGLE, /* which of the three times will be used */ -TIME_CHANGE = (1 << 23) * ENABLE_FEATURE_LS_TIMESTAMPS, -TIME_ACCESS = (1 << 24) * ENABLE_FEATURE_LS_TIMESTAMPS, -TIME_MASK = (3 << 23) * ENABLE_FEATURE_LS_TIMESTAMPS, +TIME_CHANGE = (1 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS, +TIME_ACCESS = (2 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS, +TIME_MASK = (3 << 21) * ENABLE_FEATURE_LS_TIMESTAMPS, -FOLLOW_LINKS = (1 << 25) * ENABLE_FEATURE_LS_FOLLOWLINKS, +/* how will the files be sorted (CONFIG_FEATURE_LS_SORTFILES) */ +SORT_REVERSE = 1 << 23, -LS_DISP_HR = (1 << 26) * ENABLE_FEATURE_HUMAN_READABLE, +SORT_NAME = 0, /* sort by file name */ +SORT_SIZE = 1 << 24, /* sort by file size */ +SORT_ATIME = 2 << 24, /* sort by last access time */ +SORT_CTIME = 3 << 24, /* sort by last change time */ +SORT_MTIME = 4 << 24, /* sort by last modification time */ +SORT_VERSION = 5 << 24, /* sort by version */ +SORT_EXT = 6 << 24, /* sort by file name extension */ +SORT_DIR = 7 << 24, /* sort by file or directory */ +SORT_MASK = (7 << 24) * ENABLE_FEATURE_LS_SORTFILES, -LIST_SHORT = LIST_FILENAME, LIST_LONG = LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \ - LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK, - -SPLIT_DIR = 1, -SPLIT_FILE = 0, -SPLIT_SUBDIR = 2, - + LIST_DATE_TIME | LIST_SYMLINK, }; -/* "[-]Cadil1", POSIX mandated options, busybox always supports */ -/* "[-]gnsx", POSIX non-mandated options, busybox always supports */ -/* "[-]Q" GNU option? busybox always supports */ -/* "[-]Ak" GNU options, busybox always supports */ -/* "[-]FLRctur", POSIX mandated options, busybox optionally supports */ -/* "[-]p", POSIX non-mandated options, busybox optionally supports */ -/* "[-]SXvThw", GNU options, busybox optionally supports */ -/* "[-]K", SELinux mandated options, busybox optionally supports */ -/* "[-]e", I think we made this one up */ +/* -Cadil1 Std options, busybox always supports */ +/* -gnsxA Std options, busybox always supports */ +/* -Q GNU option, busybox always supports */ +/* -k SELinux option, busybox always supports (ignores if !SELinux) */ +/* Std has -k which means "show sizes in kbytes" */ +/* -LHRctur Std options, busybox optionally supports */ +/* -Fp Std options, busybox optionally supports */ +/* -SXvhTw GNU options, busybox optionally supports */ +/* -T WIDTH Ignored (we don't use tabs on output) */ +/* -KZ SELinux mandated options, busybox optionally supports */ +/* (coreutils 8.4 has no -K, remove it?) */ +/* -e I think we made this one up (looks similar to GNU --full-time) */ +/* We already used up all 32 bits, if we need to add more, candidates for removal: */ +/* -K, -T, -e (add --full-time instead) */ static const char ls_options[] ALIGN1 = - "Cadil1gnsxQAk" /* 13 opts, total 13 */ + "Cadil1gnsxQAk" /* 13 opts, total 13 */ IF_FEATURE_LS_TIMESTAMPS("cetu") /* 4, 17 */ IF_FEATURE_LS_SORTFILES("SXrv") /* 4, 21 */ IF_FEATURE_LS_FILETYPES("Fp") /* 2, 23 */ - IF_FEATURE_LS_FOLLOWLINKS("L") /* 1, 24 */ - IF_FEATURE_LS_RECURSIVE("R") /* 1, 25 */ - IF_FEATURE_HUMAN_READABLE("h") /* 1, 26 */ - IF_SELINUX("KZ") /* 2, 28 */ - IF_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */ - ; + IF_FEATURE_LS_RECURSIVE("R") /* 1, 24 */ + IF_SELINUX("KZ") /* 2, 26 */ + IF_FEATURE_LS_FOLLOWLINKS("LH") /* 2, 28 */ + IF_FEATURE_HUMAN_READABLE("h") /* 1, 29 */ + IF_FEATURE_AUTOWIDTH("T:w:") /* 2, 31 */ + /* with --color, we use all 32 bits */; enum { //OPT_C = (1 << 0), //OPT_a = (1 << 1), @@ -157,99 +216,149 @@ enum { OPT_Q = (1 << 10), //OPT_A = (1 << 11), //OPT_k = (1 << 12), - OPTBIT_color = 13 - + 4 * ENABLE_FEATURE_LS_TIMESTAMPS - + 4 * ENABLE_FEATURE_LS_SORTFILES - + 2 * ENABLE_FEATURE_LS_FILETYPES - + 1 * ENABLE_FEATURE_LS_FOLLOWLINKS - + 1 * ENABLE_FEATURE_LS_RECURSIVE - + 1 * ENABLE_FEATURE_HUMAN_READABLE - + 2 * ENABLE_SELINUX - + 2 * ENABLE_FEATURE_AUTOWIDTH, - OPT_color = 1 << OPTBIT_color, -}; -enum { - LIST_MASK_TRIGGER = 0, - STYLE_MASK_TRIGGER = STYLE_MASK, - DISP_MASK_TRIGGER = DISP_ROWS, - SORT_MASK_TRIGGER = SORT_MASK, + OPTBIT_c = 13, + OPTBIT_e, + OPTBIT_t, + OPTBIT_u, + OPTBIT_S = OPTBIT_c + 4 * ENABLE_FEATURE_LS_TIMESTAMPS, + OPTBIT_X, /* 18 */ + OPTBIT_r, + OPTBIT_v, + OPTBIT_F = OPTBIT_S + 4 * ENABLE_FEATURE_LS_SORTFILES, + OPTBIT_p, /* 22 */ + OPTBIT_R = OPTBIT_F + 2 * ENABLE_FEATURE_LS_FILETYPES, + OPTBIT_K = OPTBIT_R + 1 * ENABLE_FEATURE_LS_RECURSIVE, + OPTBIT_Z, /* 25 */ + OPTBIT_L = OPTBIT_K + 2 * ENABLE_SELINUX, + OPTBIT_H, /* 27 */ + OPTBIT_h = OPTBIT_L + 2 * ENABLE_FEATURE_LS_FOLLOWLINKS, + OPTBIT_T = OPTBIT_h + 1 * ENABLE_FEATURE_HUMAN_READABLE, + OPTBIT_w, /* 30 */ + OPTBIT_color = OPTBIT_T + 2 * ENABLE_FEATURE_AUTOWIDTH, + + OPT_c = (1 << OPTBIT_c) * ENABLE_FEATURE_LS_TIMESTAMPS, + OPT_e = (1 << OPTBIT_e) * ENABLE_FEATURE_LS_TIMESTAMPS, + OPT_t = (1 << OPTBIT_t) * ENABLE_FEATURE_LS_TIMESTAMPS, + OPT_u = (1 << OPTBIT_u) * ENABLE_FEATURE_LS_TIMESTAMPS, + OPT_S = (1 << OPTBIT_S) * ENABLE_FEATURE_LS_SORTFILES, + OPT_X = (1 << OPTBIT_X) * ENABLE_FEATURE_LS_SORTFILES, + OPT_r = (1 << OPTBIT_r) * ENABLE_FEATURE_LS_SORTFILES, + OPT_v = (1 << OPTBIT_v) * ENABLE_FEATURE_LS_SORTFILES, + OPT_F = (1 << OPTBIT_F) * ENABLE_FEATURE_LS_FILETYPES, + OPT_p = (1 << OPTBIT_p) * ENABLE_FEATURE_LS_FILETYPES, + OPT_R = (1 << OPTBIT_R) * ENABLE_FEATURE_LS_RECURSIVE, + OPT_K = (1 << OPTBIT_K) * ENABLE_SELINUX, + OPT_Z = (1 << OPTBIT_Z) * ENABLE_SELINUX, + OPT_L = (1 << OPTBIT_L) * ENABLE_FEATURE_LS_FOLLOWLINKS, + OPT_H = (1 << OPTBIT_H) * ENABLE_FEATURE_LS_FOLLOWLINKS, + OPT_h = (1 << OPTBIT_h) * ENABLE_FEATURE_HUMAN_READABLE, + OPT_T = (1 << OPTBIT_T) * ENABLE_FEATURE_AUTOWIDTH, + OPT_w = (1 << OPTBIT_w) * ENABLE_FEATURE_AUTOWIDTH, + OPT_color = (1 << OPTBIT_color) * ENABLE_FEATURE_LS_COLOR, }; /* TODO: simple toggles may be stored as OPT_xxx bits instead */ -static const unsigned opt_flags[] = { - LIST_SHORT | STYLE_COLUMNS, /* C */ - DISP_HIDDEN | DISP_DOT, /* a */ - DISP_NOLIST, /* d */ - LIST_INO, /* i */ - LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ - LIST_SHORT | STYLE_SINGLE, /* 1 */ - 0, /* g (don't show group) - handled via OPT_g */ - LIST_ID_NUMERIC, /* n */ - LIST_BLOCKS, /* s */ - DISP_ROWS, /* x */ - 0, /* Q (quote filename) - handled via OPT_Q */ - DISP_HIDDEN, /* A */ - ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */ +static const uint32_t opt_flags[] = { + STYLE_COLUMNAR, /* C */ + DISP_HIDDEN | DISP_DOT, /* a */ + DISP_NOLIST, /* d */ + LIST_INO, /* i */ + LIST_LONG | STYLE_LONG, /* l */ + STYLE_SINGLE, /* 1 */ + LIST_LONG | STYLE_LONG, /* g (don't show owner) - handled via OPT_g. assumes l */ + LIST_ID_NUMERIC | LIST_LONG | STYLE_LONG, /* n (assumes l) */ + LIST_BLOCKS, /* s */ + DISP_ROWS | STYLE_COLUMNAR, /* x */ + 0, /* Q (quote filename) - handled via OPT_Q */ + DISP_HIDDEN, /* A */ + ENABLE_SELINUX * (LIST_CONTEXT|STYLE_SINGLE), /* k (ignored if !SELINUX) */ #if ENABLE_FEATURE_LS_TIMESTAMPS - TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */ - LIST_FULLTIME, /* e */ - ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */ - TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */ + TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */ + LIST_FULLTIME, /* e */ + ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */ + TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */ #endif #if ENABLE_FEATURE_LS_SORTFILES - SORT_SIZE, /* S */ - SORT_EXT, /* X */ - SORT_REVERSE, /* r */ - SORT_VERSION, /* v */ + SORT_SIZE, /* S */ + SORT_EXT, /* X */ + SORT_REVERSE, /* r */ + SORT_VERSION, /* v */ #endif #if ENABLE_FEATURE_LS_FILETYPES - LIST_FILETYPE | LIST_EXEC, /* F */ - LIST_FILETYPE, /* p */ -#endif -#if ENABLE_FEATURE_LS_FOLLOWLINKS - FOLLOW_LINKS, /* L */ + LIST_FILETYPE | LIST_CLASSIFY, /* F */ + LIST_FILETYPE, /* p */ #endif #if ENABLE_FEATURE_LS_RECURSIVE - DISP_RECURSIVE, /* R */ -#endif -#if ENABLE_FEATURE_HUMAN_READABLE - LS_DISP_HR, /* h */ -#endif -#if ENABLE_SELINUX - LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ + DISP_RECURSIVE, /* R */ #endif #if ENABLE_SELINUX - LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */ + LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME|STYLE_SINGLE, /* K */ + LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT|STYLE_SINGLE, /* Z */ #endif - (1U<<31) - /* options after Z are not processed through opt_flags: - * T, w - ignored - */ + (1U << 31) + /* options after Z are not processed through opt_flags */ }; /* - * a directory entry and its stat info are stored here + * a directory entry and its stat info */ struct dnode { - const char *name; /* the dir entry name */ - const char *fullname; /* the dir entry name */ - struct dnode *next; /* point at the next node */ - smallint fname_allocated; - struct stat dstat; /* the file stat info */ + const char *name; /* usually basename, but think "ls -l dir/file" */ + const char *fullname; /* full name (usable for stat etc) */ + struct dnode *dn_next; /* for linked list */ IF_SELINUX(security_context_t sid;) + smallint fname_allocated; + + /* Used to avoid re-doing [l]stat at printout stage + * if we already collected needed data in scan stage: + */ + mode_t dn_mode_lstat; /* obtained with lstat, or 0 */ + mode_t dn_mode_stat; /* obtained with stat, or 0 */ + +// struct stat dstat; +// struct stat is huge. We don't need it in full. +// At least we don't need st_dev and st_blksize, +// but there are invisible fields as well +// (such as nanosecond-resolution timespamps) +// and padding, which we also don't want to store. +// We also can pre-parse dev_t dn_rdev (in glibc, it's huge). +// On 32-bit uclibc: dnode size went from 112 to 84 bytes. +// + /* Same names as in struct stat, but with dn_ instead of st_ pfx: */ + mode_t dn_mode; /* obtained with lstat OR stat, depending on -L etc */ + off_t dn_size; +#if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES + time_t dn_atime; + time_t dn_mtime; + time_t dn_ctime; +#endif + ino_t dn_ino; + blkcnt_t dn_blocks; + nlink_t dn_nlink; + uid_t dn_uid; + gid_t dn_gid; + int dn_rdev_maj; + int dn_rdev_min; +// dev_t dn_dev; +// blksize_t dn_blksize; }; struct globals { #if ENABLE_FEATURE_LS_COLOR smallint show_color; +# define G_show_color (G.show_color) +#else +# define G_show_color 0 #endif smallint exit_code; unsigned all_fmt; #if ENABLE_FEATURE_AUTOWIDTH - unsigned tabstops; // = COLUMN_GAP; - unsigned terminal_width; // = TERMINAL_WIDTH; + unsigned terminal_width; +# define G_terminal_width (G.terminal_width) +#else +# define G_terminal_width TERMINAL_WIDTH #endif #if ENABLE_FEATURE_LS_TIMESTAMPS /* Do time() just once. Saves one syscall per file for "ls -l" */ @@ -257,77 +366,24 @@ struct globals { #endif } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) -#if ENABLE_FEATURE_LS_COLOR -# define show_color (G.show_color ) -#else -enum { show_color = 0 }; -#endif -#define exit_code (G.exit_code ) -#define all_fmt (G.all_fmt ) -#if ENABLE_FEATURE_AUTOWIDTH -# define tabstops (G.tabstops ) -# define terminal_width (G.terminal_width) -#else -enum { - tabstops = COLUMN_GAP, - terminal_width = TERMINAL_WIDTH, -}; -#endif -#define current_time_t (G.current_time_t) #define INIT_G() do { \ /* we have to zero it out because of NOEXEC */ \ memset(&G, 0, sizeof(G)); \ - IF_FEATURE_AUTOWIDTH(tabstops = COLUMN_GAP;) \ - IF_FEATURE_AUTOWIDTH(terminal_width = TERMINAL_WIDTH;) \ - IF_FEATURE_LS_TIMESTAMPS(time(¤t_time_t);) \ + IF_FEATURE_AUTOWIDTH(G_terminal_width = TERMINAL_WIDTH;) \ + IF_FEATURE_LS_TIMESTAMPS(time(&G.current_time_t);) \ } while (0) -static struct dnode *my_stat(const char *fullname, const char *name, int force_follow) -{ - struct stat dstat; - struct dnode *cur; - IF_SELINUX(security_context_t sid = NULL;) +/*** Output code ***/ - if ((all_fmt & FOLLOW_LINKS) || force_follow) { -#if ENABLE_SELINUX - if (is_selinux_enabled()) { - getfilecon(fullname, &sid); - } -#endif - if (stat(fullname, &dstat)) { - bb_simple_perror_msg(fullname); - exit_code = EXIT_FAILURE; - return 0; - } - } else { -#if ENABLE_SELINUX - if (is_selinux_enabled()) { - lgetfilecon(fullname, &sid); - } -#endif - if (lstat(fullname, &dstat)) { - bb_simple_perror_msg(fullname); - exit_code = EXIT_FAILURE; - return 0; - } - } - - cur = xmalloc(sizeof(*cur)); - cur->fullname = fullname; - cur->name = name; - cur->dstat = dstat; - IF_SELINUX(cur->sid = sid;) - return cur; -} /* FYI type values: 1:fifo 2:char 4:dir 6:blk 8:file 10:link 12:socket * (various wacky OSes: 13:Sun door 14:BSD whiteout 5:XENIX named file * 3/7:multiplexed char/block device) * and we use 0 for unknown and 15 for executables (see below) */ #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f) -#define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)]) -#define APPCHAR(mode) ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)]) +/* un fi chr - dir - blk - file - link - sock - - exe */ +#define APPCHAR(mode) ("\0""|""\0""\0""/""\0""\0""\0""\0""\0""@""\0""=""\0""\0""\0" [TYPEINDEX(mode)]) /* 036 black foreground 050 black background 037 red foreground 051 red background 040 green foreground 052 green background @@ -338,7 +394,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f 045 gray foreground 057 white background */ #define COLOR(mode) ( \ - /*un fi chr dir blk file link sock exe */ \ + /*un fi chr - dir - blk - file - link - sock - - exe */ \ "\037\043\043\045\042\045\043\043\000\045\044\045\043\045\045\040" \ [TYPEINDEX(mode)]) /* Select normal (0) [actually "reset all"] or bold (1) @@ -347,7 +403,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f * Note: coreutils 6.9 uses inverted red for setuid binaries. */ #define ATTR(mode) ( \ - /*un fi chr dir blk file link sock exe */ \ + /*un fi chr - dir - blk - file- link- sock- - exe */ \ "\01\00\01\07\01\07\01\07\00\07\01\07\01\07\07\01" \ [TYPEINDEX(mode)]) @@ -367,14 +423,14 @@ static char bold(mode_t mode) } #endif -#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR +#if ENABLE_FEATURE_LS_FILETYPES static char append_char(mode_t mode) { - if (!(all_fmt & LIST_FILETYPE)) + if (!(G.all_fmt & LIST_FILETYPE)) return '\0'; if (S_ISDIR(mode)) return '/'; - if (!(all_fmt & LIST_EXEC)) + if (!(G.all_fmt & LIST_CLASSIFY)) return '\0'; if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*'; @@ -382,149 +438,6 @@ static char append_char(mode_t mode) } #endif -static unsigned count_dirs(struct dnode **dn, int which) -{ - unsigned dirs, all; - - if (!dn) - return 0; - - dirs = all = 0; - for (; *dn; dn++) { - const char *name; - - all++; - if (!S_ISDIR((*dn)->dstat.st_mode)) - continue; - name = (*dn)->name; - if (which != SPLIT_SUBDIR /* if not requested to skip . / .. */ - /* or if it's not . or .. */ - || name[0] != '.' || (name[1] && (name[1] != '.' || name[2])) - ) { - dirs++; - } - } - return which != SPLIT_FILE ? dirs : all - dirs; -} - -/* get memory to hold an array of pointers */ -static struct dnode **dnalloc(unsigned num) -{ - if (num < 1) - return NULL; - - num++; /* so that we have terminating NULL */ - return xzalloc(num * sizeof(struct dnode *)); -} - -#if ENABLE_FEATURE_LS_RECURSIVE -static void dfree(struct dnode **dnp) -{ - unsigned i; - - if (dnp == NULL) - return; - - for (i = 0; dnp[i]; i++) { - struct dnode *cur = dnp[i]; - if (cur->fname_allocated) - free((char*)cur->fullname); - free(cur); - } - free(dnp); -} -#else -#define dfree(...) ((void)0) -#endif - -/* Returns NULL-terminated malloced vector of pointers (or NULL) */ -static struct dnode **splitdnarray(struct dnode **dn, int which) -{ - unsigned dncnt, d; - struct dnode **dnp; - - if (dn == NULL) - return NULL; - - /* count how many dirs or files there are */ - dncnt = count_dirs(dn, which); - - /* allocate a file array and a dir array */ - dnp = dnalloc(dncnt); - - /* copy the entrys into the file or dir array */ - for (d = 0; *dn; dn++) { - if (S_ISDIR((*dn)->dstat.st_mode)) { - const char *name; - - if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) - continue; - name = (*dn)->name; - if ((which & SPLIT_DIR) - || name[0]!='.' || (name[1] && (name[1]!='.' || name[2])) - ) { - dnp[d++] = *dn; - } - } else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) { - dnp[d++] = *dn; - } - } - return dnp; -} - -#if ENABLE_FEATURE_LS_SORTFILES -static int sortcmp(const void *a, const void *b) -{ - struct dnode *d1 = *(struct dnode **)a; - struct dnode *d2 = *(struct dnode **)b; - unsigned sort_opts = all_fmt & SORT_MASK; - off_t dif; - - dif = 0; /* assume SORT_NAME */ - // TODO: use pre-initialized function pointer - // instead of branch forest - if (sort_opts == SORT_SIZE) { - dif = (d2->dstat.st_size - d1->dstat.st_size); - } else if (sort_opts == SORT_ATIME) { - dif = (d2->dstat.st_atime - d1->dstat.st_atime); - } else if (sort_opts == SORT_CTIME) { - dif = (d2->dstat.st_ctime - d1->dstat.st_ctime); - } else if (sort_opts == SORT_MTIME) { - dif = (d2->dstat.st_mtime - d1->dstat.st_mtime); - } else if (sort_opts == SORT_DIR) { - dif = S_ISDIR(d2->dstat.st_mode) - S_ISDIR(d1->dstat.st_mode); - /* } else if (sort_opts == SORT_VERSION) { */ - /* } else if (sort_opts == SORT_EXT) { */ - } - if (dif == 0) { - /* sort by name, or tie_breaker for other sorts */ - if (ENABLE_LOCALE_SUPPORT) - dif = strcoll(d1->name, d2->name); - else - dif = strcmp(d1->name, d2->name); - } - - /* Make dif fit into an int */ - if (sizeof(dif) > sizeof(int)) { - enum { BITS_TO_SHIFT = 8 * (sizeof(dif) - sizeof(int)) }; - /* shift leaving only "int" worth of bits */ - if (dif != 0) { - dif = 1 | (int)((uoff_t)dif >> BITS_TO_SHIFT); - } - } - - return (all_fmt & SORT_REVERSE) ? -(int)dif : (int)dif; -} - -static void dnsort(struct dnode **dn, int size) -{ - qsort(dn, size, sizeof(*dn), sortcmp); -} -#else -#define dnsort(dn, size) ((void)0) -#endif - - static unsigned calc_name_len(const char *name) { unsigned len; @@ -547,9 +460,8 @@ static unsigned calc_name_len(const char *name) return len; } - /* Return the number of used columns. - * Note that only STYLE_COLUMNS uses return value. + * Note that only STYLE_COLUMNAR uses return value. * STYLE_SINGLE and STYLE_LONG don't care. * coreutils 7.2 also supports: * ls -b (--escape) = octal escapes (although it doesn't look like working) @@ -575,99 +487,100 @@ static unsigned print_name(const char *name) putchar('\\'); len++; } - putchar(*name++); + putchar(*name); + name++; } putchar('"'); return len; } /* Return the number of used columns. - * Note that only STYLE_COLUMNS uses return value, + * Note that only STYLE_COLUMNAR uses return value, * STYLE_SINGLE and STYLE_LONG don't care. */ -static NOINLINE unsigned list_single(const struct dnode *dn) +static NOINLINE unsigned display_single(const struct dnode *dn) { unsigned column = 0; - char *lpath = lpath; /* for compiler */ + char *lpath; #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR - struct stat info; + struct stat statbuf; char append; #endif - /* Never happens: - if (dn->fullname == NULL) - return 0; - */ - #if ENABLE_FEATURE_LS_FILETYPES - append = append_char(dn->dstat.st_mode); + append = append_char(dn->dn_mode); #endif /* Do readlink early, so that if it fails, error message * does not appear *inside* the "ls -l" line */ - if (all_fmt & LIST_SYMLINK) - if (S_ISLNK(dn->dstat.st_mode)) + lpath = NULL; + if (G.all_fmt & LIST_SYMLINK) + if (S_ISLNK(dn->dn_mode)) lpath = xmalloc_readlink_or_warn(dn->fullname); - if (all_fmt & LIST_INO) - column += printf("%7llu ", (long long) dn->dstat.st_ino); - if (all_fmt & LIST_BLOCKS) - column += printf("%4"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1)); - if (all_fmt & LIST_MODEBITS) - column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode)); - if (all_fmt & LIST_NLINKS) - column += printf("%4lu ", (long) dn->dstat.st_nlink); + if (G.all_fmt & LIST_INO) + column += printf("%7llu ", (long long) dn->dn_ino); +//TODO: -h should affect -s too: + if (G.all_fmt & LIST_BLOCKS) + column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1)); + if (G.all_fmt & LIST_MODEBITS) + column += printf("%-10s ", (char *) bb_mode_string(dn->dn_mode)); + if (G.all_fmt & LIST_NLINKS) + column += printf("%4lu ", (long) dn->dn_nlink); + if (G.all_fmt & LIST_ID_NUMERIC) { + if (option_mask32 & OPT_g) + column += printf("%-8u ", (int) dn->dn_gid); + else + column += printf("%-8u %-8u ", + (int) dn->dn_uid, + (int) dn->dn_gid); + } #if ENABLE_FEATURE_LS_USERNAME - if (all_fmt & LIST_ID_NAME) { + else if (G.all_fmt & LIST_ID_NAME) { if (option_mask32 & OPT_g) { column += printf("%-8.8s ", - get_cached_username(dn->dstat.st_uid)); + get_cached_groupname(dn->dn_gid)); } else { column += printf("%-8.8s %-8.8s ", - get_cached_username(dn->dstat.st_uid), - get_cached_groupname(dn->dstat.st_gid)); + get_cached_username(dn->dn_uid), + get_cached_groupname(dn->dn_gid)); } } #endif - if (all_fmt & LIST_ID_NUMERIC) { - if (option_mask32 & OPT_g) - column += printf("%-8u ", (int) dn->dstat.st_uid); - else - column += printf("%-8u %-8u ", - (int) dn->dstat.st_uid, - (int) dn->dstat.st_gid); - } - if (all_fmt & (LIST_SIZE /*|LIST_DEV*/ )) { - if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) { + if (G.all_fmt & LIST_SIZE) { + if (S_ISBLK(dn->dn_mode) || S_ISCHR(dn->dn_mode)) { column += printf("%4u, %3u ", - (int) major(dn->dstat.st_rdev), - (int) minor(dn->dstat.st_rdev)); + dn->dn_rdev_maj, + dn->dn_rdev_min); } else { - if (all_fmt & LS_DISP_HR) { + if (option_mask32 & OPT_h) { column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ", - /* print st_size, show one fractional, use suffixes */ - make_human_readable_str(dn->dstat.st_size, 1, 0) + /* print size, show one fractional, use suffixes */ + make_human_readable_str(dn->dn_size, 1, 0) ); } else { - column += printf("%9"OFF_FMT"u ", (off_t) dn->dstat.st_size); + column += printf("%9"OFF_FMT"u ", dn->dn_size); } } } #if ENABLE_FEATURE_LS_TIMESTAMPS - if (all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) { + if (G.all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) { char *filetime; - time_t ttime = dn->dstat.st_mtime; - if (all_fmt & TIME_ACCESS) - ttime = dn->dstat.st_atime; - if (all_fmt & TIME_CHANGE) - ttime = dn->dstat.st_ctime; + time_t ttime = dn->dn_mtime; + if (G.all_fmt & TIME_ACCESS) + ttime = dn->dn_atime; + if (G.all_fmt & TIME_CHANGE) + ttime = dn->dn_ctime; filetime = ctime(&ttime); /* filetime's format: "Wed Jun 30 21:49:08 1993\n" */ - if (all_fmt & LIST_FULLTIME) + if (G.all_fmt & LIST_FULLTIME) { /* -e */ + /* Note: coreutils 8.4 ls --full-time prints: + * 2009-07-13 17:49:27.000000000 +0200 + */ column += printf("%.24s ", filetime); - else { /* LIST_DATE_TIME */ - /* current_time_t ~== time(NULL) */ - time_t age = current_time_t - ttime; + } else { /* LIST_DATE_TIME */ + /* G.current_time_t ~== time(NULL) */ + time_t age = G.current_time_t - ttime; printf("%.6s ", filetime + 4); /* "Jun 30" */ if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) { /* hh:mm if less than 6 months old */ @@ -680,51 +593,52 @@ static NOINLINE unsigned list_single(const struct dnode *dn) } #endif #if ENABLE_SELINUX - if (all_fmt & LIST_CONTEXT) { + if (G.all_fmt & LIST_CONTEXT) { column += printf("%-32s ", dn->sid ? dn->sid : "unknown"); freecon(dn->sid); } #endif - if (all_fmt & LIST_FILENAME) { + #if ENABLE_FEATURE_LS_COLOR - if (show_color) { - info.st_mode = 0; /* for fgcolor() */ - lstat(dn->fullname, &info); - printf("\033[%u;%um", bold(info.st_mode), - fgcolor(info.st_mode)); - } + if (G_show_color) { + mode_t mode = dn->dn_mode_lstat; + if (!mode) + if (lstat(dn->fullname, &statbuf) == 0) + mode = statbuf.st_mode; + printf("\033[%u;%um", bold(mode), fgcolor(mode)); + } #endif - column += print_name(dn->name); - if (show_color) { - printf("\033[0m"); - } + column += print_name(dn->name); + if (G_show_color) { + printf("\033[0m"); } - if (all_fmt & LIST_SYMLINK) { - if (S_ISLNK(dn->dstat.st_mode) && lpath) { - printf(" -> "); + + if (lpath) { + printf(" -> "); #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR -#if ENABLE_FEATURE_LS_COLOR - info.st_mode = 0; /* for fgcolor() */ -#endif - if (stat(dn->fullname, &info) == 0) { - append = append_char(info.st_mode); - } -#endif -#if ENABLE_FEATURE_LS_COLOR - if (show_color) { - printf("\033[%u;%um", bold(info.st_mode), - fgcolor(info.st_mode)); + if ((G.all_fmt & LIST_FILETYPE) || G_show_color) { + mode_t mode = dn->dn_mode_stat; + if (!mode) + if (stat(dn->fullname, &statbuf) == 0) + mode = statbuf.st_mode; +# if ENABLE_FEATURE_LS_FILETYPES + append = append_char(mode); +# endif +# if ENABLE_FEATURE_LS_COLOR + if (G_show_color) { + printf("\033[%u;%um", bold(mode), fgcolor(mode)); } +# endif + } #endif - column += print_name(lpath) + 4; - if (show_color) { - printf("\033[0m"); - } - free(lpath); + column += print_name(lpath) + 4; + free(lpath); + if (G_show_color) { + printf("\033[0m"); } } #if ENABLE_FEATURE_LS_FILETYPES - if (all_fmt & LIST_FILETYPE) { + if (G.all_fmt & LIST_FILETYPE) { if (append) { putchar(append); column++; @@ -735,14 +649,14 @@ static NOINLINE unsigned list_single(const struct dnode *dn) return column; } -static void showfiles(struct dnode **dn, unsigned nfiles) +static void display_files(struct dnode **dn, unsigned nfiles) { unsigned i, ncols, nrows, row, nc; - unsigned column = 0; - unsigned nexttab = 0; - unsigned column_width = 0; /* used only by STYLE_COLUMNS */ + unsigned column; + unsigned nexttab; + unsigned column_width = 0; /* used only by STYLE_COLUMNAR */ - if (all_fmt & STYLE_LONG) { /* STYLE_LONG or STYLE_SINGLE */ + if (G.all_fmt & STYLE_LONG) { /* STYLE_LONG or STYLE_SINGLE */ ncols = 1; } else { /* find the longest file name, use that as the column width */ @@ -751,11 +665,11 @@ static void showfiles(struct dnode **dn, unsigned nfiles) if (column_width < len) column_width = len; } - column_width += tabstops + - IF_SELINUX( ((all_fmt & LIST_CONTEXT) ? 33 : 0) + ) - ((all_fmt & LIST_INO) ? 8 : 0) + - ((all_fmt & LIST_BLOCKS) ? 5 : 0); - ncols = (int) (terminal_width / column_width); + column_width += 1 + + IF_SELINUX( ((G.all_fmt & LIST_CONTEXT) ? 33 : 0) + ) + ((G.all_fmt & LIST_INO) ? 8 : 0) + + ((G.all_fmt & LIST_BLOCKS) ? 5 : 0); + ncols = (unsigned)G_terminal_width / column_width; } if (ncols > 1) { @@ -767,21 +681,23 @@ static void showfiles(struct dnode **dn, unsigned nfiles) ncols = 1; } + column = 0; + nexttab = 0; for (row = 0; row < nrows; row++) { for (nc = 0; nc < ncols; nc++) { /* reach into the array based on the column and row */ - if (all_fmt & DISP_ROWS) + if (G.all_fmt & DISP_ROWS) i = (row * ncols) + nc; /* display across row */ else i = (nc * nrows) + row; /* display by column */ if (i < nfiles) { if (column > 0) { nexttab -= column; - printf("%*s", nexttab, ""); - column += nexttab; + printf("%*s ", nexttab, ""); + column += nexttab + 1; } nexttab = column + column_width; - column += list_single(dn[i]); + column += display_single(dn[i]); } } putchar('\n'); @@ -790,104 +706,241 @@ static void showfiles(struct dnode **dn, unsigned nfiles) } -#if ENABLE_DESKTOP -/* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html - * If any of the -l, -n, -s options is specified, each list - * of files within the directory shall be preceded by a - * status line indicating the number of file system blocks - * occupied by files in the directory in 512-byte units if - * the -k option is not specified, or 1024-byte units if the - * -k option is specified, rounded up to the next integral - * number of units. - */ -/* by Jorgen Overgaard (jorgen AT antistaten.se) */ -static off_t calculate_blocks(struct dnode **dn) +/*** Dir scanning code ***/ + +static struct dnode *my_stat(const char *fullname, const char *name, int force_follow) { - uoff_t blocks = 1; - if (dn) { - while (*dn) { - /* st_blocks is in 512 byte blocks */ - blocks += (*dn)->dstat.st_blocks; - dn++; + struct stat statbuf; + struct dnode *cur; + + cur = xzalloc(sizeof(*cur)); + cur->fullname = fullname; + cur->name = name; + + if ((option_mask32 & OPT_L) || force_follow) { +#if ENABLE_SELINUX + if (is_selinux_enabled()) { + getfilecon(fullname, &cur->sid); + } +#endif + if (stat(fullname, &statbuf)) { + bb_simple_perror_msg(fullname); + G.exit_code = EXIT_FAILURE; + free(cur); + return NULL; + } + cur->dn_mode_stat = statbuf.st_mode; + } else { +#if ENABLE_SELINUX + if (is_selinux_enabled()) { + lgetfilecon(fullname, &cur->sid); } +#endif + if (lstat(fullname, &statbuf)) { + bb_simple_perror_msg(fullname); + G.exit_code = EXIT_FAILURE; + free(cur); + return NULL; + } + cur->dn_mode_lstat = statbuf.st_mode; } - /* Even though standard says use 512 byte blocks, coreutils use 1k */ - /* Actually, we round up by calculating (blocks + 1) / 2, - * "+ 1" was done when we initialized blocks to 1 */ - return blocks >> 1; -} + /* cur->dstat = statbuf: */ + cur->dn_mode = statbuf.st_mode ; + cur->dn_size = statbuf.st_size ; +#if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES + cur->dn_atime = statbuf.st_atime ; + cur->dn_mtime = statbuf.st_mtime ; + cur->dn_ctime = statbuf.st_ctime ; #endif + cur->dn_ino = statbuf.st_ino ; + cur->dn_blocks = statbuf.st_blocks; + cur->dn_nlink = statbuf.st_nlink ; + cur->dn_uid = statbuf.st_uid ; + cur->dn_gid = statbuf.st_gid ; + cur->dn_rdev_maj = major(statbuf.st_rdev); + cur->dn_rdev_min = minor(statbuf.st_rdev); + return cur; +} -static struct dnode **list_dir(const char *, unsigned *); - -static void showdirs(struct dnode **dn, int first) +static unsigned count_dirs(struct dnode **dn, int which) { - unsigned nfiles; - unsigned dndirs; - struct dnode **subdnp; - struct dnode **dnd; + unsigned dirs, all; - /* Never happens: - if (dn == NULL || ndirs < 1) { - return; - } - */ + if (!dn) + return 0; + dirs = all = 0; for (; *dn; dn++) { - if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) { - if (!first) - bb_putchar('\n'); - first = 0; - printf("%s:\n", (*dn)->fullname); + const char *name; + + all++; + if (!S_ISDIR((*dn)->dn_mode)) + continue; + + name = (*dn)->name; + if (which != SPLIT_SUBDIR /* if not requested to skip . / .. */ + /* or if it's not . or .. */ + || name[0] != '.' + || (name[1] && (name[1] != '.' || name[2])) + ) { + dirs++; } - subdnp = list_dir((*dn)->fullname, &nfiles); -#if ENABLE_DESKTOP - if ((all_fmt & STYLE_MASK) == STYLE_LONG) - printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp)); + } + return which != SPLIT_FILE ? dirs : all - dirs; +} + +/* get memory to hold an array of pointers */ +static struct dnode **dnalloc(unsigned num) +{ + if (num < 1) + return NULL; + + num++; /* so that we have terminating NULL */ + return xzalloc(num * sizeof(struct dnode *)); +} + +#if ENABLE_FEATURE_LS_RECURSIVE +static void dfree(struct dnode **dnp) +{ + unsigned i; + + if (dnp == NULL) + return; + + for (i = 0; dnp[i]; i++) { + struct dnode *cur = dnp[i]; + if (cur->fname_allocated) + free((char*)cur->fullname); + free(cur); + } + free(dnp); +} +#else +#define dfree(...) ((void)0) #endif - if (nfiles > 0) { - /* list all files at this level */ - dnsort(subdnp, nfiles); - showfiles(subdnp, nfiles); - if (ENABLE_FEATURE_LS_RECURSIVE - && (all_fmt & DISP_RECURSIVE) + +/* Returns NULL-terminated malloced vector of pointers (or NULL) */ +static struct dnode **splitdnarray(struct dnode **dn, int which) +{ + unsigned dncnt, d; + struct dnode **dnp; + + if (dn == NULL) + return NULL; + + /* count how many dirs or files there are */ + dncnt = count_dirs(dn, which); + + /* allocate a file array and a dir array */ + dnp = dnalloc(dncnt); + + /* copy the entrys into the file or dir array */ + for (d = 0; *dn; dn++) { + if (S_ISDIR((*dn)->dn_mode)) { + const char *name; + + if (which == SPLIT_FILE) + continue; + + name = (*dn)->name; + if ((which & SPLIT_DIR) /* any dir... */ + /* ... or not . or .. */ + || name[0] != '.' + || (name[1] && (name[1] != '.' || name[2])) ) { - /* recursive - list the sub-dirs */ - dnd = splitdnarray(subdnp, SPLIT_SUBDIR); - dndirs = count_dirs(subdnp, SPLIT_SUBDIR); - if (dndirs > 0) { - dnsort(dnd, dndirs); - showdirs(dnd, 0); - /* free the array of dnode pointers to the dirs */ - free(dnd); - } + dnp[d++] = *dn; } - /* free the dnodes and the fullname mem */ - dfree(subdnp); + } else + if (which == SPLIT_FILE) { + dnp[d++] = *dn; + } + } + return dnp; +} + +#if ENABLE_FEATURE_LS_SORTFILES +static int sortcmp(const void *a, const void *b) +{ + struct dnode *d1 = *(struct dnode **)a; + struct dnode *d2 = *(struct dnode **)b; + unsigned sort_opts = G.all_fmt & SORT_MASK; + off_t dif; + + dif = 0; /* assume SORT_NAME */ + // TODO: use pre-initialized function pointer + // instead of branch forest + if (sort_opts == SORT_SIZE) { + dif = (d2->dn_size - d1->dn_size); + } else + if (sort_opts == SORT_ATIME) { + dif = (d2->dn_atime - d1->dn_atime); + } else + if (sort_opts == SORT_CTIME) { + dif = (d2->dn_ctime - d1->dn_ctime); + } else + if (sort_opts == SORT_MTIME) { + dif = (d2->dn_mtime - d1->dn_mtime); + } else + if (sort_opts == SORT_DIR) { + dif = S_ISDIR(d2->dn_mode) - S_ISDIR(d1->dn_mode); + } else +#if defined(HAVE_STRVERSCMP) && HAVE_STRVERSCMP == 1 + if (sort_opts == SORT_VERSION) { + dif = strverscmp(d1->name, d2->name); + } else +#endif + if (sort_opts == SORT_EXT) { + dif = strcmp(strchrnul(d1->name, '.'), strchrnul(d2->name, '.')); + } + if (dif == 0) { + /* sort by name, use as tie breaker for other sorts */ + if (ENABLE_LOCALE_SUPPORT) + dif = strcoll(d1->name, d2->name); + else + dif = strcmp(d1->name, d2->name); + } + + /* Make dif fit into an int */ + if (sizeof(dif) > sizeof(int)) { + enum { BITS_TO_SHIFT = 8 * (sizeof(dif) - sizeof(int)) }; + /* shift leaving only "int" worth of bits */ + if (dif != 0) { + dif = 1 | (int)((uoff_t)dif >> BITS_TO_SHIFT); } } + + return (G.all_fmt & SORT_REVERSE) ? -(int)dif : (int)dif; } +static void dnsort(struct dnode **dn, int size) +{ + qsort(dn, size, sizeof(*dn), sortcmp); +} + +static void sort_and_display_files(struct dnode **dn, unsigned nfiles) +{ + dnsort(dn, nfiles); + display_files(dn, nfiles); +} +#else +# define dnsort(dn, size) ((void)0) +# define sort_and_display_files(dn, nfiles) display_files(dn, nfiles) +#endif /* Returns NULL-terminated malloced vector of pointers (or NULL) */ -static struct dnode **list_dir(const char *path, unsigned *nfiles_p) +static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p) { struct dnode *dn, *cur, **dnp; struct dirent *entry; DIR *dir; unsigned i, nfiles; - /* Never happens: - if (path == NULL) - return NULL; - */ - *nfiles_p = 0; dir = warn_opendir(path); if (dir == NULL) { - exit_code = EXIT_FAILURE; + G.exit_code = EXIT_FAILURE; return NULL; /* could not open the dir */ } dn = NULL; @@ -898,11 +951,11 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p) /* are we going to list the file- it may be . or .. or a hidden file */ if (entry->d_name[0] == '.') { if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2])) - && !(all_fmt & DISP_DOT) + && !(G.all_fmt & DISP_DOT) ) { continue; } - if (!(all_fmt & DISP_HIDDEN)) + if (!(G.all_fmt & DISP_HIDDEN)) continue; } fullname = concat_path_file(path, entry->d_name); @@ -912,7 +965,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p) continue; } cur->fname_allocated = 1; - cur->next = dn; + cur->dn_next = dn; dn = cur; nfiles++; } @@ -928,7 +981,7 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p) dnp = dnalloc(nfiles); for (i = 0; /* i < nfiles - detected via !dn below */; i++) { dnp[i] = dn; /* save pointer to node in array */ - dn = dn->next; + dn = dn->dn_next; if (!dn) break; } @@ -936,6 +989,77 @@ static struct dnode **list_dir(const char *path, unsigned *nfiles_p) return dnp; } +#if ENABLE_DESKTOP +/* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html + * If any of the -l, -n, -s options is specified, each list + * of files within the directory shall be preceded by a + * status line indicating the number of file system blocks + * occupied by files in the directory in 512-byte units if + * the -k option is not specified, or 1024-byte units if the + * -k option is specified, rounded up to the next integral + * number of units. + */ +/* by Jorgen Overgaard (jorgen AT antistaten.se) */ +static off_t calculate_blocks(struct dnode **dn) +{ + uoff_t blocks = 1; + if (dn) { + while (*dn) { + /* st_blocks is in 512 byte blocks */ + blocks += (*dn)->dn_blocks; + dn++; + } + } + + /* Even though standard says use 512 byte blocks, coreutils use 1k */ + /* Actually, we round up by calculating (blocks + 1) / 2, + * "+ 1" was done when we initialized blocks to 1 */ + return blocks >> 1; +} +#endif + +static void scan_and_display_dirs_recur(struct dnode **dn, int first) +{ + unsigned nfiles; + struct dnode **subdnp; + + for (; *dn; dn++) { + if (G.all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) { + if (!first) + bb_putchar('\n'); + first = 0; + printf("%s:\n", (*dn)->fullname); + } + subdnp = scan_one_dir((*dn)->fullname, &nfiles); +#if ENABLE_DESKTOP + if ((G.all_fmt & STYLE_MASK) == STYLE_LONG) + printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp)); +#endif + if (nfiles > 0) { + /* list all files at this level */ + sort_and_display_files(subdnp, nfiles); + + if (ENABLE_FEATURE_LS_RECURSIVE + && (G.all_fmt & DISP_RECURSIVE) + ) { + struct dnode **dnd; + unsigned dndirs; + /* recursive - list the sub-dirs */ + dnd = splitdnarray(subdnp, SPLIT_SUBDIR); + dndirs = count_dirs(subdnp, SPLIT_SUBDIR); + if (dndirs > 0) { + dnsort(dnd, dndirs); + scan_and_display_dirs_recur(dnd, 0); + /* free the array of dnode pointers to the dirs */ + free(dnd); + } + } + /* free the dnodes and the fullname mem */ + dfree(subdnp); + } + } +} + int ls_main(int argc UNUSED_PARAM, char **argv) { @@ -973,59 +1097,63 @@ int ls_main(int argc UNUSED_PARAM, char **argv) init_unicode(); - all_fmt = LIST_SHORT | - (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_FORWARD)); + if (ENABLE_FEATURE_LS_SORTFILES) + G.all_fmt = SORT_NAME; #if ENABLE_FEATURE_AUTOWIDTH /* obtain the terminal width */ - get_terminal_width_height(STDIN_FILENO, &terminal_width, NULL); + get_terminal_width_height(STDIN_FILENO, &G_terminal_width, NULL); /* go one less... */ - terminal_width--; + G_terminal_width--; #endif /* process options */ IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;) -#if ENABLE_FEATURE_AUTOWIDTH - opt_complementary = "T+:w+"; /* -T N, -w N */ - opt = getopt32(argv, ls_options, &tabstops, &terminal_width - IF_FEATURE_LS_COLOR(, &color_opt)); -#else - opt = getopt32(argv, ls_options IF_FEATURE_LS_COLOR(, &color_opt)); -#endif - for (i = 0; opt_flags[i] != (1U<<31); i++) { + opt_complementary = + /* -e implies -l */ + IF_FEATURE_LS_TIMESTAMPS("el") + /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html: + * in some pairs of opts, only last one takes effect: + */ + IF_FEATURE_LS_TIMESTAMPS(IF_FEATURE_LS_SORTFILES(":t-S:S-t")) /* time/size */ + // ":m-l:l-m" - we don't have -m + IF_FEATURE_LS_FOLLOWLINKS(":H-L:L-H") + ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */ + ":C-1:1-C" /* bycols/oneline */ + ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */ + IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */ + /* -w NUM: */ + IF_FEATURE_AUTOWIDTH(":w+"); + opt = getopt32(argv, ls_options + IF_FEATURE_AUTOWIDTH(, NULL, &G_terminal_width) + IF_FEATURE_LS_COLOR(, &color_opt) + ); + for (i = 0; opt_flags[i] != (1U << 31); i++) { if (opt & (1 << i)) { - unsigned flags = opt_flags[i]; - - if (flags & LIST_MASK_TRIGGER) - all_fmt &= ~LIST_MASK; - if (flags & STYLE_MASK_TRIGGER) - all_fmt &= ~STYLE_MASK; - if (flags & SORT_MASK_TRIGGER) - all_fmt &= ~SORT_MASK; - if (flags & DISP_MASK_TRIGGER) - all_fmt &= ~DISP_MASK; + uint32_t flags = opt_flags[i]; + + if (flags & STYLE_MASK) + G.all_fmt &= ~STYLE_MASK; + if (flags & SORT_MASK) + G.all_fmt &= ~SORT_MASK; if (flags & TIME_MASK) - all_fmt &= ~TIME_MASK; - if (flags & LIST_CONTEXT) - all_fmt |= STYLE_SINGLE; - /* huh?? opt cannot be 'l' */ - //if (LS_DISP_HR && opt == 'l') - // all_fmt &= ~LS_DISP_HR; - all_fmt |= flags; + G.all_fmt &= ~TIME_MASK; + + G.all_fmt |= flags; } } #if ENABLE_FEATURE_LS_COLOR - /* find color bit value - last position for short getopt */ + /* set G_show_color = 1/0 */ if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) { char *p = getenv("LS_COLORS"); /* LS_COLORS is unset, or (not empty && not "none") ? */ if (!p || (p[0] && strcmp(p, "none") != 0)) - show_color = 1; + G_show_color = 1; } if (opt & OPT_color) { if (color_opt[0] == 'n') - show_color = 0; + G_show_color = 0; else switch (index_in_substrings(color_str, color_opt)) { case 3: case 4: @@ -1034,56 +1162,61 @@ int ls_main(int argc UNUSED_PARAM, char **argv) case 0: case 1: case 2: - show_color = 1; + G_show_color = 1; } } } #endif /* sort out which command line options take precedence */ - if (ENABLE_FEATURE_LS_RECURSIVE && (all_fmt & DISP_NOLIST)) - all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */ + if (ENABLE_FEATURE_LS_RECURSIVE && (G.all_fmt & DISP_NOLIST)) + G.all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */ if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) { - if (all_fmt & TIME_CHANGE) - all_fmt = (all_fmt & ~SORT_MASK) | SORT_CTIME; - if (all_fmt & TIME_ACCESS) - all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME; + if (G.all_fmt & TIME_CHANGE) + G.all_fmt = (G.all_fmt & ~SORT_MASK) | SORT_CTIME; + if (G.all_fmt & TIME_ACCESS) + G.all_fmt = (G.all_fmt & ~SORT_MASK) | SORT_ATIME; } - if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */ - all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC); - if (ENABLE_FEATURE_LS_USERNAME) - if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC)) - all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */ + if ((G.all_fmt & STYLE_MASK) != STYLE_LONG) /* not -l? */ + G.all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME); - /* choose a display format */ - if (!(all_fmt & STYLE_MASK)) - all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE); + /* choose a display format if one was not already specified by an option */ + if (!(G.all_fmt & STYLE_MASK)) + G.all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNAR : STYLE_SINGLE); argv += optind; if (!argv[0]) *--argv = (char*)"."; if (argv[1]) - all_fmt |= DISP_DIRNAME; /* 2 or more items? label directories */ + G.all_fmt |= DISP_DIRNAME; /* 2 or more items? label directories */ /* stuff the command line file names into a dnode array */ dn = NULL; nfiles = 0; do { - /* NB: follow links on command line unless -l or -s */ - cur = my_stat(*argv, *argv, !(all_fmt & (STYLE_LONG|LIST_BLOCKS))); + cur = my_stat(*argv, *argv, + /* follow links on command line unless -l, -s or -F: */ + !((G.all_fmt & STYLE_MASK) == STYLE_LONG + || (G.all_fmt & LIST_BLOCKS) + || (option_mask32 & OPT_F) + ) + /* ... or if -H: */ + || (option_mask32 & OPT_H) + /* ... or if -L, but my_stat always follows links if -L */ + ); argv++; if (!cur) continue; - cur->fname_allocated = 0; - cur->next = dn; + /*cur->fname_allocated = 0; - already is */ + cur->dn_next = dn; dn = cur; nfiles++; } while (*argv); /* nfiles _may_ be 0 here - try "ls doesnt_exist" */ if (nfiles == 0) - return exit_code; + return G.exit_code; /* now that we know how many files there are * allocate memory for an array to hold dnode pointers @@ -1091,33 +1224,32 @@ int ls_main(int argc UNUSED_PARAM, char **argv) dnp = dnalloc(nfiles); for (i = 0; /* i < nfiles - detected via !dn below */; i++) { dnp[i] = dn; /* save pointer to node in array */ - dn = dn->next; + dn = dn->dn_next; if (!dn) break; } - if (all_fmt & DISP_NOLIST) { - dnsort(dnp, nfiles); - showfiles(dnp, nfiles); + if (G.all_fmt & DISP_NOLIST) { + sort_and_display_files(dnp, nfiles); } else { dnd = splitdnarray(dnp, SPLIT_DIR); dnf = splitdnarray(dnp, SPLIT_FILE); dndirs = count_dirs(dnp, SPLIT_DIR); dnfiles = nfiles - dndirs; if (dnfiles > 0) { - dnsort(dnf, dnfiles); - showfiles(dnf, dnfiles); + sort_and_display_files(dnf, dnfiles); if (ENABLE_FEATURE_CLEAN_UP) free(dnf); } if (dndirs > 0) { dnsort(dnd, dndirs); - showdirs(dnd, dnfiles == 0); + scan_and_display_dirs_recur(dnd, dnfiles == 0); if (ENABLE_FEATURE_CLEAN_UP) free(dnd); } } + if (ENABLE_FEATURE_CLEAN_UP) dfree(dnp); - return exit_code; + return G.exit_code; } diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index 3d50bb0..1a5342e 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c @@ -3,22 +3,85 @@ * Copyright (C) 2003 Glenn L. McGrath * Copyright (C) 2003-2004 Erik Andersen * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define md5sum_trivial_usage +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..." +//usage:#define md5sum_full_usage "\n\n" +//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" +//usage: "\n -c Check sums against list in FILEs" +//usage: "\n -s Don't output anything, status code shows success" +//usage: "\n -w Warn about improperly formatted checksum lines" +//usage: ) +//usage: +//usage:#define md5sum_example_usage +//usage: "$ md5sum < busybox\n" +//usage: "6fd11e98b98a58f64ff3398d7b324003\n" +//usage: "$ md5sum busybox\n" +//usage: "6fd11e98b98a58f64ff3398d7b324003 busybox\n" +//usage: "$ md5sum -c -\n" +//usage: "6fd11e98b98a58f64ff3398d7b324003 busybox\n" +//usage: "busybox: OK\n" +//usage: "^D\n" +//usage: +//usage:#define sha1sum_trivial_usage +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..." +//usage:#define sha1sum_full_usage "\n\n" +//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums" +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" +//usage: "\n -c Check sums against list in FILEs" +//usage: "\n -s Don't output anything, status code shows success" +//usage: "\n -w Warn about improperly formatted checksum lines" +//usage: ) +//usage: +//usage:#define sha256sum_trivial_usage +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..." +//usage:#define sha256sum_full_usage "\n\n" +//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums" +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" +//usage: "\n -c Check sums against list in FILEs" +//usage: "\n -s Don't output anything, status code shows success" +//usage: "\n -w Warn about improperly formatted checksum lines" +//usage: ) +//usage: +//usage:#define sha512sum_trivial_usage +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..." +//usage:#define sha512sum_full_usage "\n\n" +//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums" +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" +//usage: "\n -c Check sums against list in FILEs" +//usage: "\n -s Don't output anything, status code shows success" +//usage: "\n -w Warn about improperly formatted checksum lines" +//usage: ) +//usage: +//usage:#define sha3sum_trivial_usage +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..." +//usage:#define sha3sum_full_usage "\n\n" +//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA3-512 checksums" +//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" +//usage: "\n -c Check sums against list in FILEs" +//usage: "\n -s Don't output anything, status code shows success" +//usage: "\n -w Warn about improperly formatted checksum lines" +//usage: ) + #include "libbb.h" -typedef enum { +/* This is a NOEXEC applet. Be very careful! */ + +enum { /* 4th letter of applet_name is... */ HASH_MD5 = 's', /* "md5>s 0) { + update(&context, in_buf, count); + } + hash_value = NULL; + if (count < 0) + bb_perror_msg("can't read '%s'", filename); + else /* count == 0 */ { + final(&context, in_buf); + hash_value = hash_bin_to_hex(in_buf, hash_len); + } + RELEASE_CONFIG_BUFFER(in_buf); } - RELEASE_CONFIG_BUFFER(in_buf); - if (src_fd != STDIN_FILENO) { close(src_fd); } @@ -97,98 +171,90 @@ int md5_sha1_sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv) { int return_value = EXIT_SUCCESS; - uint8_t *hash_value; unsigned flags; - /*hash_algo_t hash_algo = applet_name[3];*/ if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) { /* -b "binary", -t "text" are ignored (shaNNNsum compat) */ flags = getopt32(argv, "scwbt"); + argv += optind; + //argc -= optind; + } else { + argv += 1; + //argc -= 1; } - else optind = 1; - argv += optind; - //argc -= optind; if (!*argv) *--argv = (char*)"-"; if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && !(flags & FLAG_CHECK)) { if (flags & FLAG_SILENT) { - bb_error_msg_and_die - ("-%c is meaningful only when verifying checksums", 's'); - } else if (flags & FLAG_WARN) { - bb_error_msg_and_die - ("-%c is meaningful only when verifying checksums", 'w'); + bb_error_msg_and_die("-%c is meaningful only with -c", 's'); + } + if (flags & FLAG_WARN) { + bb_error_msg_and_die("-%c is meaningful only with -c", 'w'); } } - if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) { - FILE *pre_computed_stream; - int count_total = 0; - int count_failed = 0; - char *line; + do { + if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) { + FILE *pre_computed_stream; + char *line; + int count_total = 0; + int count_failed = 0; - if (argv[1]) { - bb_error_msg_and_die - ("only one argument may be specified when using -c"); - } + pre_computed_stream = xfopen_stdin(*argv); - pre_computed_stream = xfopen_stdin(argv[0]); + while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) { + uint8_t *hash_value; + char *filename_ptr; - while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) { - char *filename_ptr; + count_total++; + filename_ptr = strstr(line, " "); + /* handle format for binary checksums */ + if (filename_ptr == NULL) { + filename_ptr = strstr(line, " *"); + } + if (filename_ptr == NULL) { + if (flags & FLAG_WARN) { + bb_error_msg("invalid format"); + } + count_failed++; + return_value = EXIT_FAILURE; + free(line); + continue; + } + *filename_ptr = '\0'; + filename_ptr += 2; - count_total++; - filename_ptr = strstr(line, " "); - /* handle format for binary checksums */ - if (filename_ptr == NULL) { - filename_ptr = strstr(line, " *"); - } - if (filename_ptr == NULL) { - if (flags & FLAG_WARN) { - bb_error_msg("invalid format"); + hash_value = hash_file(filename_ptr); + + if (hash_value && (strcmp((char*)hash_value, line) == 0)) { + if (!(flags & FLAG_SILENT)) + printf("%s: OK\n", filename_ptr); + } else { + if (!(flags & FLAG_SILENT)) + printf("%s: FAILED\n", filename_ptr); + count_failed++; + return_value = EXIT_FAILURE; } - count_failed++; - return_value = EXIT_FAILURE; + /* possible free(NULL) */ + free(hash_value); free(line); - continue; } - *filename_ptr = '\0'; - filename_ptr += 2; - - hash_value = hash_file(filename_ptr /*, hash_algo*/); - - if (hash_value && (strcmp((char*)hash_value, line) == 0)) { - if (!(flags & FLAG_SILENT)) - printf("%s: OK\n", filename_ptr); - } else { - if (!(flags & FLAG_SILENT)) - printf("%s: FAILED\n", filename_ptr); - count_failed++; - return_value = EXIT_FAILURE; + if (count_failed && !(flags & FLAG_SILENT)) { + bb_error_msg("WARNING: %d of %d computed checksums did NOT match", + count_failed, count_total); } - /* possible free(NULL) */ - free(hash_value); - free(line); - } - if (count_failed && !(flags & FLAG_SILENT)) { - bb_error_msg("WARNING: %d of %d computed checksums did NOT match", - count_failed, count_total); - } - /* - if (fclose_if_not_stdin(pre_computed_stream) == EOF) { - bb_perror_msg_and_die("can't close file %s", file_ptr); - } - */ - } else { - do { - hash_value = hash_file(*argv/*, hash_algo*/); + fclose_if_not_stdin(pre_computed_stream); + } else { + uint8_t *hash_value = hash_file(*argv); if (hash_value == NULL) { return_value = EXIT_FAILURE; } else { printf("%s %s\n", hash_value, *argv); free(hash_value); } - } while (*++argv); - } + } + } while (*++argv); + return return_value; } diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index c837e97..4a8e43e 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -4,7 +4,7 @@ * * Copyright (C) 2001 Matt Kraai * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ @@ -19,6 +19,24 @@ /* Nov 28, 2006 Yoshinori Sato : Add SELinux Support. */ +//usage:#define mkdir_trivial_usage +//usage: "[OPTIONS] DIRECTORY..." +//usage:#define mkdir_full_usage "\n\n" +//usage: "Create DIRECTORY\n" +//usage: "\n -m MODE Mode" +//usage: "\n -p No error if exists; make parent directories as needed" +//usage: IF_SELINUX( +//usage: "\n -Z Set security context" +//usage: ) +//usage: +//usage:#define mkdir_example_usage +//usage: "$ mkdir /tmp/foo\n" +//usage: "$ mkdir /tmp/foo\n" +//usage: "/tmp/foo: File exists\n" +//usage: "$ mkdir /tmp/foo/bar/baz\n" +//usage: "/tmp/foo/bar/baz: No such file or directory\n" +//usage: "$ mkdir -p /tmp/foo/bar/baz\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ @@ -30,13 +48,14 @@ static const char mkdir_longopts[] ALIGN1 = #if ENABLE_SELINUX "context\0" Required_argument "Z" #endif + "verbose\0" No_argument "v" ; #endif int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mkdir_main(int argc UNUSED_PARAM, char **argv) { - mode_t mode = (mode_t)(-1); + long mode = -1; int status = EXIT_SUCCESS; int flags = 0; unsigned opt; @@ -48,12 +67,13 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS applet_long_options = mkdir_longopts; #endif - opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext)); + opt = getopt32(argv, "m:p" IF_SELINUX("Z:") "v", &smode IF_SELINUX(,&scontext)); if (opt & 1) { - mode = 0777; - if (!bb_parse_mode(smode, &mode)) { + mode_t mmode = 0777; + if (!bb_parse_mode(smode, &mmode)) { bb_error_msg_and_die("invalid mode '%s'", smode); } + mode = mmode; } if (opt & 2) flags |= FILEUTILS_RECUR; diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c index 6549460..ef58325 100644 --- a/coreutils/mkfifo.c +++ b/coreutils/mkfifo.c @@ -4,15 +4,26 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/mkfifo.html */ +//usage:#define mkfifo_trivial_usage +//usage: "[-m MODE] " IF_SELINUX("[-Z] ") "NAME" +//usage:#define mkfifo_full_usage "\n\n" +//usage: "Create named pipe\n" +//usage: "\n -m MODE Mode (default a=rw)" +//usage: IF_SELINUX( +//usage: "\n -Z Set security context" +//usage: ) + #include "libbb.h" #include "libcoreutils/coreutils.h" +/* This is a NOEXEC applet. Be very careful! */ + int mkfifo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mkfifo_main(int argc UNUSED_PARAM, char **argv) { @@ -28,7 +39,7 @@ int mkfifo_main(int argc UNUSED_PARAM, char **argv) do { if (mkfifo(*argv, mode) < 0) { - bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */ + bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */ retval = EXIT_FAILURE; } } while (*++argv); diff --git a/coreutils/mknod.c b/coreutils/mknod.c index 0c69494..aa04504 100644 --- a/coreutils/mknod.c +++ b/coreutils/mknod.c @@ -4,16 +4,35 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ +//usage:#define mknod_trivial_usage +//usage: "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR" +//usage:#define mknod_full_usage "\n\n" +//usage: "Create a special file (block, character, or pipe)\n" +//usage: "\n -m MODE Creation mode (default a=rw)" +//usage: IF_SELINUX( +//usage: "\n -Z Set security context" +//usage: ) +//usage: "\nTYPE:" +//usage: "\n b Block device" +//usage: "\n c or u Character device" +//usage: "\n p Named pipe (MAJOR and MINOR are ignored)" +//usage: +//usage:#define mknod_example_usage +//usage: "$ mknod /dev/fd0 b 2 0\n" +//usage: "$ mknod -m 644 /tmp/pipe p\n" + #include // For makedev #include "libbb.h" #include "libcoreutils/coreutils.h" +/* This is a NOEXEC applet. Be very careful! */ + static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 }; static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK }; @@ -40,7 +59,7 @@ int mknod_main(int argc, char **argv) /* Autodetect what the system supports; these macros should * optimize out to two constants. */ dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)), - xatoul_range(argv[3], 0, minor(UINT_MAX))); + xatoul_range(argv[3], 0, minor(UINT_MAX))); } } diff --git a/coreutils/mv.c b/coreutils/mv.c index 1c5a467..f127dfa 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -5,7 +5,7 @@ * Copyright (C) 2000 by Matt Kraai * SELinux support by Yuichi Nakamura * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) @@ -16,15 +16,30 @@ #include "libbb.h" #include "libcoreutils/coreutils.h" +//usage:#define mv_trivial_usage +//usage: "[-fin] SOURCE DEST\n" +//usage: "or: mv [-fin] SOURCE... DIRECTORY" +//usage:#define mv_full_usage "\n\n" +//usage: "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" +//usage: "\n -f Don't prompt before overwriting" +//usage: "\n -i Interactive, prompt before overwrite" +//usage: "\n -n Don't overwrite an existing file" +//usage: +//usage:#define mv_example_usage +//usage: "$ mv /tmp/foo /bin/bar\n" + #if ENABLE_FEATURE_MV_LONG_OPTIONS static const char mv_longopts[] ALIGN1 = "interactive\0" No_argument "i" "force\0" No_argument "f" + "no-clobber\0" No_argument "n" + "verbose\0" No_argument "v" ; #endif -#define OPT_FILEUTILS_FORCE 1 -#define OPT_FILEUTILS_INTERACTIVE 2 +#define OPT_FORCE (1 << 0) +#define OPT_INTERACTIVE (1 << 1) +#define OPT_NOCLOBBER (1 << 2) int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mv_main(int argc, char **argv) @@ -40,10 +55,13 @@ int mv_main(int argc, char **argv) #if ENABLE_FEATURE_MV_LONG_OPTIONS applet_long_options = mv_longopts; #endif - // Need at least two arguments - // -f unsets -i, -i unsets -f - opt_complementary = "-2:f-i:i-f"; - flags = getopt32(argv, "fi"); + /* Need at least two arguments. + * If more than one of -f, -i, -n is specified , only the final one + * takes effect (it unsets previous options). + * -v is accepted but ignored. + */ + opt_complementary = "-2:f-in:i-fn:n-fi"; + flags = getopt32(argv, "finv"); argc -= optind; argv += optind; last = argv[argc - 1]; @@ -68,18 +86,22 @@ int mv_main(int argc, char **argv) } DO_MOVE: - if (dest_exists - && !(flags & OPT_FILEUTILS_FORCE) - && ((access(dest, W_OK) < 0 && isatty(0)) - || (flags & OPT_FILEUTILS_INTERACTIVE)) - ) { - if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) { - goto RET_1; /* Ouch! fprintf failed! */ - } - if (!bb_ask_confirmation()) { + if (dest_exists) { + if (flags & OPT_NOCLOBBER) goto RET_0; + if (!(flags & OPT_FORCE) + && ((access(dest, W_OK) < 0 && isatty(0)) + || (flags & OPT_INTERACTIVE)) + ) { + if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) { + goto RET_1; /* Ouch! fprintf failed! */ + } + if (!bb_ask_confirmation()) { + goto RET_0; + } } } + if (rename(*argv, dest) < 0) { struct stat source_stat; int source_exists; diff --git a/coreutils/nice.c b/coreutils/nice.c index ff3eb11..ce75991 100644 --- a/coreutils/nice.c +++ b/coreutils/nice.c @@ -4,9 +4,15 @@ * * Copyright (C) 2005 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define nice_trivial_usage +//usage: "[-n ADJUST] [PROG ARGS]" +//usage:#define nice_full_usage "\n\n" +//usage: "Change scheduling priority, run PROG\n" +//usage: "\n -n ADJUST Adjust priority by ADJUST" + #include #include "libbb.h" @@ -17,12 +23,12 @@ int nice_main(int argc, char **argv) old_priority = getpriority(PRIO_PROCESS, 0); - if (!*++argv) { /* No args, so (GNU) output current nice value. */ + if (!*++argv) { /* No args, so (GNU) output current nice value. */ printf("%d\n", old_priority); fflush_stdout_and_exit(EXIT_SUCCESS); } - adjustment = 10; /* Set default adjustment. */ + adjustment = 10; /* Set default adjustment. */ if (argv[0][0] == '-') { if (argv[0][1] == 'n') { /* -n */ @@ -32,7 +38,7 @@ int nice_main(int argc, char **argv) } else { /* -NNN (NNN may be negative) == -n NNN */ argv[0] += 1; argv--; argc++; } - if (argc < 4) { /* Missing priority and/or utility! */ + if (argc < 4) { /* Missing priority and/or utility! */ bb_show_usage(); } adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2); diff --git a/coreutils/nohup.c b/coreutils/nohup.c index 3dc5314..63853fd 100644 --- a/coreutils/nohup.c +++ b/coreutils/nohup.c @@ -7,9 +7,17 @@ * Copyright 2006 Rob Landley * Copyright 2006 Bernhard Reutner-Fischer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define nohup_trivial_usage +//usage: "PROG ARGS" +//usage:#define nohup_full_usage "\n\n" +//usage: "Run PROG immune to hangups, with output to a non-tty" +//usage: +//usage:#define nohup_example_usage +//usage: "$ nohup make &" + #include "libbb.h" /* Compat info: nohup (GNU coreutils 6.8) does this: diff --git a/coreutils/od.c b/coreutils/od.c index 228db19..fb11fcf 100644 --- a/coreutils/od.c +++ b/coreutils/od.c @@ -4,13 +4,19 @@ * Based on code from util-linux v 2.11l * * Copyright (c) 1990 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Original copyright notice is retained at the end of this file. */ +//usage:#if !ENABLE_DESKTOP +//usage:#define od_trivial_usage +//usage: "[-aBbcDdeFfHhIiLlOovXx] [FILE]" +//usage:#define od_full_usage "\n\n" +//usage: "Print FILE (or stdin) unambiguously, as octal bytes by default" +//usage:#endif #include "libbb.h" #if ENABLE_DESKTOP @@ -110,7 +116,7 @@ odoffset(dumper_t *dumper, int argc, char ***argvp) * the offset is changed as well. This isn't pretty, * but it's easy. */ -#define TYPE_OFFSET 7 +#define TYPE_OFFSET 7 { char x_or_d; if (base == 16) { @@ -130,19 +136,19 @@ odoffset(dumper_t *dumper, int argc, char ***argvp) } static const char *const add_strings[] = { - "16/1 \"%3_u \" \"\\n\"", /* a */ - "8/2 \" %06o \" \"\\n\"", /* B, o */ - "16/1 \"%03o \" \"\\n\"", /* b */ - "16/1 \"%3_c \" \"\\n\"", /* c */ - "8/2 \" %05u \" \"\\n\"", /* d */ - "4/4 \" %010u \" \"\\n\"", /* D */ - "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ - "4/4 \" %14.7e \" \"\\n\"", /* f */ - "4/4 \" %08x \" \"\\n\"", /* H, X */ - "8/2 \" %04x \" \"\\n\"", /* h, x */ - "4/4 \" %11d \" \"\\n\"", /* I, L, l */ - "8/2 \" %6d \" \"\\n\"", /* i */ - "4/4 \" %011o \" \"\\n\"", /* O */ + "16/1 \"%3_u \" \"\\n\"", /* a */ + "8/2 \" %06o \" \"\\n\"", /* B, o */ + "16/1 \"%03o \" \"\\n\"", /* b */ + "16/1 \"%3_c \" \"\\n\"", /* c */ + "8/2 \" %05u \" \"\\n\"", /* d */ + "4/4 \" %010u \" \"\\n\"", /* D */ + "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ + "4/4 \" %14.7e \" \"\\n\"", /* f */ + "4/4 \" %08x \" \"\\n\"", /* H, X */ + "8/2 \" %04x \" \"\\n\"", /* h, x */ + "4/4 \" %11d \" \"\\n\"", /* I, L, l */ + "8/2 \" %6d \" \"\\n\"", /* i */ + "4/4 \" %011o \" \"\\n\"", /* O */ }; static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; @@ -174,7 +180,7 @@ int od_main(int argc, char **argv) bb_dump_add(dumper, "\" \""); } bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); - } else { /* P, p, s, w, or other unhandled */ + } else { /* P, p, s, w, or other unhandled */ bb_show_usage(); } } diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index a9a45c8..2c26dda 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c @@ -13,48 +13,64 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ /* Written by Jim Meyering. */ +/* Busyboxed by Denys Vlasenko, based on od.c from coreutils-5.2.1 */ -/* Busyboxed by Denys Vlasenko - -Based on od.c from coreutils-5.2.1 -Top bloat sources: -00000073 t parse_old_offset -0000007b t get_lcm -00000090 r long_options -00000092 t print_named_ascii -000000bf t print_ascii -00000168 t write_block -00000366 t decode_format_string -00000a71 T od_main - -Tested for compat with coreutils 6.3 -using this script. Minor differences fixed. +/* #include "libbb.h" - done in od.c */ +#define assert(a) ((void)0) -#!/bin/sh -echo STD -time /path/to/coreutils/od \ -...params... \ ->std -echo Exit code $? -echo BBOX -time ./busybox od \ -...params... \ ->bbox -echo Exit code $? -diff -u -a std bbox >bbox.diff || { echo Different!; sleep 1; } -*/ +//usage:#if ENABLE_DESKTOP +//usage:#define od_trivial_usage +//usage: "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE]..." +// We don't support: +// ... [FILE] [[+]OFFSET[.][b]] +// Support is buggy for: +// od --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.][b]] + +//usage:#define od_full_usage "\n\n" +//usage: "Print FILEs (or stdin) unambiguously, as octal bytes by default" +//usage:#endif + +enum { + OPT_A = 1 << 0, + OPT_N = 1 << 1, + OPT_a = 1 << 2, + OPT_b = 1 << 3, + OPT_c = 1 << 4, + OPT_d = 1 << 5, + OPT_f = 1 << 6, + OPT_h = 1 << 7, + OPT_i = 1 << 8, + OPT_j = 1 << 9, + OPT_l = 1 << 10, + OPT_o = 1 << 11, + OPT_t = 1 << 12, + /* When zero and two or more consecutive blocks are equal, format + only the first block and output an asterisk alone on the following + line to indicate that identical blocks have been elided: */ + OPT_v = 1 << 13, + OPT_x = 1 << 14, + OPT_s = 1 << 15, + OPT_S = 1 << 16, + OPT_w = 1 << 17, + OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS, +}; -#include "libbb.h" +#define OD_GETOPT32() getopt32(argv, \ + "A:N:abcdfhij:lot:vxsS:w::", \ + /* -w with optional param */ \ + /* -S was -s and also had optional parameter */ \ + /* but in coreutils 6.3 it was renamed and now has */ \ + /* _mandatory_ parameter */ \ + &str_A, &str_N, &str_j, &lst_t, &str_S, &bytes_per_block) -#define assert(a) ((void)0) /* Check for 0x7f is a coreutils 6.3 addition */ -#define ISPRINT(c) (((c)>=' ') && (c) != 0x7f) +#define ISPRINT(c) (((c) >= ' ') && (c) < 0x7f) typedef long double longdouble_t; typedef unsigned long long ulonglong_t; @@ -158,17 +174,9 @@ struct ERR_width_bytes_has_bad_size { char ERR_width_bytes_has_bad_size[ARRAY_SIZE(width_bytes) == N_SIZE_SPECS ? 1 : -1]; }; -static smallint flag_dump_strings; -/* Non-zero if an old-style 'pseudo-address' was specified. */ -static smallint flag_pseudo_start; -static smallint limit_bytes_to_format; -/* When zero and two or more consecutive blocks are equal, format - only the first block and output an asterisk alone on the following - line to indicate that identical blocks have been elided. */ -static smallint verbose; -static smallint ioerror; +static smallint exit_code; -static size_t string_min; +static unsigned string_min; /* An array of specs describing how to format each input block. */ static size_t n_specs; @@ -179,7 +187,11 @@ static struct tspec *spec; static void (*format_address)(off_t, char); /* The difference between the old-style pseudo starting address and the number of bytes to skip. */ +#if ENABLE_LONG_OPTS static off_t pseudo_offset; +#else +enum { pseudo_offset = 0 }; +#endif /* When zero, MAX_BYTES_TO_FORMAT and END_OFFSET are ignored, and all input is formatted. */ @@ -214,7 +226,7 @@ static const unsigned char integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1] ALIGN1 #define MAX_FP_TYPE_SIZE sizeof(longdouble_t) static const unsigned char fp_type_size[MAX_FP_TYPE_SIZE + 1] ALIGN1 = { - /* gcc seems to allow repeated indexes. Last one stays */ + /* gcc seems to allow repeated indexes. Last one wins */ [sizeof(longdouble_t)] = FLOAT_LONG_DOUBLE, [sizeof(double)] = FLOAT_DOUBLE, [sizeof(float)] = FLOAT_SINGLE @@ -376,7 +388,7 @@ print_named_ascii(size_t n_bytes, const char *block, }; // buf[N] pos: 01234 56789 char buf[12] = " x\0 0xx\0"; - // actually " x\0 xxx\0", but I want to share the string with below. + // actually " x\0 xxx\0", but want to share string with print_ascii. // [12] because we take three 32bit stack slots anyway, and // gcc is too dumb to initialize with constant stores, // it copies initializer from rodata. Oh well. @@ -472,10 +484,10 @@ open_next_file(void) if (in_stream) { break; } - ioerror = 1; + exit_code = 1; } - if (limit_bytes_to_format && !flag_dump_strings) + if ((option_mask32 & (OPT_N|OPT_S)) == OPT_N) setbuf(in_stream, NULL); } @@ -495,15 +507,14 @@ check_and_close(void) ? bb_msg_standard_input : file_list[-1] ); - ioerror = 1; + exit_code = 1; } fclose_if_not_stdin(in_stream); in_stream = NULL; } if (ferror(stdout)) { - bb_error_msg(bb_msg_write_error); - ioerror = 1; + bb_error_msg_and_die(bb_msg_write_error); } } @@ -535,7 +546,6 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec) unsigned field_width = 0; int pos; - switch (*s) { case 'd': case 'o': @@ -781,7 +791,7 @@ skip(off_t n_skip) /* take "check & close / open_next" route */ } else { if (fseeko(in_stream, n_skip, SEEK_CUR) != 0) - ioerror = 1; + exit_code = 1; return; } } else { @@ -882,7 +892,8 @@ write_block(off_t current_offset, size_t n_bytes, static char prev_pair_equal = 0; size_t i; - if (!verbose && !first + if (!(option_mask32 & OPT_v) + && !first && n_bytes == bytes_per_block && memcmp(prev_block, curr_block, bytes_per_block) == 0 ) { @@ -904,9 +915,9 @@ write_block(off_t current_offset, size_t n_bytes, (*spec[i].print_function) (n_bytes, curr_block, spec[i].fmt_string); if (spec[i].hexl_mode_trailer) { /* space-pad out to full line width, then dump the trailer */ - int datum_width = width_bytes[spec[i].size]; - int blank_fields = (bytes_per_block - n_bytes) / datum_width; - int field_width = spec[i].field_width + 1; + unsigned datum_width = width_bytes[spec[i].size]; + unsigned blank_fields = (bytes_per_block - n_bytes) / datum_width; + unsigned field_width = spec[i].field_width + 1; printf("%*s", blank_fields * field_width, ""); dump_hexl_mode_trailer(n_bytes, curr_block); } @@ -954,42 +965,6 @@ get_lcm(void) return l_c_m; } -#if ENABLE_LONG_OPTS -/* If S is a valid traditional offset specification with an optional - leading '+' return nonzero and set *OFFSET to the offset it denotes. */ - -static int -parse_old_offset(const char *s, off_t *offset) -{ - static const struct suffix_mult Bb[] = { - { "B", 1024 }, - { "b", 512 }, - { "", 0 } - }; - char *p; - int radix; - - /* Skip over any leading '+'. */ - if (s[0] == '+') ++s; - - /* Determine the radix we'll use to interpret S. If there is a '.', - * it's decimal, otherwise, if the string begins with '0X'or '0x', - * it's hexadecimal, else octal. */ - p = strchr(s, '.'); - radix = 8; - if (p) { - p[0] = '\0'; /* cheating */ - radix = 10; - } else if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - radix = 16; - - *offset = xstrtooff_sfx(s, radix, Bb); - if (p) p[0] = '.'; - - return (*offset >= 0); -} -#endif - /* Read a chunk of size BYTES_PER_BLOCK from the input files, write the formatted block to standard output, and repeat until the specified maximum number of bytes has been read or until all input has been @@ -1007,27 +982,25 @@ dump(off_t current_offset, off_t end_offset) int idx; size_t n_bytes_read; - block[0] = xmalloc(2*bytes_per_block); + block[0] = xmalloc(2 * bytes_per_block); block[1] = block[0] + bytes_per_block; idx = 0; - if (limit_bytes_to_format) { + if (option_mask32 & OPT_N) { while (1) { size_t n_needed; if (current_offset >= end_offset) { n_bytes_read = 0; break; } - n_needed = MIN(end_offset - current_offset, - (off_t) bytes_per_block); + n_needed = MIN(end_offset - current_offset, (off_t) bytes_per_block); read_block(n_needed, block[idx], &n_bytes_read); if (n_bytes_read < bytes_per_block) break; assert(n_bytes_read == bytes_per_block); - write_block(current_offset, n_bytes_read, - block[!idx], block[idx]); + write_block(current_offset, n_bytes_read, block[idx ^ 1], block[idx]); current_offset += n_bytes_read; - idx = !idx; + idx ^= 1; } } else { while (1) { @@ -1035,10 +1008,9 @@ dump(off_t current_offset, off_t end_offset) if (n_bytes_read < bytes_per_block) break; assert(n_bytes_read == bytes_per_block); - write_block(current_offset, n_bytes_read, - block[!idx], block[idx]); + write_block(current_offset, n_bytes_read, block[idx ^ 1], block[idx]); current_offset += n_bytes_read; - idx = !idx; + idx ^= 1; } } @@ -1049,46 +1021,23 @@ dump(off_t current_offset, off_t end_offset) l_c_m = get_lcm(); /* Make bytes_to_write the smallest multiple of l_c_m that - is at least as large as n_bytes_read. */ + is at least as large as n_bytes_read. */ bytes_to_write = l_c_m * ((n_bytes_read + l_c_m - 1) / l_c_m); memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read); write_block(current_offset, bytes_to_write, - block[!idx], block[idx]); + block[idx ^ 1], block[idx]); current_offset += n_bytes_read; } format_address(current_offset, '\n'); - if (limit_bytes_to_format && current_offset >= end_offset) + if ((option_mask32 & OPT_N) && current_offset >= end_offset) check_and_close(); free(block[0]); } -/* Read a single byte into *C from the concatenation of the input files - named in the global array FILE_LIST. On the first call to this - function, the global variable IN_STREAM is expected to be an open - stream associated with the input file INPUT_FILENAME. If IN_STREAM - is at end-of-file, close it and update the global variables IN_STREAM - and INPUT_FILENAME so they correspond to the next file in the list. - Then try to read a byte from the newly opened file. Repeat if - necessary until EOF is reached for the last file in FILE_LIST, then - set *C to EOF and return. Subsequent calls do likewise. */ - -static void -read_char(int *c) -{ - while (in_stream) { /* !EOF */ - *c = fgetc(in_stream); - if (*c != EOF) - return; - check_and_close(); - open_next_file(); - } - *c = EOF; -} - /* Read N bytes into BLOCK from the concatenation of the input files named in the global array FILE_LIST. On the first call to this function, the global variable IN_STREAM is expected to be an open @@ -1112,8 +1061,8 @@ read_char(int *c) static void dump_strings(off_t address, off_t end_offset) { - size_t bufsize = MAX(100, string_min); - char *buf = xmalloc(bufsize); + unsigned bufsize = MAX(100, string_min); + unsigned char *buf = xmalloc(bufsize); while (1) { size_t i; @@ -1121,19 +1070,25 @@ dump_strings(off_t address, off_t end_offset) /* See if the next 'string_min' chars are all printing chars. */ tryline: - if (limit_bytes_to_format && (end_offset - string_min <= address)) + if ((option_mask32 & OPT_N) && (end_offset - string_min <= address)) break; i = 0; - while (!limit_bytes_to_format || address < end_offset) { + while (!(option_mask32 & OPT_N) || address < end_offset) { if (i == bufsize) { bufsize += bufsize/8; buf = xrealloc(buf, bufsize); } - read_char(&c); - if (c < 0) { /* EOF */ - free(buf); - return; + + while (in_stream) { /* !EOF */ + c = fgetc(in_stream); + if (c != EOF) + goto got_char; + check_and_close(); + open_next_file(); } + /* EOF */ + goto ret; + got_char: address++; if (!c) break; @@ -1145,8 +1100,7 @@ dump_strings(off_t address, off_t end_offset) if (i < string_min) /* Too short! */ goto tryline; - /* If we get here, the string is all printable and NUL-terminated, - * so print it. It is all in 'buf' and 'i' is its length. */ + /* If we get here, the string is all printable and NUL-terminated */ buf[i] = 0; format_address(address - i - 1, ' '); @@ -1167,41 +1121,51 @@ dump_strings(off_t address, off_t end_offset) /* We reach this point only if we search through (max_bytes_to_format - string_min) bytes before reaching EOF. */ - free(buf); - check_and_close(); + ret: + free(buf); } -int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int od_main(int argc, char **argv) +#if ENABLE_LONG_OPTS +/* If S is a valid traditional offset specification with an optional + leading '+' return nonzero and set *OFFSET to the offset it denotes. */ + +static int +parse_old_offset(const char *s, off_t *offset) { - static const struct suffix_mult bkm[] = { + static const struct suffix_mult Bb[] = { + { "B", 1024 }, { "b", 512 }, - { "k", 1024 }, - { "m", 1024*1024 }, { "", 0 } }; - enum { - OPT_A = 1 << 0, - OPT_N = 1 << 1, - OPT_a = 1 << 2, - OPT_b = 1 << 3, - OPT_c = 1 << 4, - OPT_d = 1 << 5, - OPT_f = 1 << 6, - OPT_h = 1 << 7, - OPT_i = 1 << 8, - OPT_j = 1 << 9, - OPT_l = 1 << 10, - OPT_o = 1 << 11, - OPT_t = 1 << 12, - OPT_v = 1 << 13, - OPT_x = 1 << 14, - OPT_s = 1 << 15, - OPT_S = 1 << 16, - OPT_w = 1 << 17, - OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS, - }; + char *p; + int radix; + + /* Skip over any leading '+'. */ + if (s[0] == '+') ++s; + if (!isdigit(s[0])) return 0; /* not a number */ + + /* Determine the radix we'll use to interpret S. If there is a '.', + * it's decimal, otherwise, if the string begins with '0X'or '0x', + * it's hexadecimal, else octal. */ + p = strchr(s, '.'); + radix = 8; + if (p) { + p[0] = '\0'; /* cheating */ + radix = 10; + } else if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + radix = 16; + + *offset = xstrtooff_sfx(s, radix, Bb); + if (p) p[0] = '.'; + + return (*offset >= 0); +} +#endif + +int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int od_main(int argc UNUSED_PARAM, char **argv) +{ #if ENABLE_LONG_OPTS static const char od_longopts[] ALIGN1 = "skip-bytes\0" Required_argument "j" @@ -1209,18 +1173,18 @@ int od_main(int argc, char **argv) "read-bytes\0" Required_argument "N" "format\0" Required_argument "t" "output-duplicates\0" No_argument "v" + /* Yes, it's true: -S NUM, but --strings[=NUM]! + * that is, NUM is mandatory for -S but optional for --strings! + */ "strings\0" Optional_argument "S" "width\0" Optional_argument "w" "traditional\0" No_argument "\xff" ; #endif - char *str_A, *str_N, *str_j, *str_S; + const char *str_A, *str_N, *str_j, *str_S = "3"; llist_t *lst_t = NULL; unsigned opt; int l_c_m; - /* The old-style 'pseudo starting address' to be printed in parentheses - after any true address. */ - off_t pseudo_start = pseudo_start; // for gcc /* The number of input bytes to skip before formatting and writing. */ off_t n_bytes_to_skip = 0; /* The offset of the first byte after the last byte to be formatted. */ @@ -1232,20 +1196,13 @@ int od_main(int argc, char **argv) format_address = format_address_std; address_base_char = 'o'; address_pad_len_char = '7'; - /* flag_dump_strings = 0; - already is */ /* Parse command line */ opt_complementary = "w+:t::"; /* -w N, -t is a list */ #if ENABLE_LONG_OPTS applet_long_options = od_longopts; #endif - opt = getopt32(argv, "A:N:abcdfhij:lot:vxsS:" - "w::", // -w with optional param - // -S was -s and also had optional parameter - // but in coreutils 6.3 it was renamed and now has - // _mandatory_ parameter - &str_A, &str_N, &str_j, &lst_t, &str_S, &bytes_per_block); - argc -= optind; + opt = OD_GETOPT32(); argv += optind; if (opt & OPT_A) { static const char doxn[] ALIGN1 = "doxn"; @@ -1267,8 +1224,7 @@ int od_main(int argc, char **argv) address_pad_len_char = doxn_address_pad_len_char[pos]; } if (opt & OPT_N) { - limit_bytes_to_format = 1; - max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm); + max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm_suffixes); } if (opt & OPT_a) decode_format_string("a"); if (opt & OPT_b) decode_format_string("oC"); @@ -1277,31 +1233,26 @@ int od_main(int argc, char **argv) if (opt & OPT_f) decode_format_string("fF"); if (opt & OPT_h) decode_format_string("x2"); if (opt & OPT_i) decode_format_string("d2"); - if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm); + if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm_suffixes); if (opt & OPT_l) decode_format_string("d4"); if (opt & OPT_o) decode_format_string("o2"); - //if (opt & OPT_t)... while (lst_t) { decode_format_string(llist_pop(&lst_t)); } - if (opt & OPT_v) verbose = 1; if (opt & OPT_x) decode_format_string("x2"); if (opt & OPT_s) decode_format_string("d2"); if (opt & OPT_S) { - string_min = 3; - string_min = xstrtou_sfx(str_S, 0, bkm); - flag_dump_strings = 1; + string_min = xstrtou_sfx(str_S, 0, bkm_suffixes); } - //if (opt & OPT_w)... - //if (opt & OPT_traditional)... - if (flag_dump_strings && n_specs > 0) - bb_error_msg_and_die("no type may be specified when dumping strings"); + // Bloat: + //if ((option_mask32 & OPT_S) && n_specs > 0) + // bb_error_msg_and_die("no type may be specified when dumping strings"); /* If the --traditional option is used, there may be from * 0 to 3 remaining command line arguments; handle each case * separately. - * od [file] [[+]offset[.][b] [[+]label[.][b]]] + * od [FILE] [[+]OFFSET[.][b] [[+]LABEL[.][b]]] * The offset and pseudo_start have the same syntax. * * FIXME: POSIX 1003.1-2001 with XSI requires support for the @@ -1309,93 +1260,91 @@ int od_main(int argc, char **argv) #if ENABLE_LONG_OPTS if (opt & OPT_traditional) { - off_t o1, o2; - - if (argc == 1) { - if (parse_old_offset(argv[0], &o1)) { - n_bytes_to_skip = o1; - --argc; - ++argv; - } - } else if (argc == 2) { - if (parse_old_offset(argv[0], &o1) - && parse_old_offset(argv[1], &o2) - ) { - n_bytes_to_skip = o1; - flag_pseudo_start = 1; - pseudo_start = o2; - argv += 2; - argc -= 2; - } else if (parse_old_offset(argv[1], &o2)) { - n_bytes_to_skip = o2; - --argc; - argv[1] = argv[0]; - ++argv; - } else { - bb_error_msg_and_die("invalid second operand " - "in compatibility mode '%s'", argv[1]); - } - } else if (argc == 3) { - if (parse_old_offset(argv[1], &o1) - && parse_old_offset(argv[2], &o2) - ) { - n_bytes_to_skip = o1; - flag_pseudo_start = 1; - pseudo_start = o2; - argv[2] = argv[0]; - argv += 2; - argc -= 2; - } else { - bb_error_msg_and_die("in compatibility mode " - "the last two arguments must be offsets"); + if (argv[0]) { + off_t pseudo_start = -1; + off_t o1, o2; + + if (!argv[1]) { /* one arg */ + if (parse_old_offset(argv[0], &o1)) { + /* od --traditional OFFSET */ + n_bytes_to_skip = o1; + argv++; + } + /* od --traditional FILE */ + } else if (!argv[2]) { /* two args */ + if (parse_old_offset(argv[0], &o1) + && parse_old_offset(argv[1], &o2) + ) { + /* od --traditional OFFSET LABEL */ + n_bytes_to_skip = o1; + pseudo_start = o2; + argv += 2; + } else if (parse_old_offset(argv[1], &o2)) { + /* od --traditional FILE OFFSET */ + n_bytes_to_skip = o2; + argv[1] = NULL; + } else { + bb_error_msg_and_die("invalid second argument '%s'", argv[1]); + } + } else if (!argv[3]) { /* three args */ + if (parse_old_offset(argv[1], &o1) + && parse_old_offset(argv[2], &o2) + ) { + /* od --traditional FILE OFFSET LABEL */ + n_bytes_to_skip = o1; + pseudo_start = o2; + argv[1] = NULL; + } else { + bb_error_msg_and_die("the last two arguments must be offsets"); + } + } else { /* >3 args */ + bb_error_msg_and_die("too many arguments"); } - } else if (argc > 3) { - bb_error_msg_and_die("compatibility mode supports " - "at most three arguments"); - } - if (flag_pseudo_start) { - if (format_address == format_address_none) { - address_base_char = 'o'; - address_pad_len_char = '7'; - format_address = format_address_paren; - } else - format_address = format_address_label; + if (pseudo_start >= 0) { + if (format_address == format_address_none) { + address_base_char = 'o'; + address_pad_len_char = '7'; + format_address = format_address_paren; + } else { + format_address = format_address_label; + } + pseudo_offset = pseudo_start - n_bytes_to_skip; + } } + /* else: od --traditional (without args) */ } #endif - if (limit_bytes_to_format) { + if (option_mask32 & OPT_N) { end_offset = n_bytes_to_skip + max_bytes_to_format; if (end_offset < n_bytes_to_skip) - bb_error_msg_and_die("skip-bytes + read-bytes is too large"); + bb_error_msg_and_die("SKIP + SIZE is too large"); } if (n_specs == 0) { decode_format_string("o2"); - n_specs = 1; + /*n_specs = 1; - done by decode_format_string */ } /* If no files were listed on the command line, set the global pointer FILE_LIST so that it references the null-terminated list of one name: "-". */ file_list = bb_argv_dash; - if (argc > 0) { + if (argv[0]) { /* Set the global pointer FILE_LIST so that it references the first file-argument on the command-line. */ file_list = (char const *const *) argv; } - /* open the first input file */ + /* Open the first input file */ open_next_file(); - /* skip over any unwanted header bytes */ + /* Skip over any unwanted header bytes */ skip(n_bytes_to_skip); if (!in_stream) return EXIT_FAILURE; - pseudo_offset = (flag_pseudo_start ? pseudo_start - n_bytes_to_skip : 0); - - /* Compute output block length. */ + /* Compute output block length */ l_c_m = get_lcm(); if (opt & OPT_w) { /* -w: width */ @@ -1417,13 +1366,13 @@ int od_main(int argc, char **argv) } #endif - if (flag_dump_strings) + if (option_mask32 & OPT_S) dump_strings(n_bytes_to_skip, end_offset); else dump(n_bytes_to_skip, end_offset); - if (fclose(stdin) == EOF) + if (fclose(stdin)) bb_perror_msg_and_die(bb_msg_standard_input); - return ioerror; + return exit_code; } diff --git a/coreutils/printenv.c b/coreutils/printenv.c index 2430f3a..bd5db70 100644 --- a/coreutils/printenv.c +++ b/coreutils/printenv.c @@ -5,11 +5,19 @@ * Copyright (C) 2005 by Erik Andersen * Copyright (C) 2005 by Mike Frysinger * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define printenv_trivial_usage +//usage: "[VARIABLE]..." +//usage:#define printenv_full_usage "\n\n" +//usage: "Print environment VARIABLEs.\n" +//usage: "If no VARIABLE specified, print all." + #include "libbb.h" +/* This is a NOFORK applet. Be very careful! */ + int printenv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int printenv_main(int argc UNUSED_PARAM, char **argv) { @@ -17,9 +25,14 @@ int printenv_main(int argc UNUSED_PARAM, char **argv) /* no variables specified, show whole env */ if (!argv[1]) { - int e = 0; - while (environ[e]) - puts(environ[e++]); + char **e = environ; + + /* environ can be NULL! (for example, after clearenv()) + * Check for that: + */ + if (e) + while (*e) + puts(*e++); } else { /* search for specified variables and print them out if found */ char *arg, *env; diff --git a/coreutils/printf.c b/coreutils/printf.c index eb53fa4..3dd43a9 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c @@ -4,7 +4,7 @@ Copyright 1999 Dave Cinege Portions copyright (C) 1990-1996 Free Software Foundation, Inc. - Licensed under GPL v2 or later, see file LICENSE in this tarball for details. + Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* Usage: printf format [argument...] @@ -36,7 +36,16 @@ David MacKenzie */ -// 19990508 Busy Boxed! Dave Cinege +/* 19990508 Busy Boxed! Dave Cinege */ + +//usage:#define printf_trivial_usage +//usage: "FORMAT [ARG]..." +//usage:#define printf_full_usage "\n\n" +//usage: "Format and print ARG(s) according to FORMAT (a-la C printf)" +//usage: +//usage:#define printf_example_usage +//usage: "$ printf \"Val=%d\\n\" 5\n" +//usage: "Val=5\n" #include "libbb.h" @@ -66,7 +75,7 @@ static int multiconvert(const char *arg, void *result, converter convert) errno = 0; convert(arg, result); if (errno) { - bb_error_msg("%s: invalid number", arg); + bb_error_msg("invalid number '%s'", arg); return 1; } return 0; @@ -122,16 +131,29 @@ static double my_xstrtod(const char *arg) return result; } -static void print_esc_string(char *str) +/* Handles %b */ +static void print_esc_string(const char *str) { - while (*str) { - if (*str == '\\') { - str++; - bb_putchar(bb_process_escape_sequence((const char **)&str)); - } else { - bb_putchar(*str); - str++; + char c; + while ((c = *str) != '\0') { + str++; + if (c == '\\') { + /* %b also accepts 4-digit octals of the form \0### */ + if (*str == '0') { + if ((unsigned char)(str[1] - '0') < 8) { + /* 2nd char is 0..7: skip leading '0' */ + str++; + } + } + { + /* optimization: don't force arg to be on-stack, + * use another variable for that. */ + const char *z = str; + c = bb_process_escape_sequence(&z); + str = z; + } } + putchar(c); } } @@ -230,7 +252,7 @@ static int get_width_prec(const char *str) { int v = bb_strtoi(str, NULL, 10); if (errno) { - bb_error_msg("%s: invalid number", str); + bb_error_msg("invalid number '%s'", str); v = 0; } return v; @@ -344,7 +366,7 @@ static char **print_formatted(char *f, char **argv, int *conv_err) f--; break; default: - bb_putchar(*f); + putchar(*f); } } diff --git a/coreutils/pwd.c b/coreutils/pwd.c index 11278a2..bb3ad04 100644 --- a/coreutils/pwd.c +++ b/coreutils/pwd.c @@ -4,20 +4,79 @@ * * Copyright (C) 1995, 1996 by Bruce Perens . * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define pwd_trivial_usage +//usage: "" +//usage:#define pwd_full_usage "\n\n" +//usage: "Print the full filename of the current working directory" +//usage: +//usage:#define pwd_example_usage +//usage: "$ pwd\n" +//usage: "/root\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ +static int logical_getcwd(void) +{ + struct stat st1; + struct stat st2; + char *wd; + char *p; + + wd = getenv("PWD"); + if (!wd || wd[0] != '/') + return 0; + + p = wd; + while (*p) { + /* doing strstr(p, "/.") by hand is smaller and faster... */ + if (*p++ != '/') + continue; + if (*p != '.') + continue; + /* we found "/.", skip to next char */ + p++; + if (*p == '.') + p++; /* we found "/.." */ + if (*p == '\0' || *p == '/') + return 0; /* "/./" or "/../" component: bad */ + } + + if (stat(wd, &st1) != 0) + return 0; + if (stat(".", &st2) != 0) + return 0; + if (st1.st_ino != st2.st_ino) + return 0; + if (st1.st_dev != st2.st_dev) + return 0; + + puts(wd); + return 1; +} + int pwd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int pwd_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { char *buf; + if (ENABLE_DESKTOP) { + /* TODO: assume -L if $POSIXLY_CORRECT? (coreutils does that) + * Rationale: + * POSIX requires a default of -L, but most scripts expect -P + */ + unsigned opt = getopt32(argv, "LP"); + if ((opt & 1) && logical_getcwd()) + return fflush_all(); + } + buf = xrealloc_getcwd_or_warn(NULL); - if (buf != NULL) { + + if (buf) { puts(buf); free(buf); return fflush_all(); diff --git a/coreutils/readlink.c b/coreutils/readlink.c index 20df38b..d73ef4d 100644 --- a/coreutils/readlink.c +++ b/coreutils/readlink.c @@ -4,8 +4,19 @@ * * Copyright (C) 2000,2001 Matt Kraai * - * Licensed under GPL v2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define readlink_trivial_usage +//usage: IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE" +//usage:#define readlink_full_usage "\n\n" +//usage: "Display the value of a symlink" +//usage: IF_FEATURE_READLINK_FOLLOW( "\n" +//usage: "\n -f Canonicalize by following all symlinks" +//usage: "\n -n Don't add newline" +//usage: "\n -v Verbose" +//usage: ) + #include "libbb.h" /* @@ -28,7 +39,10 @@ * -q, --quiet, -s, --silent suppress most error messages * -v, --verbose report error messages * - * bbox supports: -f -n -v (fully), -q -s (accepts but ignores) + * bbox supports: -f (partially) -n -v (fully), -q -s (accepts but ignores) + * Note: we export the -f flag, but our -f behaves like coreutils' -e. + * Unfortunately, there isn't a C lib function we can leverage to get this + * behavior which means we'd have to implement the full stack ourselves :(. */ int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -36,7 +50,6 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) { char *buf; char *fname; - char pathbuf[PATH_MAX]; IF_FEATURE_READLINK_FOLLOW( unsigned opt; @@ -56,7 +69,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) logmode = LOGMODE_NONE; if (opt & 1) { /* -f */ - buf = realpath(fname, pathbuf); + buf = xmalloc_realpath(fname); } else { buf = xmalloc_readlink_or_warn(fname); } @@ -65,7 +78,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) return EXIT_FAILURE; printf((opt & 2) ? "%s" : "%s\n", buf); - if (ENABLE_FEATURE_CLEAN_UP && !opt) + if (ENABLE_FEATURE_CLEAN_UP) free(buf); fflush_stdout_and_exit(EXIT_SUCCESS); diff --git a/coreutils/realpath.c b/coreutils/realpath.c index 3bc40ee..c513b55 100644 --- a/coreutils/realpath.c +++ b/coreutils/realpath.c @@ -7,9 +7,14 @@ * Now does proper error checking on output and returns a failure exit code * if one or more paths cannot be resolved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define realpath_trivial_usage +//usage: "FILE..." +//usage:#define realpath_full_usage "\n\n" +//usage: "Return the absolute pathnames of given FILE" + #include "libbb.h" int realpath_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/coreutils/rm.c b/coreutils/rm.c index 3090cc3..042fba1 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c @@ -4,7 +4,7 @@ * * Copyright (C) 2001 Matt Kraai * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ @@ -15,6 +15,17 @@ * Size reduction. */ +//usage:#define rm_trivial_usage +//usage: "[-irf] FILE..." +//usage:#define rm_full_usage "\n\n" +//usage: "Remove (unlink) FILEs\n" +//usage: "\n -i Always prompt before removing" +//usage: "\n -f Never prompt" +//usage: "\n -R,-r Recurse" +//usage: +//usage:#define rm_example_usage +//usage: "$ rm -rf /tmp/foo\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index 2450a43..cc2dea0 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c @@ -4,19 +4,35 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */ +//usage:#define rmdir_trivial_usage +//usage: "[OPTIONS] DIRECTORY..." +//usage:#define rmdir_full_usage "\n\n" +//usage: "Remove DIRECTORY if it is empty\n" +//usage: IF_FEATURE_RMDIR_LONG_OPTIONS( +//usage: "\n -p|--parents Include parents" +//usage: "\n --ignore-fail-on-non-empty" +//usage: ) +//usage: IF_NOT_FEATURE_RMDIR_LONG_OPTIONS( +//usage: "\n -p Include parents" +//usage: ) +//usage: +//usage:#define rmdir_example_usage +//usage: "# rmdir /tmp/foo\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ -#define PARENTS 0x01 -#define IGNORE_NON_EMPTY 0x02 +#define PARENTS (1 << 0) +//efine VERBOSE (1 << 1) //accepted but ignored +#define IGNORE_NON_EMPTY (1 << 2) int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int rmdir_main(int argc UNUSED_PARAM, char **argv) @@ -28,13 +44,14 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_RMDIR_LONG_OPTIONS static const char rmdir_longopts[] ALIGN1 = "parents\0" No_argument "p" + "verbose\0" No_argument "v" /* Debian etch: many packages fail to be purged or installed * because they desperately want this option: */ "ignore-fail-on-non-empty\0" No_argument "\xff" ; applet_long_options = rmdir_longopts; #endif - flags = getopt32(argv, "p"); + flags = getopt32(argv, "pv"); argv += optind; if (!*argv) { @@ -50,7 +67,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv) if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY) break; #endif - bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ + bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ status = EXIT_FAILURE; } else if (flags & PARENTS) { /* Note: path was not "" since rmdir succeeded. */ diff --git a/coreutils/seq.c b/coreutils/seq.c index 84d11fd..8986192 100644 --- a/coreutils/seq.c +++ b/coreutils/seq.c @@ -4,8 +4,17 @@ * * Copyright (C) 2004, Glenn McGrath * - * Licensed under the GPL v2, see the file LICENSE in this tarball. + * Licensed under GPLv2, see file LICENSE in this source tree. */ + +//usage:#define seq_trivial_usage +//usage: "[-w] [-s SEP] [FIRST [INC]] LAST" +//usage:#define seq_full_usage "\n\n" +//usage: "Print numbers from FIRST to LAST, in steps of INC.\n" +//usage: "FIRST, INC default to 1.\n" +//usage: "\n -w Pad to last with leading zeros" +//usage: "\n -s SEP String separator" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ @@ -86,7 +95,8 @@ int seq_main(int argc, char **argv) v = first; n = 0; while (increment >= 0 ? v <= last : v >= last) { - printf("%s%0*.*f", sep, width, frac_part, v); + if (printf("%s%0*.*f", sep, width, frac_part, v) < 0) + break; /* I/O error, bail out (yes, this really happens) */ sep = opt_s; /* v += increment; - would accumulate floating point errors */ n++; diff --git a/coreutils/sleep.c b/coreutils/sleep.c index 399a38d..0ffbd16 100644 --- a/coreutils/sleep.c +++ b/coreutils/sleep.c @@ -4,7 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ @@ -18,9 +18,24 @@ * time suffixes for seconds, minutes, hours, and days. */ +//usage:#define sleep_trivial_usage +//usage: IF_FEATURE_FANCY_SLEEP("[") "N" IF_FEATURE_FANCY_SLEEP("]...") +//usage:#define sleep_full_usage "\n\n" +//usage: IF_NOT_FEATURE_FANCY_SLEEP("Pause for N seconds") +//usage: IF_FEATURE_FANCY_SLEEP( +//usage: "Pause for a time equal to the total of the args given, where each arg can\n" +//usage: "have an optional suffix of (s)econds, (m)inutes, (h)ours, or (d)ays") +//usage: +//usage:#define sleep_example_usage +//usage: "$ sleep 2\n" +//usage: "[2 second delay results]\n" +//usage: IF_FEATURE_FANCY_SLEEP( +//usage: "$ sleep 1d 3h 22m 8s\n" +//usage: "[98528 second delay results]\n") + #include "libbb.h" -/* This is a NOFORK applet. Be very careful! */ +/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */ #if ENABLE_FEATURE_FANCY_SLEEP || ENABLE_FEATURE_FLOAT_SLEEP @@ -49,6 +64,10 @@ int sleep_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_FLOAT_SLEEP +# if ENABLE_LOCALE_SUPPORT + /* undo busybox.c setlocale */ + setlocale(LC_NUMERIC, "C"); +# endif duration = 0; do { char *arg = *argv; @@ -62,14 +81,15 @@ int sleep_main(int argc UNUSED_PARAM, char **argv) d = strtod(arg, &pp); if (errno || *pp) bb_show_usage(); - arg[len] = sv; - len--; - sv = arg[len]; - arg[len] = '1'; - duration += d * xatoul_sfx(&arg[len], sfx); - arg[len] = sv; - } else + arg += len; + *arg-- = sv; + sv = *arg; + *arg = '1'; + duration += d * xatoul_sfx(arg, sfx); + *arg = sv; + } else { duration += xatoul_sfx(arg, sfx); + } } while (*++argv); ts.tv_sec = MAXINT(typeof(ts.tv_sec)); diff --git a/coreutils/sort.c b/coreutils/sort.c index 5c3fa1a..a1625fc 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -6,12 +6,59 @@ * * MAINTAINER: Rob Landley * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * See SuS3 sort standard at: * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html */ +//usage:#define sort_trivial_usage +//usage: "[-nru" +//usage: IF_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") +//usage: "] [FILE]..." +//usage:#define sort_full_usage "\n\n" +//usage: "Sort lines of text\n" +//usage: IF_FEATURE_SORT_BIG( +//usage: "\n -b Ignore leading blanks" +//usage: "\n -c Check whether input is sorted" +//usage: "\n -d Dictionary order (blank or alphanumeric only)" +//usage: "\n -f Ignore case" +//usage: "\n -g General numerical sort" +//usage: "\n -i Ignore unprintable characters" +//usage: "\n -k Sort key" +//usage: "\n -M Sort month" +//usage: ) +//usage: "\n -n Sort numbers" +//usage: IF_FEATURE_SORT_BIG( +//usage: "\n -o Output to file" +//usage: "\n -k Sort by key" +//usage: "\n -t CHAR Key separator" +//usage: ) +//usage: "\n -r Reverse sort order" +//usage: IF_FEATURE_SORT_BIG( +//usage: "\n -s Stable (don't sort ties alphabetically)" +//usage: ) +//usage: "\n -u Suppress duplicate lines" +//usage: IF_FEATURE_SORT_BIG( +//usage: "\n -z Lines are terminated by NUL, not newline" +//usage: "\n -mST Ignored for GNU compatibility") +//usage: +//usage:#define sort_example_usage +//usage: "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" +//usage: "a\n" +//usage: "b\n" +//usage: "c\n" +//usage: "d\n" +//usage: "e\n" +//usage: "f\n" +//usage: IF_FEATURE_SORT_BIG( +//usage: "$ echo -e \"c 3\\nb 2\\nd 2\" | $SORT -k 2,2n -k 1,1r\n" +//usage: "d 2\n" +//usage: "b 2\n" +//usage: "c 3\n" +//usage: ) +//usage: "" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ @@ -52,8 +99,8 @@ enum { static char key_separator; static struct sort_key { - struct sort_key *next_key; /* linked list */ - unsigned range[4]; /* start word, start char, end word, end char */ + struct sort_key *next_key; /* linked list */ + unsigned range[4]; /* start word, start char, end word, end char */ unsigned flags; } *key_list; @@ -172,7 +219,7 @@ static int compare_keys(const void *xarg, const void *yarg) y = get_key(*(char **)yarg, key, flags); #else /* This curly bracket serves no purpose but to match the nesting - level of the for () loop we're not using */ + * level of the for () loop we're not using */ { x = *(char **)xarg; y = *(char **)yarg; @@ -412,7 +459,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_SORT_BIG /* Open output file _after_ we read all input ones */ if (option_mask32 & FLAG_o) - xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO); + xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO); #endif flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; for (i = 0; i < linecount; i++) diff --git a/coreutils/split.c b/coreutils/split.c index c2f3885..1e1673e 100644 --- a/coreutils/split.c +++ b/coreutils/split.c @@ -3,25 +3,35 @@ * split - split a file into pieces * Copyright (c) 2007 Bernhard Reutner-Fischer * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT: SUSv3 compliant * SUSv3 requirements: * http://www.opengroup.org/onlinepubs/009695399/utilities/split.html */ + +//usage:#define split_trivial_usage +//usage: "[OPTIONS] [INPUT [PREFIX]]" +//usage:#define split_full_usage "\n\n" +//usage: " -b N[k|m] Split by N (kilo|mega)bytes" +//usage: "\n -l N Split by N lines" +//usage: "\n -a N Use N letters as suffix" +//usage: +//usage:#define split_example_usage +//usage: "$ split TODO foo\n" +//usage: "$ cat TODO | split -a 2 -l 2 TODO_\n" + #include "libbb.h" -static const struct suffix_mult split_suffices[] = { #if ENABLE_FEATURE_SPLIT_FANCY +static const struct suffix_mult split_suffixes[] = { { "b", 512 }, -#endif { "k", 1024 }, { "m", 1024*1024 }, -#if ENABLE_FEATURE_SPLIT_FANCY { "g", 1024*1024*1024 }, -#endif { "", 0 } }; +#endif /* Increment the suffix part of the filename. * Returns NULL if we are out of filenames. @@ -32,7 +42,7 @@ static char *next_file(char *old, unsigned suffix_len) unsigned i = 1; char *curr; - do { + while (1) { curr = old + end - i; if (*curr < 'z') { *curr += 1; @@ -43,7 +53,7 @@ static char *next_file(char *old, unsigned suffix_len) return NULL; } *curr = 'a'; - } while (1); + } return old; } @@ -74,7 +84,10 @@ int split_main(int argc UNUSED_PARAM, char **argv) if (opt & SPLIT_OPT_l) cnt = XATOOFF(count_p); if (opt & SPLIT_OPT_b) // FIXME: also needs XATOOFF - cnt = xatoull_sfx(count_p, split_suffices); + cnt = xatoull_sfx(count_p, + IF_FEATURE_SPLIT_FANCY(split_suffixes) + IF_NOT_FEATURE_SPLIT_FANCY(km_suffixes) + ); sfx = "x"; argv += optind; @@ -82,9 +95,7 @@ int split_main(int argc UNUSED_PARAM, char **argv) int fd; if (argv[1]) sfx = argv[1]; - fd = open_or_warn_stdin(argv[0]); - if (fd == -1) - return EXIT_FAILURE; + fd = xopen_stdin(argv[0]); xmove_fd(fd, STDIN_FILENO); } else { argv[0] = (char *) bb_msg_standard_input; diff --git a/coreutils/stat.c b/coreutils/stat.c index e7c24e6..dc9d81c 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -10,8 +10,68 @@ * Written by Michael Meskes * Taken from coreutils and turned into a busybox applet by Mike Frysinger * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//usage:#define stat_trivial_usage +//usage: "[OPTIONS] FILE..." +//usage:#define stat_full_usage "\n\n" +//usage: "Display file (default) or filesystem status\n" +//usage: IF_FEATURE_STAT_FORMAT( +//usage: "\n -c fmt Use the specified format" +//usage: ) +//usage: "\n -f Display filesystem status" +//usage: "\n -L Follow links" +//usage: "\n -t Display info in terse form" +//usage: IF_SELINUX( +//usage: "\n -Z Print security context" +//usage: ) +//usage: IF_FEATURE_STAT_FORMAT( +//usage: "\n\nValid format sequences for files:\n" +//usage: " %a Access rights in octal\n" +//usage: " %A Access rights in human readable form\n" +//usage: " %b Number of blocks allocated (see %B)\n" +//usage: " %B The size in bytes of each block reported by %b\n" +//usage: " %d Device number in decimal\n" +//usage: " %D Device number in hex\n" +//usage: " %f Raw mode in hex\n" +//usage: " %F File type\n" +//usage: " %g Group ID of owner\n" +//usage: " %G Group name of owner\n" +//usage: " %h Number of hard links\n" +//usage: " %i Inode number\n" +//usage: " %n File name\n" +//usage: " %N File name, with -> TARGET if symlink\n" +//usage: " %o I/O block size\n" +//usage: " %s Total size, in bytes\n" +//usage: " %t Major device type in hex\n" +//usage: " %T Minor device type in hex\n" +//usage: " %u User ID of owner\n" +//usage: " %U User name of owner\n" +//usage: " %x Time of last access\n" +//usage: " %X Time of last access as seconds since Epoch\n" +//usage: " %y Time of last modification\n" +//usage: " %Y Time of last modification as seconds since Epoch\n" +//usage: " %z Time of last change\n" +//usage: " %Z Time of last change as seconds since Epoch\n" +//usage: "\nValid format sequences for file systems:\n" +//usage: " %a Free blocks available to non-superuser\n" +//usage: " %b Total data blocks in file system\n" +//usage: " %c Total file nodes in file system\n" +//usage: " %d Free file nodes in file system\n" +//usage: " %f Free blocks in file system\n" +//usage: IF_SELINUX( +//usage: " %C Security context in selinux\n" +//usage: ) +//usage: " %i File System ID in hex\n" +//usage: " %l Maximum length of filenames\n" +//usage: " %n File name\n" +//usage: " %s Block size (for faster transfer)\n" +//usage: " %S Fundamental block size (for block counts)\n" +//usage: " %t Type in hex\n" +//usage: " %T Type in human readable form" +//usage: ) + #include "libbb.h" #define OPT_FILESYS (1 << 0) @@ -39,9 +99,15 @@ static const char *file_type(const struct stat *st) if (S_ISFIFO(st->st_mode)) return "fifo"; if (S_ISLNK(st->st_mode)) return "symbolic link"; if (S_ISSOCK(st->st_mode)) return "socket"; +#ifdef S_TYPEISMQ if (S_TYPEISMQ(st)) return "message queue"; +#endif +#ifdef S_TYPEISSEM if (S_TYPEISSEM(st)) return "semaphore"; +#endif +#ifdef S_TYPEISSHM if (S_TYPEISSHM(st)) return "shared memory object"; +#endif #ifdef S_TYPEISTMO if (S_TYPEISTMO(st)) return "typed memory object"; #endif @@ -61,7 +127,7 @@ static const char *human_time(time_t t) /*static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")] ALIGN1;*/ #define buf bb_common_bufsiz1 - strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S.000000000", localtime(&t)); + strcpy(strftime_YYYYMMDDHHMMSS(buf, sizeof(buf), &t), ".000000000"); return buf; #undef buf } @@ -247,14 +313,12 @@ static void FAST_FUNC print_stat(char *pformat, const char m, strcat(pformat, "lu"); printf(pformat, (unsigned long) statbuf->st_uid); } else if (m == 'U') { - setpwent(); pw_ent = getpwuid(statbuf->st_uid); printfs(pformat, (pw_ent != NULL) ? pw_ent->pw_name : "UNKNOWN"); } else if (m == 'g') { strcat(pformat, "lu"); printf(pformat, (unsigned long) statbuf->st_gid); } else if (m == 'G') { - setgrent(); gw_ent = getgrgid(statbuf->st_gid); printfs(pformat, (gw_ent != NULL) ? gw_ent->gr_name : "UNKNOWN"); } else if (m == 't') { @@ -378,7 +442,7 @@ static bool do_statfs(const char *filename, const char *format) : getfilecon(filename, &scontext) ) < 0 ) { - bb_perror_msg(filename); + bb_simple_perror_msg(filename); return 0; } } @@ -471,7 +535,7 @@ static bool do_statfs(const char *filename, const char *format) if (scontext) freecon(scontext); # endif -#endif /* FEATURE_STAT_FORMAT */ +#endif /* FEATURE_STAT_FORMAT */ return 1; } @@ -491,7 +555,7 @@ static bool do_stat(const char *filename, const char *format) : getfilecon(filename, &scontext) ) < 0 ) { - bb_perror_msg(filename); + bb_simple_perror_msg(filename); return 0; } } @@ -527,37 +591,43 @@ static bool do_stat(const char *filename, const char *format) # else if (option_mask32 & OPT_TERSE) { format = (option_mask32 & OPT_SELINUX ? - "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n": - "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"); + "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n" + : + "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n" + ); } else { if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { format = (option_mask32 & OPT_SELINUX ? - " File: %N\n" - " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" - "Device: %Dh/%dd\tInode: %-10i Links: %-5h" - " Device type: %t,%T\n" - "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" - " S_Context: %C\n" - "Access: %x\n" "Modify: %y\n" "Change: %z\n": - " File: %N\n" - " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" - "Device: %Dh/%dd\tInode: %-10i Links: %-5h" - " Device type: %t,%T\n" - "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" - "Access: %x\n" "Modify: %y\n" "Change: %z\n"); + " File: %N\n" + " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" + "Device: %Dh/%dd\tInode: %-10i Links: %-5h" + " Device type: %t,%T\n" + "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" + " S_Context: %C\n" + "Access: %x\n" "Modify: %y\n" "Change: %z\n" + : + " File: %N\n" + " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" + "Device: %Dh/%dd\tInode: %-10i Links: %-5h" + " Device type: %t,%T\n" + "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" + "Access: %x\n" "Modify: %y\n" "Change: %z\n" + ); } else { format = (option_mask32 & OPT_SELINUX ? - " File: %N\n" - " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" - "Device: %Dh/%dd\tInode: %-10i Links: %h\n" - "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" - "S_Context: %C\n" - "Access: %x\n" "Modify: %y\n" "Change: %z\n": - " File: %N\n" - " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" - "Device: %Dh/%dd\tInode: %-10i Links: %h\n" - "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" - "Access: %x\n" "Modify: %y\n" "Change: %z\n"); + " File: %N\n" + " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" + "Device: %Dh/%dd\tInode: %-10i Links: %h\n" + "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" + "S_Context: %C\n" + "Access: %x\n" "Modify: %y\n" "Change: %z\n" + : + " File: %N\n" + " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" + "Device: %Dh/%dd\tInode: %-10i Links: %h\n" + "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" + "Access: %x\n" "Modify: %y\n" "Change: %z\n" + ); } } # endif @@ -591,20 +661,20 @@ static bool do_stat(const char *filename, const char *format) # endif } else { char *linkname = NULL; - struct passwd *pw_ent; struct group *gw_ent; - setgrent(); + gw_ent = getgrgid(statbuf.st_gid); - setpwent(); pw_ent = getpwuid(statbuf.st_uid); if (S_ISLNK(statbuf.st_mode)) linkname = xmalloc_readlink_or_warn(filename); - if (linkname) + if (linkname) { printf(" File: '%s' -> '%s'\n", filename, linkname); - else + free(linkname); + } else { printf(" File: '%s'\n", filename); + } printf(" Size: %-10llu\tBlocks: %-10llu IO Block: %-6lu %s\n" "Device: %llxh/%llud\tInode: %-10llu Links: %-5lu", @@ -632,12 +702,11 @@ static bool do_stat(const char *filename, const char *format) # if ENABLE_SELINUX printf(" S_Context: %lc\n", *scontext); # endif - printf("Access: %s\n" "Modify: %s\n" "Change: %s\n", - human_time(statbuf.st_atime), - human_time(statbuf.st_mtime), - human_time(statbuf.st_ctime)); + printf("Access: %s\n", human_time(statbuf.st_atime)); + printf("Modify: %s\n", human_time(statbuf.st_mtime)); + printf("Change: %s\n", human_time(statbuf.st_ctime)); } -#endif /* FEATURE_STAT_FORMAT */ +#endif /* FEATURE_STAT_FORMAT */ return 1; } diff --git a/coreutils/stty.c b/coreutils/stty.c index c40d718..378a848 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c @@ -2,7 +2,7 @@ /* stty -- change and print terminal line settings Copyright (C) 1990-1999 Free Software Foundation, Inc. - Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* Usage: stty [-ag] [-F device] [setting...] @@ -21,6 +21,16 @@ */ +//usage:#define stty_trivial_usage +//usage: "[-a|g] [-F DEVICE] [SETTING]..." +//usage:#define stty_full_usage "\n\n" +//usage: "Without arguments, prints baud rate, line discipline,\n" +//usage: "and deviations from stty sane\n" +//usage: "\n -F DEVICE Open device instead of stdin" +//usage: "\n -a Print all current settings in human-readable form" +//usage: "\n -g Print in stty-readable form" +//usage: "\n [SETTING] See manpage" + #include "libbb.h" #ifndef _POSIX_VDISABLE @@ -59,6 +69,10 @@ #if defined(VEOL2) && !defined(CEOL2) # define CEOL2 _POSIX_VDISABLE #endif +/* glibc-2.12.1 uses only VSWTC name */ +#if defined(VSWTC) && !defined(VSWTCH) +# define VSWTCH VSWTC +#endif /* ISC renamed swtch to susp for termios, but we'll accept either name */ #if defined(VSUSP) && !defined(VSWTCH) # define VSWTCH VSUSP @@ -115,6 +129,116 @@ # define CSTATUS Control('t') #endif +/* Save us from #ifdef forest plague */ +#ifndef BSDLY +# define BSDLY 0 +#endif +#ifndef CIBAUD +# define CIBAUD 0 +#endif +#ifndef CRDLY +# define CRDLY 0 +#endif +#ifndef CRTSCTS +# define CRTSCTS 0 +#endif +#ifndef ECHOCTL +# define ECHOCTL 0 +#endif +#ifndef ECHOKE +# define ECHOKE 0 +#endif +#ifndef ECHOPRT +# define ECHOPRT 0 +#endif +#ifndef FFDLY +# define FFDLY 0 +#endif +#ifndef IEXTEN +# define IEXTEN 0 +#endif +#ifndef IMAXBEL +# define IMAXBEL 0 +#endif +#ifndef IUCLC +# define IUCLC 0 +#endif +#ifndef IXANY +# define IXANY 0 +#endif +#ifndef NLDLY +# define NLDLY 0 +#endif +#ifndef OCRNL +# define OCRNL 0 +#endif +#ifndef OFDEL +# define OFDEL 0 +#endif +#ifndef OFILL +# define OFILL 0 +#endif +#ifndef OLCUC +# define OLCUC 0 +#endif +#ifndef ONLCR +# define ONLCR 0 +#endif +#ifndef ONLRET +# define ONLRET 0 +#endif +#ifndef ONOCR +# define ONOCR 0 +#endif +#ifndef OXTABS +# define OXTABS 0 +#endif +#ifndef TABDLY +# define TABDLY 0 +#endif +#ifndef TAB1 +# define TAB1 0 +#endif +#ifndef TAB2 +# define TAB2 0 +#endif +#ifndef TOSTOP +# define TOSTOP 0 +#endif +#ifndef VDSUSP +# define VDSUSP 0 +#endif +#ifndef VEOL2 +# define VEOL2 0 +#endif +#ifndef VFLUSHO +# define VFLUSHO 0 +#endif +#ifndef VLNEXT +# define VLNEXT 0 +#endif +#ifndef VREPRINT +# define VREPRINT 0 +#endif +#ifndef VSTATUS +# define VSTATUS 0 +#endif +#ifndef VSWTCH +# define VSWTCH 0 +#endif +#ifndef VTDLY +# define VTDLY 0 +#endif +#ifndef VWERASE +# define VWERASE 0 +#endif +#ifndef XCASE +# define XCASE 0 +#endif +#ifndef IUTF8 +# define IUTF8 0 +#endif + /* Which speeds to set */ enum speed_setting { input_speed, output_speed, both_speeds @@ -122,10 +246,21 @@ enum speed_setting { /* Which member(s) of 'struct termios' a mode uses */ enum { - /* Do NOT change the order or values, as mode_type_flag() - * depends on them */ control, input, output, local, combination }; +static tcflag_t *get_ptr_to_tcflag(unsigned type, const struct termios *mode) +{ + static const uint8_t tcflag_offsets[] ALIGN1 = { + offsetof(struct termios, c_cflag), /* control */ + offsetof(struct termios, c_iflag), /* input */ + offsetof(struct termios, c_oflag), /* output */ + offsetof(struct termios, c_lflag) /* local */ + }; + if (type <= local) { + return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]); + } + return NULL; +} /* Flags for 'struct mode_info' */ #define SANE_SET 1 /* Set in 'sane' mode */ @@ -167,13 +302,13 @@ enum { IDX_cbreak, IDX_crt, IDX_dec, -#ifdef IXANY +#if IXANY IDX_decctlq, #endif -#if defined(TABDLY) || defined(OXTABS) +#if TABDLY || OXTABS IDX_tabs, #endif -#if defined(XCASE) && defined(IUCLC) && defined(OLCUC) +#if XCASE && IUCLC && OLCUC IDX_lcase, IDX_LCASE, #endif @@ -196,13 +331,13 @@ static const char mode_name[] = MI_ENTRY("cbreak", combination, REV | OMIT, 0, 0 ) MI_ENTRY("crt", combination, OMIT, 0, 0 ) MI_ENTRY("dec", combination, OMIT, 0, 0 ) -#ifdef IXANY +#if IXANY MI_ENTRY("decctlq", combination, REV | OMIT, 0, 0 ) #endif -#if defined(TABDLY) || defined(OXTABS) +#if TABDLY || OXTABS MI_ENTRY("tabs", combination, REV | OMIT, 0, 0 ) #endif -#if defined(XCASE) && defined(IUCLC) && defined(OLCUC) +#if XCASE && IUCLC && OLCUC MI_ENTRY("lcase", combination, REV | OMIT, 0, 0 ) MI_ENTRY("LCASE", combination, REV | OMIT, 0, 0 ) #endif @@ -217,7 +352,7 @@ static const char mode_name[] = MI_ENTRY("cstopb", control, REV, CSTOPB, 0 ) MI_ENTRY("cread", control, SANE_SET | REV, CREAD, 0 ) MI_ENTRY("clocal", control, REV, CLOCAL, 0 ) -#ifdef CRTSCTS +#if CRTSCTS MI_ENTRY("crtscts", control, REV, CRTSCTS, 0 ) #endif MI_ENTRY("ignbrk", input, SANE_UNSET | REV, IGNBRK, 0 ) @@ -231,100 +366,107 @@ static const char mode_name[] = MI_ENTRY("icrnl", input, SANE_SET | REV, ICRNL, 0 ) MI_ENTRY("ixon", input, REV, IXON, 0 ) MI_ENTRY("ixoff", input, SANE_UNSET | REV, IXOFF, 0 ) - MI_ENTRY("tandem", input, REV | OMIT, IXOFF, 0 ) -#ifdef IUCLC + MI_ENTRY("tandem", input, OMIT | REV, IXOFF, 0 ) +#if IUCLC MI_ENTRY("iuclc", input, SANE_UNSET | REV, IUCLC, 0 ) #endif -#ifdef IXANY +#if IXANY MI_ENTRY("ixany", input, SANE_UNSET | REV, IXANY, 0 ) #endif -#ifdef IMAXBEL +#if IMAXBEL MI_ENTRY("imaxbel", input, SANE_SET | REV, IMAXBEL, 0 ) #endif +#if IUTF8 + MI_ENTRY("iutf8", input, SANE_UNSET | REV, IUTF8, 0 ) +#endif MI_ENTRY("opost", output, SANE_SET | REV, OPOST, 0 ) -#ifdef OLCUC +#if OLCUC MI_ENTRY("olcuc", output, SANE_UNSET | REV, OLCUC, 0 ) #endif -#ifdef OCRNL +#if OCRNL MI_ENTRY("ocrnl", output, SANE_UNSET | REV, OCRNL, 0 ) #endif -#ifdef ONLCR +#if ONLCR MI_ENTRY("onlcr", output, SANE_SET | REV, ONLCR, 0 ) #endif -#ifdef ONOCR +#if ONOCR MI_ENTRY("onocr", output, SANE_UNSET | REV, ONOCR, 0 ) #endif -#ifdef ONLRET +#if ONLRET MI_ENTRY("onlret", output, SANE_UNSET | REV, ONLRET, 0 ) #endif -#ifdef OFILL +#if OFILL MI_ENTRY("ofill", output, SANE_UNSET | REV, OFILL, 0 ) #endif -#ifdef OFDEL +#if OFDEL MI_ENTRY("ofdel", output, SANE_UNSET | REV, OFDEL, 0 ) #endif -#ifdef NLDLY +#if NLDLY MI_ENTRY("nl1", output, SANE_UNSET, NL1, NLDLY) MI_ENTRY("nl0", output, SANE_SET, NL0, NLDLY) #endif -#ifdef CRDLY +#if CRDLY MI_ENTRY("cr3", output, SANE_UNSET, CR3, CRDLY) MI_ENTRY("cr2", output, SANE_UNSET, CR2, CRDLY) MI_ENTRY("cr1", output, SANE_UNSET, CR1, CRDLY) MI_ENTRY("cr0", output, SANE_SET, CR0, CRDLY) #endif -#ifdef TABDLY +#if TABDLY MI_ENTRY("tab3", output, SANE_UNSET, TAB3, TABDLY) +# if TAB2 MI_ENTRY("tab2", output, SANE_UNSET, TAB2, TABDLY) +# endif +# if TAB1 MI_ENTRY("tab1", output, SANE_UNSET, TAB1, TABDLY) +# endif MI_ENTRY("tab0", output, SANE_SET, TAB0, TABDLY) #else -# ifdef OXTABS +# if OXTABS MI_ENTRY("tab3", output, SANE_UNSET, OXTABS, 0 ) # endif #endif -#ifdef BSDLY +#if BSDLY MI_ENTRY("bs1", output, SANE_UNSET, BS1, BSDLY) MI_ENTRY("bs0", output, SANE_SET, BS0, BSDLY) #endif -#ifdef VTDLY +#if VTDLY MI_ENTRY("vt1", output, SANE_UNSET, VT1, VTDLY) MI_ENTRY("vt0", output, SANE_SET, VT0, VTDLY) #endif -#ifdef FFDLY +#if FFDLY MI_ENTRY("ff1", output, SANE_UNSET, FF1, FFDLY) MI_ENTRY("ff0", output, SANE_SET, FF0, FFDLY) #endif MI_ENTRY("isig", local, SANE_SET | REV, ISIG, 0 ) MI_ENTRY("icanon", local, SANE_SET | REV, ICANON, 0 ) -#ifdef IEXTEN +#if IEXTEN MI_ENTRY("iexten", local, SANE_SET | REV, IEXTEN, 0 ) #endif MI_ENTRY("echo", local, SANE_SET | REV, ECHO, 0 ) MI_ENTRY("echoe", local, SANE_SET | REV, ECHOE, 0 ) - MI_ENTRY("crterase", local, REV | OMIT, ECHOE, 0 ) + MI_ENTRY("crterase", local, OMIT | REV, ECHOE, 0 ) MI_ENTRY("echok", local, SANE_SET | REV, ECHOK, 0 ) MI_ENTRY("echonl", local, SANE_UNSET | REV, ECHONL, 0 ) MI_ENTRY("noflsh", local, SANE_UNSET | REV, NOFLSH, 0 ) -#ifdef XCASE +#if XCASE MI_ENTRY("xcase", local, SANE_UNSET | REV, XCASE, 0 ) #endif -#ifdef TOSTOP +#if TOSTOP MI_ENTRY("tostop", local, SANE_UNSET | REV, TOSTOP, 0 ) #endif -#ifdef ECHOPRT +#if ECHOPRT MI_ENTRY("echoprt", local, SANE_UNSET | REV, ECHOPRT, 0 ) - MI_ENTRY("prterase", local, REV | OMIT, ECHOPRT, 0 ) + MI_ENTRY("prterase", local, OMIT | REV, ECHOPRT, 0 ) #endif -#ifdef ECHOCTL +#if ECHOCTL MI_ENTRY("echoctl", local, SANE_SET | REV, ECHOCTL, 0 ) - MI_ENTRY("ctlecho", local, REV | OMIT, ECHOCTL, 0 ) + MI_ENTRY("ctlecho", local, OMIT | REV, ECHOCTL, 0 ) #endif -#ifdef ECHOKE +#if ECHOKE MI_ENTRY("echoke", local, SANE_SET | REV, ECHOKE, 0 ) - MI_ENTRY("crtkill", local, REV | OMIT, ECHOKE, 0 ) + MI_ENTRY("crtkill", local, OMIT | REV, ECHOKE, 0 ) #endif ; @@ -346,13 +488,13 @@ static const struct mode_info mode_info[] = { MI_ENTRY("cbreak", combination, REV | OMIT, 0, 0 ) MI_ENTRY("crt", combination, OMIT, 0, 0 ) MI_ENTRY("dec", combination, OMIT, 0, 0 ) -#ifdef IXANY +#if IXANY MI_ENTRY("decctlq", combination, REV | OMIT, 0, 0 ) #endif -#if defined(TABDLY) || defined(OXTABS) +#if TABDLY || OXTABS MI_ENTRY("tabs", combination, REV | OMIT, 0, 0 ) #endif -#if defined(XCASE) && defined(IUCLC) && defined(OLCUC) +#if XCASE && IUCLC && OLCUC MI_ENTRY("lcase", combination, REV | OMIT, 0, 0 ) MI_ENTRY("LCASE", combination, REV | OMIT, 0, 0 ) #endif @@ -367,7 +509,7 @@ static const struct mode_info mode_info[] = { MI_ENTRY("cstopb", control, REV, CSTOPB, 0 ) MI_ENTRY("cread", control, SANE_SET | REV, CREAD, 0 ) MI_ENTRY("clocal", control, REV, CLOCAL, 0 ) -#ifdef CRTSCTS +#if CRTSCTS MI_ENTRY("crtscts", control, REV, CRTSCTS, 0 ) #endif MI_ENTRY("ignbrk", input, SANE_UNSET | REV, IGNBRK, 0 ) @@ -381,100 +523,107 @@ static const struct mode_info mode_info[] = { MI_ENTRY("icrnl", input, SANE_SET | REV, ICRNL, 0 ) MI_ENTRY("ixon", input, REV, IXON, 0 ) MI_ENTRY("ixoff", input, SANE_UNSET | REV, IXOFF, 0 ) - MI_ENTRY("tandem", input, REV | OMIT, IXOFF, 0 ) -#ifdef IUCLC + MI_ENTRY("tandem", input, OMIT | REV, IXOFF, 0 ) +#if IUCLC MI_ENTRY("iuclc", input, SANE_UNSET | REV, IUCLC, 0 ) #endif -#ifdef IXANY +#if IXANY MI_ENTRY("ixany", input, SANE_UNSET | REV, IXANY, 0 ) #endif -#ifdef IMAXBEL +#if IMAXBEL MI_ENTRY("imaxbel", input, SANE_SET | REV, IMAXBEL, 0 ) #endif +#if IUTF8 + MI_ENTRY("iutf8", input, SANE_UNSET | REV, IUTF8, 0 ) +#endif MI_ENTRY("opost", output, SANE_SET | REV, OPOST, 0 ) -#ifdef OLCUC +#if OLCUC MI_ENTRY("olcuc", output, SANE_UNSET | REV, OLCUC, 0 ) #endif -#ifdef OCRNL +#if OCRNL MI_ENTRY("ocrnl", output, SANE_UNSET | REV, OCRNL, 0 ) #endif -#ifdef ONLCR +#if ONLCR MI_ENTRY("onlcr", output, SANE_SET | REV, ONLCR, 0 ) #endif -#ifdef ONOCR +#if ONOCR MI_ENTRY("onocr", output, SANE_UNSET | REV, ONOCR, 0 ) #endif -#ifdef ONLRET +#if ONLRET MI_ENTRY("onlret", output, SANE_UNSET | REV, ONLRET, 0 ) #endif -#ifdef OFILL +#if OFILL MI_ENTRY("ofill", output, SANE_UNSET | REV, OFILL, 0 ) #endif -#ifdef OFDEL +#if OFDEL MI_ENTRY("ofdel", output, SANE_UNSET | REV, OFDEL, 0 ) #endif -#ifdef NLDLY +#if NLDLY MI_ENTRY("nl1", output, SANE_UNSET, NL1, NLDLY) MI_ENTRY("nl0", output, SANE_SET, NL0, NLDLY) #endif -#ifdef CRDLY +#if CRDLY MI_ENTRY("cr3", output, SANE_UNSET, CR3, CRDLY) MI_ENTRY("cr2", output, SANE_UNSET, CR2, CRDLY) MI_ENTRY("cr1", output, SANE_UNSET, CR1, CRDLY) MI_ENTRY("cr0", output, SANE_SET, CR0, CRDLY) #endif -#ifdef TABDLY +#if TABDLY MI_ENTRY("tab3", output, SANE_UNSET, TAB3, TABDLY) +# if TAB2 MI_ENTRY("tab2", output, SANE_UNSET, TAB2, TABDLY) +# endif +# if TAB1 MI_ENTRY("tab1", output, SANE_UNSET, TAB1, TABDLY) +# endif MI_ENTRY("tab0", output, SANE_SET, TAB0, TABDLY) #else -# ifdef OXTABS +# if OXTABS MI_ENTRY("tab3", output, SANE_UNSET, OXTABS, 0 ) # endif #endif -#ifdef BSDLY +#if BSDLY MI_ENTRY("bs1", output, SANE_UNSET, BS1, BSDLY) MI_ENTRY("bs0", output, SANE_SET, BS0, BSDLY) #endif -#ifdef VTDLY +#if VTDLY MI_ENTRY("vt1", output, SANE_UNSET, VT1, VTDLY) MI_ENTRY("vt0", output, SANE_SET, VT0, VTDLY) #endif -#ifdef FFDLY +#if FFDLY MI_ENTRY("ff1", output, SANE_UNSET, FF1, FFDLY) MI_ENTRY("ff0", output, SANE_SET, FF0, FFDLY) #endif MI_ENTRY("isig", local, SANE_SET | REV, ISIG, 0 ) MI_ENTRY("icanon", local, SANE_SET | REV, ICANON, 0 ) -#ifdef IEXTEN +#if IEXTEN MI_ENTRY("iexten", local, SANE_SET | REV, IEXTEN, 0 ) #endif MI_ENTRY("echo", local, SANE_SET | REV, ECHO, 0 ) MI_ENTRY("echoe", local, SANE_SET | REV, ECHOE, 0 ) - MI_ENTRY("crterase", local, REV | OMIT, ECHOE, 0 ) + MI_ENTRY("crterase", local, OMIT | REV, ECHOE, 0 ) MI_ENTRY("echok", local, SANE_SET | REV, ECHOK, 0 ) MI_ENTRY("echonl", local, SANE_UNSET | REV, ECHONL, 0 ) MI_ENTRY("noflsh", local, SANE_UNSET | REV, NOFLSH, 0 ) -#ifdef XCASE +#if XCASE MI_ENTRY("xcase", local, SANE_UNSET | REV, XCASE, 0 ) #endif -#ifdef TOSTOP +#if TOSTOP MI_ENTRY("tostop", local, SANE_UNSET | REV, TOSTOP, 0 ) #endif -#ifdef ECHOPRT +#if ECHOPRT MI_ENTRY("echoprt", local, SANE_UNSET | REV, ECHOPRT, 0 ) - MI_ENTRY("prterase", local, REV | OMIT, ECHOPRT, 0 ) + MI_ENTRY("prterase", local, OMIT | REV, ECHOPRT, 0 ) #endif -#ifdef ECHOCTL +#if ECHOCTL MI_ENTRY("echoctl", local, SANE_SET | REV, ECHOCTL, 0 ) - MI_ENTRY("ctlecho", local, REV | OMIT, ECHOCTL, 0 ) + MI_ENTRY("ctlecho", local, OMIT | REV, ECHOCTL, 0 ) #endif -#ifdef ECHOKE +#if ECHOKE MI_ENTRY("echoke", local, SANE_SET | REV, ECHOKE, 0 ) - MI_ENTRY("crtkill", local, REV | OMIT, ECHOKE, 0 ) + MI_ENTRY("crtkill", local, OMIT | REV, ECHOKE, 0 ) #endif }; @@ -497,31 +646,31 @@ enum { CIDX_kill, CIDX_eof, CIDX_eol, -#ifdef VEOL2 +#if VEOL2 CIDX_eol2, #endif -#ifdef VSWTCH +#if VSWTCH CIDX_swtch, #endif CIDX_start, CIDX_stop, CIDX_susp, -#ifdef VDSUSP +#if VDSUSP CIDX_dsusp, #endif -#ifdef VREPRINT +#if VREPRINT CIDX_rprnt, #endif -#ifdef VWERASE +#if VWERASE CIDX_werase, #endif -#ifdef VLNEXT +#if VLNEXT CIDX_lnext, #endif -#ifdef VFLUSHO +#if VFLUSHO CIDX_flush, #endif -#ifdef VSTATUS +#if VSTATUS CIDX_status, #endif CIDX_min, @@ -538,31 +687,31 @@ static const char control_name[] = CI_ENTRY("kill", CKILL, VKILL ) CI_ENTRY("eof", CEOF, VEOF ) CI_ENTRY("eol", CEOL, VEOL ) -#ifdef VEOL2 +#if VEOL2 CI_ENTRY("eol2", CEOL2, VEOL2 ) #endif -#ifdef VSWTCH +#if VSWTCH CI_ENTRY("swtch", CSWTCH, VSWTCH ) #endif CI_ENTRY("start", CSTART, VSTART ) CI_ENTRY("stop", CSTOP, VSTOP ) CI_ENTRY("susp", CSUSP, VSUSP ) -#ifdef VDSUSP +#if VDSUSP CI_ENTRY("dsusp", CDSUSP, VDSUSP ) #endif -#ifdef VREPRINT +#if VREPRINT CI_ENTRY("rprnt", CRPRNT, VREPRINT) #endif -#ifdef VWERASE +#if VWERASE CI_ENTRY("werase", CWERASE, VWERASE ) #endif -#ifdef VLNEXT +#if VLNEXT CI_ENTRY("lnext", CLNEXT, VLNEXT ) #endif -#ifdef VFLUSHO +#if VFLUSHO CI_ENTRY("flush", CFLUSHO, VFLUSHO ) #endif -#ifdef VSTATUS +#if VSTATUS CI_ENTRY("status", CSTATUS, VSTATUS ) #endif /* These must be last because of the display routines */ @@ -581,31 +730,31 @@ static const struct control_info control_info[] = { CI_ENTRY("kill", CKILL, VKILL ) CI_ENTRY("eof", CEOF, VEOF ) CI_ENTRY("eol", CEOL, VEOL ) -#ifdef VEOL2 +#if VEOL2 CI_ENTRY("eol2", CEOL2, VEOL2 ) #endif -#ifdef VSWTCH +#if VSWTCH CI_ENTRY("swtch", CSWTCH, VSWTCH ) #endif CI_ENTRY("start", CSTART, VSTART ) CI_ENTRY("stop", CSTOP, VSTOP ) CI_ENTRY("susp", CSUSP, VSUSP ) -#ifdef VDSUSP +#if VDSUSP CI_ENTRY("dsusp", CDSUSP, VDSUSP ) #endif -#ifdef VREPRINT +#if VREPRINT CI_ENTRY("rprnt", CRPRNT, VREPRINT) #endif -#ifdef VWERASE +#if VWERASE CI_ENTRY("werase", CWERASE, VWERASE ) #endif -#ifdef VLNEXT +#if VLNEXT CI_ENTRY("lnext", CLNEXT, VLNEXT ) #endif -#ifdef VFLUSHO +#if VFLUSHO CI_ENTRY("flush", CFLUSHO, VFLUSHO ) #endif -#ifdef VSTATUS +#if VSTATUS CI_ENTRY("status", CSTATUS, VSTATUS ) #endif /* These must be last because of the display routines */ @@ -632,51 +781,6 @@ struct globals { G.max_col = 80; \ } while (0) - -/* Return a string that is the printable representation of character CH */ -/* Adapted from 'cat' by Torbjorn Granlund */ -static const char *visible(unsigned ch) -{ - char *bpout = G.buf; - - if (ch == _POSIX_VDISABLE) - return ""; - - if (ch >= 128) { - ch -= 128; - *bpout++ = 'M'; - *bpout++ = '-'; - } - - if (ch < 32) { - *bpout++ = '^'; - *bpout++ = ch + 64; - } else if (ch < 127) { - *bpout++ = ch; - } else { - *bpout++ = '^'; - *bpout++ = '?'; - } - - *bpout = '\0'; - return G.buf; -} - -static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode) -{ - static const uint8_t tcflag_offsets[] ALIGN1 = { - offsetof(struct termios, c_cflag), /* control */ - offsetof(struct termios, c_iflag), /* input */ - offsetof(struct termios, c_oflag), /* output */ - offsetof(struct termios, c_lflag) /* local */ - }; - - if (type <= local) { - return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]); - } - return NULL; -} - static void set_speed_or_die(enum speed_setting type, const char *arg, struct termios *mode) { @@ -740,6 +844,7 @@ static void newline(void) wrapf("\n"); } +#ifdef TIOCGWINSZ static void set_window_size(int rows, int cols) { struct winsize win = { 0, 0, 0, 0 }; @@ -760,6 +865,7 @@ static void set_window_size(int rows, int cols) bail: perror_on_device("%s"); } +#endif static void display_window_size(int fancy) { @@ -874,8 +980,9 @@ static void display_speed(const struct termios *mode, int fancy) const char *fmt_str = "%lu %lu\n\0ispeed %lu baud; ospeed %lu baud;"; unsigned long ispeed, ospeed; - ospeed = ispeed = cfgetispeed(mode); - if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) { + ispeed = cfgetispeed(mode); + ospeed = cfgetospeed(mode); + if (ispeed == 0 || ispeed == ospeed) { ispeed = ospeed; /* in case ispeed was 0 */ //________ 0123 4 5 6 7 8 9 fmt_str = "%lu\n\0\0\0\0\0speed %lu baud;"; @@ -894,13 +1001,14 @@ static void do_display(const struct termios *mode, int all) display_speed(mode, 1); if (all) display_window_size(1); -#ifdef HAVE_C_LINE +#ifdef __linux__ wrapf("line = %u;\n", mode->c_line); #else newline(); #endif for (i = 0; i != CIDX_min; ++i) { + char ch; /* If swtch is the same as susp, don't print both */ #if VSWTCH == VSUSP if (i == CIDX_swtch) @@ -914,8 +1022,12 @@ static void do_display(const struct termios *mode, int all) continue; } #endif - wrapf("%s = %s;", nth_string(control_name, i), - visible(mode->c_cc[control_info[i].offset])); + ch = mode->c_cc[control_info[i].offset]; + if (ch == _POSIX_VDISABLE) + strcpy(G.buf, ""); + else + visible(ch, G.buf, 0); + wrapf("%s = %s;", nth_string(control_name, i), G.buf); } #if VEOF == VMIN if ((mode->c_lflag & ICANON) == 0) @@ -931,7 +1043,7 @@ static void do_display(const struct termios *mode, int all) prev_type = mode_info[i].type; } - bitsp = mode_type_flag(mode_info[i].type, mode); + bitsp = get_ptr_to_tcflag(mode_info[i].type, mode); mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits; if ((*bitsp & mask) == mode_info[i].bits) { if (all || (mode_info[i].flags & SANE_UNSET)) @@ -950,7 +1062,6 @@ static void do_display(const struct termios *mode, int all) static void sane_mode(struct termios *mode) { int i; - tcflag_t *bitsp; for (i = 0; i < NUM_control_info; ++i) { #if VMIN == VEOF @@ -961,83 +1072,52 @@ static void sane_mode(struct termios *mode) } for (i = 0; i < NUM_mode_info; ++i) { + tcflag_t val; + tcflag_t *bitsp = get_ptr_to_tcflag(mode_info[i].type, mode); + + if (!bitsp) + continue; + val = *bitsp & ~((unsigned long)mode_info[i].mask); if (mode_info[i].flags & SANE_SET) { - bitsp = mode_type_flag(mode_info[i].type, mode); - *bitsp = (*bitsp & ~((unsigned long)mode_info[i].mask)) - | mode_info[i].bits; - } else if (mode_info[i].flags & SANE_UNSET) { - bitsp = mode_type_flag(mode_info[i].type, mode); - *bitsp = *bitsp & ~((unsigned long)mode_info[i].mask) - & ~mode_info[i].bits; + *bitsp = val | mode_info[i].bits; + } else + if (mode_info[i].flags & SANE_UNSET) { + *bitsp = val & ~mode_info[i].bits; } } } -/* Save set_mode from #ifdef forest plague */ -#ifndef ONLCR -#define ONLCR 0 -#endif -#ifndef OCRNL -#define OCRNL 0 -#endif -#ifndef ONLRET -#define ONLRET 0 -#endif -#ifndef XCASE -#define XCASE 0 -#endif -#ifndef IXANY -#define IXANY 0 -#endif -#ifndef TABDLY -#define TABDLY 0 -#endif -#ifndef OXTABS -#define OXTABS 0 -#endif -#ifndef IUCLC -#define IUCLC 0 -#endif -#ifndef OLCUC -#define OLCUC 0 -#endif -#ifndef ECHOCTL -#define ECHOCTL 0 -#endif -#ifndef ECHOKE -#define ECHOKE 0 -#endif - static void set_mode(const struct mode_info *info, int reversed, struct termios *mode) { tcflag_t *bitsp; - bitsp = mode_type_flag(info->type, mode); + bitsp = get_ptr_to_tcflag(info->type, mode); if (bitsp) { + tcflag_t val = *bitsp & ~info->mask; if (reversed) - *bitsp = *bitsp & ~info->mask & ~info->bits; + *bitsp = val & ~info->bits; else - *bitsp = (*bitsp & ~info->mask) | info->bits; + *bitsp = val | info->bits; return; } - /* Combination mode */ + /* !bitsp - it's a "combination" mode */ if (info == &mode_info[IDX_evenp] || info == &mode_info[IDX_parity]) { if (reversed) mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8; else - mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7; + mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7; } else if (info == &mode_info[IDX_oddp]) { if (reversed) mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8; else - mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB; + mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB; } else if (info == &mode_info[IDX_nl]) { if (reversed) { mode->c_iflag = (mode->c_iflag | ICRNL) & ~INLCR & ~IGNCR; - mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET; + mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET; } else { mode->c_iflag = mode->c_iflag & ~ICRNL; if (ONLCR) mode->c_oflag = mode->c_oflag & ~ONLCR; @@ -1093,27 +1173,32 @@ static void set_mode(const struct mode_info *info, int reversed, mode->c_cc[VTIME] = 0; } } - else if (IXANY && info == &mode_info[IDX_decctlq]) { +#if IXANY + else if (info == &mode_info[IDX_decctlq]) { if (reversed) mode->c_iflag |= IXANY; else mode->c_iflag &= ~IXANY; } - else if (TABDLY && info == &mode_info[IDX_tabs]) { +#endif +#if TABDLY + else if (info == &mode_info[IDX_tabs]) { if (reversed) mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB3; else mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB0; } - else if (OXTABS && info == &mode_info[IDX_tabs]) { +#endif +#if OXTABS + else if (info == &mode_info[IDX_tabs]) { if (reversed) mode->c_oflag |= OXTABS; else mode->c_oflag &= ~OXTABS; - } else - if (XCASE && IUCLC && OLCUC - && (info == &mode_info[IDX_lcase] || info == &mode_info[IDX_LCASE]) - ) { + } +#endif +#if XCASE && IUCLC && OLCUC + else if (info==&mode_info[IDX_lcase] || info==&mode_info[IDX_LCASE]) { if (reversed) { mode->c_lflag &= ~XCASE; mode->c_iflag &= ~IUCLC; @@ -1123,7 +1208,9 @@ static void set_mode(const struct mode_info *info, int reversed, mode->c_iflag |= IUCLC; mode->c_oflag |= OLCUC; } - } else if (info == &mode_info[IDX_crt]) { + } +#endif + else if (info == &mode_info[IDX_crt]) { mode->c_lflag |= ECHOE | ECHOCTL | ECHOKE; } else if (info == &mode_info[IDX_dec]) { mode->c_cc[VINTR] = 3; /* ^C */ @@ -1255,7 +1342,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv) } switch (param) { -#ifdef HAVE_C_LINE +#ifdef __linux__ case param_line: # ifndef TIOCGWINSZ xatoul_range_sfx(argnext, 1, INT_MAX, stty_suffixes); @@ -1291,13 +1378,15 @@ int stty_main(int argc UNUSED_PARAM, char **argv) /* Specifying both -a and -g is an error */ if ((stty_state & (STTY_verbose_output | STTY_recoverable_output)) == - (STTY_verbose_output | STTY_recoverable_output)) - bb_error_msg_and_die("verbose and stty-readable output styles are mutually exclusive"); + (STTY_verbose_output | STTY_recoverable_output) + ) { + bb_error_msg_and_die("-a and -g are mutually exclusive"); + } /* Specifying -a or -g with non-options is an error */ - if (!(stty_state & STTY_noargs) - && (stty_state & (STTY_verbose_output | STTY_recoverable_output)) + if ((stty_state & (STTY_verbose_output | STTY_recoverable_output)) + && !(stty_state & STTY_noargs) ) { - bb_error_msg_and_die("modes may not be set when specifying an output style"); + bb_error_msg_and_die("modes may not be set when -a or -g is used"); } /* Now it is safe to start doing things */ @@ -1359,7 +1448,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv) } switch (param) { -#ifdef HAVE_C_LINE +#ifdef __linux__ case param_line: mode.c_line = xatoul_sfx(argnext, stty_suffixes); stty_state |= STTY_require_set_attr; @@ -1419,7 +1508,12 @@ int stty_main(int argc UNUSED_PARAM, char **argv) perror_on_device_and_die("%s"); if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) { -#ifdef CIBAUD +/* + * I think the below chunk is not necessary on Linux. + * If you are deleting it, also delete STTY_speed_was_set bit - + * it is only ever checked here. + */ +#if 0 /* was "if CIBAUD" */ /* SunOS 4.1.3 (at least) has the problem that after this sequence, tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2); sometimes (m1 != m2). The only difference is in the four bits diff --git a/coreutils/sum.c b/coreutils/sum.c index 35e89a6..deb068e 100644 --- a/coreutils/sum.c +++ b/coreutils/sum.c @@ -10,9 +10,16 @@ * Written by Kayvan Aghaiepour and David MacKenzie * Taken from coreutils and turned into a busybox applet by Mike Frysinger * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define sum_trivial_usage +//usage: "[-rs] [FILE]..." +//usage:#define sum_full_usage "\n\n" +//usage: "Checksum and count the blocks in a file\n" +//usage: "\n -r Use BSD sum algorithm (1K blocks)" +//usage: "\n -s Use System V sum algorithm (512byte blocks)" + #include "libbb.h" enum { SUM_BSD, PRINT_NAME, SUM_SYSV }; @@ -63,9 +70,9 @@ static unsigned sum_file(const char *file, unsigned type) if (type >= SUM_SYSV) { r = (s & 0xffff) + ((s & 0xffffffff) >> 16); s = (r & 0xffff) + (r >> 16); - printf("%d %llu %s\n", s, (total_bytes + 511) / 512, file); + printf("%u %llu %s\n", s, (total_bytes + 511) / 512, file); } else - printf("%05d %5llu %s\n", s, (total_bytes + 1023) / 1024, file); + printf("%05u %5llu %s\n", s, (total_bytes + 1023) / 1024, file); return 1; #undef buf } @@ -87,8 +94,8 @@ int sum_main(int argc UNUSED_PARAM, char **argv) n = sum_file("-", type); } else { /* Need to print the name if either - - more than one file given - - doing sysv */ + * - more than one file given + * - doing sysv */ type += (argv[1] || type == SUM_SYSV); n = 1; do { diff --git a/coreutils/sync.c b/coreutils/sync.c index 59305c6..7d98a1e 100644 --- a/coreutils/sync.c +++ b/coreutils/sync.c @@ -4,11 +4,16 @@ * * Copyright (C) 1995, 1996 by Bruce Perens . * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ +//usage:#define sync_trivial_usage +//usage: "" +//usage:#define sync_full_usage "\n\n" +//usage: "Write all buffered blocks to disk" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/tac.c b/coreutils/tac.c index d70e23a..94d669d 100644 --- a/coreutils/tac.c +++ b/coreutils/tac.c @@ -6,7 +6,7 @@ * Copyright (C) 2007 Natanael Copa * Copyright (C) 2007 Tito Ragusa * - * Licensed under GPLv2, see file License in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. * */ @@ -16,6 +16,11 @@ * http://www.uclibc.org/lists/busybox/2003-July/008813.html */ +//usage:#define tac_trivial_usage +//usage: "[FILE]..." +//usage:#define tac_full_usage "\n\n" +//usage: "Concatenate FILEs and print them in reverse" + #include "libbb.h" /* This is a NOEXEC applet. Be very careful! */ diff --git a/coreutils/tail.c b/coreutils/tail.c index 6397702..eab502b 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -4,7 +4,7 @@ * * Copyright (C) 2001 by Matt Kraai * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant (need fancy for -c) */ @@ -24,19 +24,39 @@ * 7) lseek attempted when count==0 even if arg was +0 (from top) */ -#include "libbb.h" +//kbuild:lib-$(CONFIG_TAIL) += tail.o + +//usage:#define tail_trivial_usage +//usage: "[OPTIONS] [FILE]..." +//usage:#define tail_full_usage "\n\n" +//usage: "Print last 10 lines of each FILE (or stdin) to stdout.\n" +//usage: "With more than one FILE, precede each with a filename header.\n" +//usage: "\n -f Print data as file grows" +//usage: IF_FEATURE_FANCY_TAIL( +//usage: "\n -s SECONDS Wait SECONDS between reads with -f" +//usage: ) +//usage: "\n -n N[kbm] Print last N lines" +//usage: "\n -n +N[kbm] Start on Nth line and print the rest" +//usage: IF_FEATURE_FANCY_TAIL( +//usage: "\n -c [+]N[kbm] Print last N bytes" +//usage: "\n -q Never print headers" +//usage: "\n -v Always print headers" +//usage: "\n" +//usage: "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)." +//usage: ) +//usage: +//usage:#define tail_example_usage +//usage: "$ tail -n 1 /etc/resolv.conf\n" +//usage: "nameserver 10.0.0.1\n" -static const struct suffix_mult tail_suffixes[] = { - { "b", 512 }, - { "k", 1024 }, - { "m", 1024*1024 }, - { "", 0 } -}; +#include "libbb.h" struct globals { - bool status; + bool from_top; + bool exitcode; } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) +#define INIT_G() do { } while (0) static void tail_xprint_header(const char *fmt, const char *filename) { @@ -47,20 +67,11 @@ static void tail_xprint_header(const char *fmt, const char *filename) static ssize_t tail_read(int fd, char *buf, size_t count) { ssize_t r; - off_t current; - struct stat sbuf; - - /* /proc files report zero st_size, don't lseek them. */ - if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) { - current = lseek(fd, 0, SEEK_CUR); - if (sbuf.st_size < current) - xlseek(fd, 0, SEEK_SET); - } r = full_read(fd, buf, count); if (r < 0) { bb_perror_msg(bb_msg_read_error); - G.status = EXIT_FAILURE; + G.exitcode = EXIT_FAILURE; } return r; @@ -74,9 +85,9 @@ static unsigned eat_num(const char *p) p++; else if (*p == '+') { p++; - G.status = 1; /* mark that we saw "+" */ + G.from_top = 1; } - return xatou_sfx(p, tail_suffixes); + return xatou_sfx(p, bkm_suffixes); } int tail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -84,7 +95,6 @@ int tail_main(int argc, char **argv) { unsigned count = 10; unsigned sleep_period = 1; - bool from_top; const char *str_c, *str_n; char *tailbuf; @@ -95,6 +105,9 @@ int tail_main(int argc, char **argv) int *fds; const char *fmt; + int prev_fd; + + INIT_G(); #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL /* Allow legacy syntax of an initial numeric option without -n. */ @@ -127,8 +140,6 @@ int tail_main(int argc, char **argv) #endif argc -= optind; argv += optind; - from_top = G.status; /* 1 if there was "-c +N" or "-n +N" */ - G.status = EXIT_SUCCESS; /* open all the files */ fds = xmalloc(sizeof(fds[0]) * (argc + 1)); @@ -146,7 +157,7 @@ int tail_main(int argc, char **argv) do { int fd = open_or_warn_stdin(argv[i]); if (fd < 0 && !FOLLOW_RETRY) { - G.status = EXIT_FAILURE; + G.exitcode = EXIT_FAILURE; continue; } fds[nfiles] = fd; @@ -158,15 +169,19 @@ int tail_main(int argc, char **argv) /* prepare the buffer */ tailbufsize = BUFSIZ; - if (!from_top && COUNT_BYTES) { + if (!G.from_top && COUNT_BYTES) { if (tailbufsize < count + BUFSIZ) { tailbufsize = count + BUFSIZ; } } - tailbuf = xmalloc(tailbufsize); + /* tail -c1024m REGULAR_FILE doesn't really need 1G mem block. + * (In fact, it doesn't need ANY memory). So delay allocation. + */ + tailbuf = NULL; /* tail the files */ - fmt = header_fmt_str + 1; /* skip header leading newline on first output */ + + fmt = header_fmt_str + 1; /* skip leading newline in the header on the first output */ i = 0; do { char *buf; @@ -177,14 +192,14 @@ int tail_main(int argc, char **argv) int fd = fds[i]; if (ENABLE_FEATURE_FANCY_TAIL && fd < 0) - continue; /* may happen with -E */ + continue; /* may happen with -F */ if (nfiles > header_threshhold) { tail_xprint_header(fmt, argv[i]); fmt = header_fmt_str; } - if (!from_top) { + if (!G.from_top) { off_t current = lseek(fd, 0, SEEK_END); if (current > 0) { unsigned off; @@ -217,20 +232,23 @@ int tail_main(int argc, char **argv) } } + if (!tailbuf) + tailbuf = xmalloc(tailbufsize); + buf = tailbuf; taillen = 0; /* "We saw 1st line/byte". * Used only by +N code ("start from Nth", 1-based): */ seen = 1; newlines_seen = 0; - while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) { - if (from_top) { + while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) { + if (G.from_top) { int nwrite = nread; if (seen < count) { /* We need to skip a few more bytes/lines */ if (COUNT_BYTES) { nwrite -= (count - seen); - seen = count; + seen += nread; } else { char *s = buf; do { @@ -288,10 +306,11 @@ int tail_main(int argc, char **argv) buf = tailbuf + taillen; } } /* while (tail_read() > 0) */ - if (!from_top) { + if (!G.from_top) { xwrite(STDOUT_FILENO, tailbuf, taillen); } } while (++i < nfiles); + prev_fd = fds[i-1]; tailbuf = xrealloc(tailbuf, BUFSIZ); @@ -335,17 +354,32 @@ int tail_main(int argc, char **argv) if (nfiles > header_threshhold) { fmt = header_fmt_str; } - while ((nread = tail_read(fd, tailbuf, BUFSIZ)) > 0) { - if (fmt) { + for (;;) { + /* tail -f keeps following files even if they are truncated */ + struct stat sbuf; + /* /proc files report zero st_size, don't lseek them */ + if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) { + off_t current = lseek(fd, 0, SEEK_CUR); + if (sbuf.st_size < current) + xlseek(fd, 0, SEEK_SET); + } + + nread = tail_read(fd, tailbuf, BUFSIZ); + if (nread <= 0) + break; + if (fmt && (fd != prev_fd)) { tail_xprint_header(fmt, filename); fmt = NULL; + prev_fd = fd; } xwrite(STDOUT_FILENO, tailbuf, nread); } } while (++i < nfiles); - } + } /* while (1) */ + if (ENABLE_FEATURE_CLEAN_UP) { free(fds); + free(tailbuf); } - return G.status; + return G.exitcode; } diff --git a/coreutils/tee.c b/coreutils/tee.c index 0f24246..48cc050 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -4,12 +4,24 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ +//usage:#define tee_trivial_usage +//usage: "[-ai] [FILE]..." +//usage:#define tee_full_usage "\n\n" +//usage: "Copy stdin to each FILE, and also to stdout\n" +//usage: "\n -a Append to the given FILEs, don't overwrite" +//usage: "\n -i Ignore interrupt signals (SIGINT)" +//usage: +//usage:#define tee_example_usage +//usage: "$ echo \"Hello\" | tee /tmp/foo\n" +//usage: "$ cat /tmp/foo\n" +//usage: "Hello\n" + #include "libbb.h" int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -42,7 +54,7 @@ int tee_main(int argc, char **argv) * that doesn't consume all its input. Good idea... */ signal(SIGPIPE, SIG_IGN); - /* Allocate an array of FILE *'s, with one extra for a sentinal. */ + /* Allocate an array of FILE *'s, with one extra for a sentinel. */ fp = files = xzalloc(sizeof(FILE *) * (argc + 2)); np = names = argv - 1; @@ -70,8 +82,8 @@ int tee_main(int argc, char **argv) while ((c = safe_read(STDIN_FILENO, buf, sizeof(buf))) > 0) { fp = files; do - fwrite(buf, 1, c, *fp++); - while (*fp); + fwrite(buf, 1, c, *fp); + while (*++fp); } if (c < 0) { /* Make sure read errors are signaled. */ retval = EXIT_FAILURE; @@ -81,8 +93,8 @@ int tee_main(int argc, char **argv) while ((c = getchar()) != EOF) { fp = files; do - putc(c, *fp++); - while (*fp); + putc(c, *fp); + while (*++fp); } #endif diff --git a/coreutils/test.c b/coreutils/test.c index 70eac5f..4df505a 100644 --- a/coreutils/test.c +++ b/coreutils/test.c @@ -14,7 +14,7 @@ * in busybox. * modified by Bernhard Reutner-Fischer to be useable (i.e. a bit less bloaty). * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * Original copyright notice states: * "This program is in the Public Domain." @@ -39,19 +39,42 @@ //config: help //config: Enable 64-bit support in test. +/* "test --help" does not print help (POSIX compat), only "[ --help" does. + * We display " EXPRESSION ]" here (not " EXPRESSION") + * Unfortunately, it screws up generated BusyBox.html. TODO. */ +//usage:#define test_trivial_usage +//usage: "EXPRESSION ]" +//usage:#define test_full_usage "\n\n" +//usage: "Check file types, compare values etc. Return a 0/1 exit code\n" +//usage: "depending on logical value of EXPRESSION" +//usage: +//usage:#define test_example_usage +//usage: "$ test 1 -eq 2\n" +//usage: "$ echo $?\n" +//usage: "1\n" +//usage: "$ test 1 -eq 1\n" +//usage: "$ echo $?\n" +//usage: "0\n" +//usage: "$ [ -d /etc ]\n" +//usage: "$ echo $?\n" +//usage: "0\n" +//usage: "$ [ -d /junk ]\n" +//usage: "$ echo $?\n" +//usage: "1\n" + #include "libbb.h" #include /* This is a NOFORK applet. Be very careful! */ /* test_main() is called from shells, and we need to be extra careful here. - * This is true regardless of PREFER_APPLETS and STANDALONE_SHELL + * This is true regardless of PREFER_APPLETS and SH_STANDALONE * state. */ /* test(1) accepts the following grammar: - oexpr ::= aexpr | aexpr "-o" oexpr ; - aexpr ::= nexpr | nexpr "-a" aexpr ; - nexpr ::= primary | "!" primary + oexpr ::= aexpr | aexpr "-o" oexpr ; + aexpr ::= nexpr | nexpr "-a" aexpr ; + nexpr ::= primary | "!" primary primary ::= unary-operator operand | operand binary-operator operand | operand @@ -587,7 +610,7 @@ static int test_eaccess(char *path, int mode) return 0; /* Root can execute any file that has any one of the execute - bits set. */ + * bits set. */ if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) return 0; } @@ -687,7 +710,8 @@ static number_t nexpr(enum token n) if (n == EOI) { /* special case: [ ! ], [ a -a ! ] are valid */ /* IOW, "! ARG" may miss ARG */ - unnest_msg("aexpr(%s)\n", TOKSTR[n]); res = nexpr(n); - dbg_msg("aexpr: nexpr:%lld, next args:%s\n", res, args[1]); + dbg_msg("aexpr: nexpr:%lld, next args:%s(%p)\n", res, args[1], &args[1]); if (check_operator(*++args) == BAND) { - dbg_msg("aexpr: arg is AND, next args:%s\n", args[1]); + dbg_msg("aexpr: arg is AND, next args:%s(%p)\n", args[1], &args[1]); res = aexpr(check_operator(*++args)) && res; unnest_msg("oexpr(%s)\n", TOKSTR[n]); res = aexpr(n); - dbg_msg("oexpr: aexpr:%lld, next args:%s\n", res, args[1]); + dbg_msg("oexpr: aexpr:%lld, next args:%s(%p)\n", res, args[1], &args[1]); if (check_operator(*++args) == BOR) { - dbg_msg("oexpr: next arg is OR, next args:%s\n", args[1]); + dbg_msg("oexpr: next arg is OR, next args:%s(%p)\n", args[1], &args[1]); res = oexpr(check_operator(*++args)) || res; unnest_msg(" * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ struct test_statics; diff --git a/coreutils/touch.c b/coreutils/touch.c index dceb7c1..293a968 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -4,10 +4,10 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m, -r, -t not supported. */ +/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m not supported. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/touch.html */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) @@ -19,6 +19,53 @@ #include "libbb.h" +//config:config TOUCH +//config: bool "touch" +//config: default y +//config: help +//config: touch is used to create or change the access and/or +//config: modification timestamp of specified files. +//config: +//config:config FEATURE_TOUCH_NODEREF +//config: bool "Add support for -h" +//config: default y +//config: depends on TOUCH +//config: help +//config: Enable touch to have the -h option. +//config: This requires libc support for lutimes() function. +//config: +//config:config FEATURE_TOUCH_SUSV3 +//config: bool "Add support for SUSV3 features (-d -t -r)" +//config: default y +//config: depends on TOUCH +//config: help +//config: Enable touch to use a reference file or a given date/time argument. + +//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, BB_DIR_BIN, BB_SUID_DROP, touch)) + +//kbuild:lib-$(CONFIG_TOUCH) += touch.o + +//usage:#define touch_trivial_usage +//usage: "[-c]" IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") " FILE..." +//usage:#define touch_full_usage "\n\n" +//usage: "Update the last-modified date on the given FILE[s]\n" +//usage: "\n -c Don't create files" +//usage: IF_FEATURE_TOUCH_NODEREF( +//usage: "\n -h Don't follow links" +//usage: ) +//usage: IF_FEATURE_TOUCH_SUSV3( +//usage: "\n -d DT Date/time to use" +//usage: "\n -t DT Date/time to use" +//usage: "\n -r FILE Use FILE's date/time" +//usage: ) +//usage: +//usage:#define touch_example_usage +//usage: "$ ls -l /tmp/foo\n" +//usage: "/bin/ls: /tmp/foo: No such file or directory\n" +//usage: "$ touch /tmp/foo\n" +//usage: "$ ls -l /tmp/foo\n" +//usage: "-rw-rw-r-- 1 andersen andersen 0 Apr 15 01:11 /tmp/foo\n" + /* This is a NOFORK applet. Be very careful! */ /* coreutils implements: @@ -29,6 +76,7 @@ * parse STRING and use it instead of current time * -f (ignored, BSD compat) * -m change only the modification time + * -h, --no-dereference * -r, --reference=FILE * use this file's times instead of current time * -t STAMP @@ -43,13 +91,21 @@ int touch_main(int argc UNUSED_PARAM, char **argv) int fd; int status = EXIT_SUCCESS; int opts; -#if ENABLE_DESKTOP + enum { + OPT_c = (1 << 0), + OPT_r = (1 << 1) * ENABLE_FEATURE_TOUCH_SUSV3, + OPT_d = (1 << 2) * ENABLE_FEATURE_TOUCH_SUSV3, + OPT_t = (1 << 3) * ENABLE_FEATURE_TOUCH_SUSV3, + OPT_h = (1 << 4) * ENABLE_FEATURE_TOUCH_NODEREF, + }; +#if ENABLE_FEATURE_TOUCH_SUSV3 # if ENABLE_LONG_OPTS static const char touch_longopts[] ALIGN1 = /* name, has_arg, val */ "no-create\0" No_argument "c" "reference\0" Required_argument "r" "date\0" Required_argument "d" + IF_FEATURE_TOUCH_NODEREF("no-dereference\0" No_argument "h") ; # endif char *reference_file = NULL; @@ -62,20 +118,20 @@ int touch_main(int argc UNUSED_PARAM, char **argv) # define timebuf ((struct timeval*)NULL) #endif -#if ENABLE_DESKTOP && ENABLE_LONG_OPTS +#if ENABLE_FEATURE_TOUCH_SUSV3 && ENABLE_LONG_OPTS applet_long_options = touch_longopts; #endif /* -d and -t both set time. In coreutils, * accepted data format differs a bit between -d and -t. * We accept the same formats for both */ - opts = getopt32(argv, "c" IF_DESKTOP("r:d:t:") + opts = getopt32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:") + IF_FEATURE_TOUCH_NODEREF("h") /*ignored:*/ "fma" - IF_DESKTOP(, &reference_file) - IF_DESKTOP(, &date_str) - IF_DESKTOP(, &date_str) + IF_FEATURE_TOUCH_SUSV3(, &reference_file) + IF_FEATURE_TOUCH_SUSV3(, &date_str) + IF_FEATURE_TOUCH_SUSV3(, &date_str) ); - opts &= 1; /* only -c bit is left */ argv += optind; if (!*argv) { bb_show_usage(); @@ -85,28 +141,40 @@ int touch_main(int argc UNUSED_PARAM, char **argv) struct stat stbuf; xstat(reference_file, &stbuf); timebuf[1].tv_sec = timebuf[0].tv_sec = stbuf.st_mtime; + /* Can use .st_mtim.tv_nsec + * (or is it .st_mtimensec?? see date.c) + * to set microseconds too. + */ } if (date_str) { struct tm tm_time; time_t t; - //time(&t); - //localtime_r(&t, &tm_time); - memset(&tm_time, 0, sizeof(tm_time)); + //memset(&tm_time, 0, sizeof(tm_time)); + /* Better than memset: makes "HH:MM" dates meaningful */ + time(&t); + localtime_r(&t, &tm_time); parse_datestr(date_str, &tm_time); /* Correct any day of week and day of year etc. fields */ - tm_time.tm_isdst = -1; /* Be sure to recheck dst */ + tm_time.tm_isdst = -1; /* Be sure to recheck dst */ t = validate_tm_time(date_str, &tm_time); timebuf[1].tv_sec = timebuf[0].tv_sec = t; } do { - if (utimes(*argv, (reference_file || date_str) ? timebuf : NULL) != 0) { - if (errno == ENOENT) { /* no such file */ - if (opts) { /* creation is disabled, so ignore */ + int result; + result = ( +#if ENABLE_FEATURE_TOUCH_NODEREF + (opts & OPT_h) ? lutimes : +#endif + utimes)(*argv, (reference_file || date_str) ? timebuf : NULL); + if (result != 0) { + if (errno == ENOENT) { /* no such file? */ + if (opts & OPT_c) { + /* Creation is disabled, so ignore */ continue; } /* Try to create the file */ diff --git a/coreutils/tr.c b/coreutils/tr.c index f3db379..e67948a 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -13,7 +13,7 @@ * This version of tr is adapted from Minix tr and was modified * by Erik Andersen to be used in busybox. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html * TODO: graph, print @@ -47,6 +47,18 @@ //config: useful for cases when no other way of expressing a character //config: is possible. +//usage:#define tr_trivial_usage +//usage: "[-cds] STRING1 [STRING2]" +//usage:#define tr_full_usage "\n\n" +//usage: "Translate, squeeze, or delete characters from stdin, writing to stdout\n" +//usage: "\n -c Take complement of STRING1" +//usage: "\n -d Delete input characters coded STRING1" +//usage: "\n -s Squeeze multiple output characters of STRING2 into one character" +//usage: +//usage:#define tr_example_usage +//usage: "$ echo \"gdkkn vnqkc\" | tr [a-y] [b-z]\n" +//usage: "hello world\n" + #include "libbb.h" enum { @@ -203,7 +215,7 @@ static unsigned expand(const char *arg, char **buffer_p) buffer[pos++] = *arg; /* copy CHAR */ if (!arg[0] || arg[1] != '=' || arg[2] != ']') bb_show_usage(); - arg += 3; /* skip CHAR=] */ + arg += 3; /* skip CHAR=] */ continue; } /* The rest of "[xyz..." cases is treated as normal @@ -258,9 +270,9 @@ int tr_main(int argc UNUSED_PARAM, char **argv) char *invec = vector + ASCII; char *outvec = vector + ASCII * 2; -#define TR_OPT_complement (3 << 0) -#define TR_OPT_delete (1 << 2) -#define TR_OPT_squeeze_reps (1 << 3) +#define TR_OPT_complement (3 << 0) +#define TR_OPT_delete (1 << 2) +#define TR_OPT_squeeze_reps (1 << 3) for (i = 0; i < ASCII; i++) { vector[i] = i; @@ -324,5 +336,11 @@ int tr_main(int argc UNUSED_PARAM, char **argv) str2[out_index++] = last = coded; } + if (ENABLE_FEATURE_CLEAN_UP) { + free(vector); + free(str2); + free(str1); + } + return EXIT_SUCCESS; } diff --git a/coreutils/true.c b/coreutils/true.c index 8a7e6ae..382e476 100644 --- a/coreutils/true.c +++ b/coreutils/true.c @@ -4,12 +4,22 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */ +//usage:#define true_trivial_usage +//usage: "" +//usage:#define true_full_usage "\n\n" +//usage: "Return an exit code of TRUE (0)" +//usage: +//usage:#define true_example_usage +//usage: "$ true\n" +//usage: "$ echo $?\n" +//usage: "0\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/tty.c b/coreutils/tty.c index 69352ec..4517505 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c @@ -4,22 +4,34 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv4 compliant */ /* http://www.opengroup.org/onlinepubs/9699919799/utilities/tty.html */ +//usage:#define tty_trivial_usage +//usage: "" +//usage:#define tty_full_usage "\n\n" +//usage: "Print file name of stdin's terminal" +//usage: IF_INCLUDE_SUSv2( "\n" +//usage: "\n -s Print nothing, only return exit status" +//usage: ) +//usage: +//usage:#define tty_example_usage +//usage: "$ tty\n" +//usage: "/dev/tty2\n" + #include "libbb.h" int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int tty_main(int argc UNUSED_PARAM, char **argv) { const char *s; - IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ + IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ int retval; - xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ + xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");) IF_INCLUDE_SUSv2(argv += optind;) diff --git a/coreutils/uname.c b/coreutils/uname.c index 9822e49..b96d76b 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -2,7 +2,7 @@ /* uname -- print system information * Copyright (C) 1989-1999 Free Software Foundation, Inc. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ @@ -48,6 +48,22 @@ * Fix handling of -a to not print "unknown", add -o and -i support. */ +//usage:#define uname_trivial_usage +//usage: "[-amnrspv]" +//usage:#define uname_full_usage "\n\n" +//usage: "Print system information\n" +//usage: "\n -a Print all" +//usage: "\n -m The machine (hardware) type" +//usage: "\n -n Hostname" +//usage: "\n -r OS release" +//usage: "\n -s OS name (default)" +//usage: "\n -p Processor type" +//usage: "\n -v OS version" +//usage: +//usage:#define uname_example_usage +//usage: "$ uname -a\n" +//usage: "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n" + #include "libbb.h" /* After libbb.h, since it needs sys/types.h on some systems */ #include diff --git a/coreutils/uniq.c b/coreutils/uniq.c index e566dc1..9208d34 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -4,12 +4,29 @@ * * Copyright (C) 2005 Manuel Novoa III * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */ +//usage:#define uniq_trivial_usage +//usage: "[-cdu][-f,s,w N] [INPUT [OUTPUT]]" +//usage:#define uniq_full_usage "\n\n" +//usage: "Discard duplicate lines\n" +//usage: "\n -c Prefix lines by the number of occurrences" +//usage: "\n -d Only print duplicate lines" +//usage: "\n -u Only print unique lines" +//usage: "\n -f N Skip first N fields" +//usage: "\n -s N Skip first N chars (after any skipped fields)" +//usage: "\n -w N Compare N characters in line" +//usage: +//usage:#define uniq_example_usage +//usage: "$ echo -e \"a\\na\\nb\\nc\\nc\\na\" | sort | uniq\n" +//usage: "a\n" +//usage: "b\n" +//usage: "c\n" + #include "libbb.h" int uniq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -52,8 +69,8 @@ int uniq_main(int argc UNUSED_PARAM, char **argv) if (output[0] != '-' || output[1]) { // Won't work with "uniq - FILE" and closed stdin: //close(STDOUT_FILENO); - //xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666); - xmove_fd(xopen3(output, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO); + //xopen(output, O_WRONLY | O_CREAT | O_TRUNC); + xmove_fd(xopen(output, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO); } } } @@ -86,7 +103,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv) } free(cur_line); - ++dups; /* testing for overflow seems excessive */ + ++dups; /* testing for overflow seems excessive */ } if (old_line) { diff --git a/coreutils/usleep.c b/coreutils/usleep.c index e7acd5f..2e4eb57 100644 --- a/coreutils/usleep.c +++ b/coreutils/usleep.c @@ -4,11 +4,20 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */ +//usage:#define usleep_trivial_usage +//usage: "N" +//usage:#define usleep_full_usage "\n\n" +//usage: "Pause for N microseconds" +//usage: +//usage:#define usleep_example_usage +//usage: "$ usleep 1000000\n" +//usage: "[pauses for 1 second]\n" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ @@ -20,9 +29,7 @@ int usleep_main(int argc UNUSED_PARAM, char **argv) bb_show_usage(); } - if (usleep(xatou(argv[1]))) { - bb_perror_nomsg_and_die(); - } + usleep(xatou(argv[1])); return EXIT_SUCCESS; } diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 0298a4b..b298fcb 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c @@ -1,20 +1,31 @@ /* vi: set sw=4 ts=4: */ /* - * Copyright 2003, Glenn McGrath + * Copyright 2003, Glenn McGrath * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * Based on specification from - * http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html + * Based on specification from + * http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html * - * Bugs: the spec doesn't mention anything about "`\n`\n" prior to the - * "end" line + * Bugs: the spec doesn't mention anything about "`\n`\n" prior to the + * "end" line */ +//usage:#define uudecode_trivial_usage +//usage: "[-o OUTFILE] [INFILE]" +//usage:#define uudecode_full_usage "\n\n" +//usage: "Uudecode a file\n" +//usage: "Finds OUTFILE in uuencoded source unless -o is given" +//usage: +//usage:#define uudecode_example_usage +//usage: "$ uudecode -o busybox busybox.uu\n" +//usage: "$ ls -l busybox\n" +//usage: "-rwxr-xr-x 1 ams ams 245264 Jun 7 21:35 busybox\n" #include "libbb.h" -static void read_stduu(FILE *src_stream, FILE *dst_stream) +#if ENABLE_UUDECODE +static void FAST_FUNC read_stduu(FILE *src_stream, FILE *dst_stream, int flags UNUSED_PARAM) { char *line; @@ -74,67 +85,9 @@ static void read_stduu(FILE *src_stream, FILE *dst_stream) } bb_error_msg_and_die("short file"); } +#endif -static void read_base64(FILE *src_stream, FILE *dst_stream) -{ - int term_count = 1; - - while (1) { - char translated[4]; - int count = 0; - - while (count < 4) { - char *table_ptr; - int ch; - - /* Get next _valid_ character. - * global vector bb_uuenc_tbl_base64[] contains this string: - * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n" - */ - do { - ch = fgetc(src_stream); - if (ch == EOF) { - bb_error_msg_and_die("short file"); - } - table_ptr = strchr(bb_uuenc_tbl_base64, ch); - } while (table_ptr == NULL); - - /* Convert encoded character to decimal */ - ch = table_ptr - bb_uuenc_tbl_base64; - - if (*table_ptr == '=') { - if (term_count == 0) { - translated[count] = '\0'; - break; - } - term_count++; - } else if (*table_ptr == '\n') { - /* Check for terminating line */ - if (term_count == 5) { - return; - } - term_count = 1; - continue; - } else { - translated[count] = ch; - count++; - term_count = 0; - } - } - - /* Merge 6 bit chars to 8 bit */ - if (count > 1) { - fputc(translated[0] << 2 | translated[1] >> 4, dst_stream); - } - if (count > 2) { - fputc(translated[1] << 4 | translated[2] >> 2, dst_stream); - } - if (count > 3) { - fputc(translated[2] << 6 | translated[3], dst_stream); - } - } -} - +#if ENABLE_UUDECODE int uudecode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int uudecode_main(int argc UNUSED_PARAM, char **argv) { @@ -146,13 +99,13 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv) getopt32(argv, "o:", &outname); argv += optind; - if (!*argv) + if (!argv[0]) *--argv = (char*)"-"; - src_stream = xfopen_stdin(*argv); + src_stream = xfopen_stdin(argv[0]); /* Search for the start of the encoding */ while ((line = xmalloc_fgetline(src_stream)) != NULL) { - void (*decode_fn_ptr)(FILE *src, FILE *dst); + void FAST_FUNC (*decode_fn_ptr)(FILE *src, FILE *dst, int flags); char *line_ptr; FILE *dst_stream; int mode; @@ -172,10 +125,11 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv) mode = bb_strtou(line_ptr, NULL, 8); if (outname == NULL) { outname = strchr(line_ptr, ' '); - if ((outname == NULL) || (*outname == '\0')) { + if (!outname) break; - } outname++; + if (!outname[0]) + break; } dst_stream = stdout; if (NOT_LONE_DASH(outname)) { @@ -183,12 +137,73 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv) fchmod(fileno(dst_stream), mode & (S_IRWXU | S_IRWXG | S_IRWXO)); } free(line); - decode_fn_ptr(src_stream, dst_stream); + decode_fn_ptr(src_stream, dst_stream, /*flags:*/ BASE64_FLAG_UU_STOP + BASE64_FLAG_NO_STOP_CHAR); /* fclose_if_not_stdin(src_stream); - redundant */ return EXIT_SUCCESS; } bb_error_msg_and_die("no 'begin' line"); } +#endif + +//applet:IF_BASE64(APPLET(base64, BB_DIR_BIN, BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_BASE64) += uudecode.o + +//config:config BASE64 +//config: bool "base64" +//config: default y +//config: help +//config: Base64 encode and decode + +//usage:#define base64_trivial_usage +//usage: "[-d] [FILE]" +//usage:#define base64_full_usage "\n\n" +//usage: "Base64 encode or decode FILE to standard output" +//usage: "\n -d Decode data" +////usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)" +////usage: "\n -i When decoding, ignore non-alphabet characters" + +#if ENABLE_BASE64 +int base64_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int base64_main(int argc UNUSED_PARAM, char **argv) +{ + FILE *src_stream; + unsigned opts; + + opt_complementary = "?1"; /* 1 argument max */ + opts = getopt32(argv, "d"); + argv += optind; + + if (!argv[0]) + *--argv = (char*)"-"; + src_stream = xfopen_stdin(argv[0]); + if (opts) { + read_base64(src_stream, stdout, /*flags:*/ (char)EOF); + } else { + enum { + SRC_BUF_SIZE = 76/4*3, /* This *MUST* be a multiple of 3 */ + DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3), + }; + char src_buf[SRC_BUF_SIZE]; + char dst_buf[DST_BUF_SIZE + 1]; + int src_fd = fileno(src_stream); + while (1) { + size_t size = full_read(src_fd, src_buf, SRC_BUF_SIZE); + if (!size) + break; + if ((ssize_t)size < 0) + bb_perror_msg_and_die(bb_msg_read_error); + /* Encode the buffer we just read in */ + bb_uuencode(dst_buf, src_buf, size, bb_uuenc_tbl_base64); + xwrite(STDOUT_FILENO, dst_buf, 4 * ((size + 2) / 3)); + bb_putchar('\n'); + fflush(stdout); + } + } + + fflush_stdout_and_exit(EXIT_SUCCESS); +} +#endif /* Test script. Put this into an empty dir with busybox binary, an run. diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c index bf66185..673ef36 100644 --- a/coreutils/uuencode.c +++ b/coreutils/uuencode.c @@ -5,13 +5,26 @@ * based on the function base64_encode from http.c in wget v1.6 * Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define uuencode_trivial_usage +//usage: "[-m] [FILE] STORED_FILENAME" +//usage:#define uuencode_full_usage "\n\n" +//usage: "Uuencode FILE (or stdin) to stdout\n" +//usage: "\n -m Use base64 encoding per RFC1521" +//usage: +//usage:#define uuencode_example_usage +//usage: "$ uuencode busybox busybox\n" +//usage: "begin 755 busybox\n" +//usage: "\n" +//usage: "$ uudecode busybox busybox > busybox.uu\n" +//usage: "$\n" + #include "libbb.h" enum { - SRC_BUF_SIZE = 45, /* This *MUST* be a multiple of 3 */ + SRC_BUF_SIZE = 15*3, /* This *MUST* be a multiple of 3 */ DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3), }; @@ -33,7 +46,7 @@ int uuencode_main(int argc UNUSED_PARAM, char **argv) } argv += optind; if (argv[1]) { - src_fd = xopen(*argv, O_RDONLY); + src_fd = xopen(argv[0], O_RDONLY); fstat(src_fd, &stat_buf); mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); argv++; diff --git a/coreutils/wc.c b/coreutils/wc.c index 7116842..a410e40 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c @@ -4,10 +4,10 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */ +/* BB_AUDIT SUSv3 compliant. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) @@ -19,10 +19,6 @@ * 3) no checking of ferror on EOF returns * 4) isprint() wasn't considered when word counting. * - * TODO: - * - * When locale support is enabled, count multibyte chars in the '-m' case. - * * NOTES: * * The previous busybox wc attempted an optimization using stat for the @@ -40,8 +36,8 @@ * * for which 'wc -c' should output '0'. */ - #include "libbb.h" +#include "unicode.h" #if !ENABLE_LOCALE_SUPPORT # undef isprint @@ -58,11 +54,38 @@ # define COUNT_FMT "u" #endif +/* We support -m even when UNICODE_SUPPORT is off, + * we just don't advertise it in help text, + * since it is the same as -c in this case. + */ + +//usage:#define wc_trivial_usage +//usage: "[-c"IF_UNICODE_SUPPORT("m")"lwL] [FILE]..." +//usage: +//usage:#define wc_full_usage "\n\n" +//usage: "Count lines, words, and bytes for each FILE (or stdin)\n" +//usage: "\n -c Count bytes" +//usage: IF_UNICODE_SUPPORT( +//usage: "\n -m Count characters" +//usage: ) +//usage: "\n -l Count newlines" +//usage: "\n -w Count words" +//usage: "\n -L Print longest line length" +//usage: +//usage:#define wc_example_usage +//usage: "$ wc /etc/passwd\n" +//usage: " 31 46 1365 /etc/passwd\n" + +/* Order is important if we want to be compatible with + * column order in "wc -cmlwL" output: + */ enum { - WC_LINES = 0, - WC_WORDS = 1, - WC_CHARS = 2, - WC_LENGTH = 3 + WC_LINES = 0, /* -l */ + WC_WORDS = 1, /* -w */ + WC_UNICHARS = 2, /* -m */ + WC_BYTES = 3, /* -c */ + WC_LENGTH = 4, /* -L */ + NUM_WCS = 5, }; int wc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -72,16 +95,18 @@ int wc_main(int argc UNUSED_PARAM, char **argv) const char *start_fmt = " %9"COUNT_FMT + 1; const char *fname_fmt = " %s\n"; COUNT_T *pcounts; - COUNT_T counts[4]; - COUNT_T totals[4]; + COUNT_T counts[NUM_WCS]; + COUNT_T totals[NUM_WCS]; int num_files; smallint status = EXIT_SUCCESS; unsigned print_type; - print_type = getopt32(argv, "lwcL"); + init_unicode(); + + print_type = getopt32(argv, "lwmcL"); if (print_type == 0) { - print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS); + print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_BYTES); } argv += optind; @@ -99,7 +124,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) pcounts = counts; num_files = 0; - while ((arg = *argv++) != 0) { + while ((arg = *argv++) != NULL) { FILE *fp; const char *s; unsigned u; @@ -117,21 +142,28 @@ int wc_main(int argc UNUSED_PARAM, char **argv) linepos = 0; in_word = 0; - do { + while (1) { int c; /* Our -w doesn't match GNU wc exactly... oh well */ - ++counts[WC_CHARS]; c = getc(fp); if (c == EOF) { if (ferror(fp)) { bb_simple_perror_msg(arg); status = EXIT_FAILURE; } - --counts[WC_CHARS]; - goto DO_EOF; /* Treat an EOF as '\r'. */ + goto DO_EOF; /* Treat an EOF as '\r'. */ } - if (isprint_asciionly(c)) { + + /* Cater for -c and -m */ + ++counts[WC_BYTES]; + if (unicode_status != UNICODE_ON /* every byte is a new char */ + || (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */ + ) { + ++counts[WC_UNICHARS]; + } + + if (isprint_asciionly(c)) { /* FIXME: not unicode-aware */ ++linepos; if (!isspace(c)) { in_word = 1; @@ -146,7 +178,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) */ if (c == '\t') { linepos = (linepos | 7) + 1; - } else { /* '\n', '\r', '\f', or '\v' */ + } else { /* '\n', '\r', '\f', or '\v' */ DO_EOF: if (linepos > counts[WC_LENGTH]) { counts[WC_LENGTH] = linepos; @@ -167,18 +199,18 @@ int wc_main(int argc UNUSED_PARAM, char **argv) if (c == EOF) { break; } - } while (1); + } + + fclose_if_not_stdin(fp); if (totals[WC_LENGTH] < counts[WC_LENGTH]) { totals[WC_LENGTH] = counts[WC_LENGTH]; } totals[WC_LENGTH] -= counts[WC_LENGTH]; - fclose_if_not_stdin(fp); - OUTPUT: /* coreutils wc tries hard to print pretty columns - * (saves results for all files, find max col len etc...) + * (saves results for all files, finds max col len etc...) * we won't try that hard, it will bloat us too much */ s = start_fmt; u = 0; @@ -188,7 +220,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) s = " %9"COUNT_FMT; /* Ok... restore the leading space. */ } totals[u] += pcounts[u]; - } while (++u < 4); + } while (++u < NUM_WCS); printf(fname_fmt, arg); } @@ -197,7 +229,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) * effect of trashing the totals array after outputting it, but that's * irrelavent since we no longer need it. */ if (num_files > 1) { - num_files = 0; /* Make sure we don't get here again. */ + num_files = 0; /* Make sure we don't get here again. */ arg = "total"; pcounts = totals; --argv; diff --git a/coreutils/who.c b/coreutils/who.c index 2b43310..f955ce6 100644 --- a/coreutils/who.c +++ b/coreutils/who.c @@ -12,14 +12,45 @@ * * Copyright (c) 2002 AYR Networks, Inc. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * *---------------------------------------------------------------------- */ /* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'. */ +//config:config WHO +//config: bool "who" +//config: default y +//config: depends on FEATURE_UTMP +//config: help +//config: who is used to show who is logged on. + +//config:config USERS +//config: bool "users" +//config: default y +//config: depends on FEATURE_UTMP +//config: help +//config: Print users currently logged on. + +//applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users)) +//applet:IF_WHO( APPLET( who, BB_DIR_USR_BIN, BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_USERS) += who.o +//kbuild:lib-$(CONFIG_WHO) += who.o + +//usage:#define users_trivial_usage +//usage: "" +//usage:#define users_full_usage "\n\n" +//usage: "Print the users currently logged on" + +//usage:#define who_trivial_usage +//usage: "[-a]" +//usage:#define who_full_usage "\n\n" +//usage: "Show who is logged on\n" +//usage: "\n -a Show all" +//usage: "\n -H Print column headers" + #include "libbb.h" -#include static void idle_string(char *str6, time_t t) { @@ -44,9 +75,11 @@ int who_main(int argc UNUSED_PARAM, char **argv) { struct utmp *ut; unsigned opt; + int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u')); + const char *fmt = "%s"; opt_complementary = "=0"; - opt = getopt32(argv, "aH"); + opt = getopt32(argv, do_users ? "" : "aH"); if (opt & 2) // -H printf("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST\n"); @@ -55,36 +88,43 @@ int who_main(int argc UNUSED_PARAM, char **argv) if (ut->ut_user[0] && ((opt & 1) || ut->ut_type == USER_PROCESS) ) { - char str6[6]; - char name[sizeof("/dev/") + sizeof(ut->ut_line) + 1]; - struct stat st; - time_t seconds; + if (!do_users) { + char str6[6]; + char name[sizeof("/dev/") + sizeof(ut->ut_line) + 1]; + struct stat st; + time_t seconds; - str6[0] = '?'; - str6[1] = '\0'; - strcpy(name, "/dev/"); - safe_strncpy(ut->ut_line[0] == '/' ? name : name + sizeof("/dev/")-1, - ut->ut_line, - sizeof(ut->ut_line)+1 - ); - if (stat(name, &st) == 0) - idle_string(str6, st.st_atime); - /* manpages say ut_tv.tv_sec *is* time_t, - * but some systems have it wrong */ - seconds = ut->ut_tv.tv_sec; - /* How wide time field can be? - * "Nov 10 19:33:20": 15 chars - * "2010-11-10 19:33": 16 chars - */ - printf("%-15.*s %-15.*s %-7s %-16.16s %.*s\n", - (int)sizeof(ut->ut_user), ut->ut_user, - (int)sizeof(ut->ut_line), ut->ut_line, - str6, - ctime(&seconds) + 4, - (int)sizeof(ut->ut_host), ut->ut_host - ); + str6[0] = '?'; + str6[1] = '\0'; + strcpy(name, "/dev/"); + safe_strncpy(ut->ut_line[0] == '/' ? name : name + sizeof("/dev/")-1, + ut->ut_line, + sizeof(ut->ut_line)+1 + ); + if (stat(name, &st) == 0) + idle_string(str6, st.st_atime); + /* manpages say ut_tv.tv_sec *is* time_t, + * but some systems have it wrong */ + seconds = ut->ut_tv.tv_sec; + /* How wide time field can be? + * "Nov 10 19:33:20": 15 chars + * "2010-11-10 19:33": 16 chars + */ + printf("%-15.*s %-15.*s %-7s %-16.16s %.*s\n", + (int)sizeof(ut->ut_user), ut->ut_user, + (int)sizeof(ut->ut_line), ut->ut_line, + str6, + ctime(&seconds) + 4, + (int)sizeof(ut->ut_host), ut->ut_host + ); + } else { + printf(fmt, ut->ut_user); + fmt = " %s"; + } } } + if (do_users) + bb_putchar('\n'); if (ENABLE_FEATURE_CLEAN_UP) endutent(); return EXIT_SUCCESS; diff --git a/coreutils/whoami.c b/coreutils/whoami.c index 22d722e..30b17ca 100644 --- a/coreutils/whoami.c +++ b/coreutils/whoami.c @@ -4,11 +4,16 @@ * * Copyright (C) 2000 Edward Betts . * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ +//usage:#define whoami_trivial_usage +//usage: "" +//usage:#define whoami_full_usage "\n\n" +//usage: "Print the user name associated with the current effective user id" + #include "libbb.h" /* This is a NOFORK applet. Be very careful! */ diff --git a/coreutils/yes.c b/coreutils/yes.c index ead674b..5d799f0 100644 --- a/coreutils/yes.c +++ b/coreutils/yes.c @@ -4,7 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py deleted file mode 100755 index f0857fa..0000000 --- a/debian/bin/genorig.py +++ /dev/null @@ -1,168 +0,0 @@ -#!/usr/bin/env python - -import os, os.path, re, shutil, sys - -class Changelog(list): - _rules = r""" -^ -(?P - \w[-+0-9a-z.]+ -) -\ -$ -(?P - [^\($\ \t]+ -) -\) -\s+ -(?P - [-+0-9a-zA-Z.]+ -) -\; -""" - _re = re.compile(_rules, re.X) - - class Entry(object): - __slot__ = 'distribution', 'source', 'version' - - def __init__(self, distribution, source, version): - self.distribution, self.source, self.version = distribution, source, version - - def __init__(self, dir = '', version = None): - if version is None: - version = Version - f = file(os.path.join(dir, "debian/changelog")) - while True: - line = f.readline() - if not line: - break - match = self._re.match(line) - if not match: - continue - try: - v = version(match.group('version')) - except Exception: - if not len(self): - raise - v = Version(match.group('version')) - self.append(self.Entry(match.group('distribution'), match.group('source'), v)) - -class Version(object): - _version_rules = ur""" -^ -(?: - (?P - \d+ - ) - : -)? -(?P - .+? -) -(?: - - - (?P[^-]+) -)? -$ -""" - _version_re = re.compile(_version_rules, re.X) - - def __init__(self, version): - match = self._version_re.match(version) - if match is None: - raise RuntimeError, "Invalid debian version" - self.epoch = None - if match.group("epoch") is not None: - self.epoch = int(match.group("epoch")) - self.upstream = match.group("upstream") - self.revision = match.group("revision") - - def __str__(self): - return self.complete - - @property - def complete(self): - if self.epoch is not None: - return "%d:%s" % (self.epoch, self.complete_noepoch) - return self.complete_noepoch - - @property - def complete_noepoch(self): - if self.revision is not None: - return "%s-%s" % (self.upstream, self.revision) - return self.upstream - -class Main(object): - def __init__(self, input_tar, override_version): - self.log = sys.stdout.write - - self.input_tar = input_tar - - changelog = Changelog()[0] - source = changelog.source - version = changelog.version - - if override_version: - version = Version('%s-undef' % override_version) - - self.log('Using source name %s, version %s\n' % (source, version.upstream)) - - self.orig = '%s-%s' % (source, version.upstream) - self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream) - - def __call__(self): - import tempfile - self.dir = tempfile.mkdtemp(prefix = 'genorig', dir = 'debian') - try: - self.upstream() - self.remove() - self.tar() - finally: - shutil.rmtree(self.dir) - - def upstream(self): - self.log("Extracting tarball %s\n" % self.input_tar) - match = re.match(r'(^|.*/).*\.(?P(tar\.(bz2|gz)|tbz2|tgz))?$', self.input_tar) - if not match: - raise RuntimeError("Can't identify name of tarball") - cmdline = ['tar -xf', self.input_tar, '-C', self.dir] - if match.group('extension') in ('tar.bz2', 'tbz2'): - cmdline.append('-j') - elif match.group('extension') in ('tar.gz', 'tgz'): - cmdline.append('-z') - if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]): - raise RuntimeError("Can't extract tarball") - - def remove(self): - self.log("Remove files\n") - root = os.path.join(self.dir, self.orig) - os.unlink(os.path.join(root, "networking/ftp_ipv6_rfc2428.txt")) - - def tar(self): - out = os.path.join("../orig", self.orig_tar) - try: - os.mkdir("../orig") - except OSError: pass - try: - os.stat(out) - raise RuntimeError("Destination already exists") - except OSError: pass - self.log("Generate tarball %s\n" % out) - cmdline = ['tar -czf', out, '-C', self.dir, self.orig] - try: - if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]): - raise RuntimeError("Can't patch source") - os.chmod(out, 0644) - except: - try: - os.unlink(out) - except OSError: - pass - raise - -if __name__ == '__main__': - from optparse import OptionParser - parser = OptionParser(usage = "%prog [OPTION]... TAR [PATCH]") - parser.add_option("-v", "--version", dest = "version", help = "Override version", metavar = "VERSION") - options, args = parser.parse_args() - Main(args[0], options.version)() diff --git a/debian/busybox-klogd.service b/debian/busybox-klogd.service deleted file mode 100644 index 8b5d726..0000000 --- a/debian/busybox-klogd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Busybox Logging Service: klogd -After=busybox-syslogd.service syslog.target - -[Service] -Type=simple -ExecStart=/sbin/klogd -n -c4 - -[Install] -WantedBy=multi-user.target diff --git a/debian/busybox-static.install b/debian/busybox-static.install deleted file mode 100644 index 1434949..0000000 --- a/debian/busybox-static.install +++ /dev/null @@ -1,2 +0,0 @@ -busybox bin -docs/busybox.1 usr/share/man/man1 diff --git a/debian/busybox-symlinks-adduser.links b/debian/busybox-symlinks-adduser.links deleted file mode 100644 index af4207a..0000000 --- a/debian/busybox-symlinks-adduser.links +++ /dev/null @@ -1,4 +0,0 @@ -bin/busybox usr/sbin/addgroup -bin/busybox usr/sbin/adduser -bin/busybox usr/sbin/delgroup -bin/busybox usr/sbin/deluser diff --git a/debian/busybox-symlinks-adjtimex.links b/debian/busybox-symlinks-adjtimex.links deleted file mode 100644 index cdb3eeb..0000000 --- a/debian/busybox-symlinks-adjtimex.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/adjtimex diff --git a/debian/busybox-symlinks-binutils.links b/debian/busybox-symlinks-binutils.links deleted file mode 100644 index c687a4c..0000000 --- a/debian/busybox-symlinks-binutils.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/bin/ar -bin/busybox usr/bin/strings diff --git a/debian/busybox-symlinks-bridge-utils.links b/debian/busybox-symlinks-bridge-utils.links deleted file mode 100644 index 63dd55c..0000000 --- a/debian/busybox-symlinks-bridge-utils.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/brctl diff --git a/debian/busybox-symlinks-bsdmainutils.links b/debian/busybox-symlinks-bsdmainutils.links deleted file mode 100644 index be467d6..0000000 --- a/debian/busybox-symlinks-bsdmainutils.links +++ /dev/null @@ -1,3 +0,0 @@ -bin/busybox usr/bin/cal -bin/busybox usr/bin/hd -bin/busybox usr/bin/hexdump diff --git a/debian/busybox-symlinks-busybox.links b/debian/busybox-symlinks-busybox.links deleted file mode 100644 index 3debeb1..0000000 --- a/debian/busybox-symlinks-busybox.links +++ /dev/null @@ -1,35 +0,0 @@ -bin/busybox usr/bin/[[ -bin/busybox usr/bin/catv -bin/busybox usr/sbin/crond -bin/busybox usr/sbin/dhcprelay -bin/busybox usr/sbin/dnsd -bin/busybox bin/dumpkmap -bin/busybox usr/bin/ether-wake -bin/busybox usr/sbin/fakeidentd -bin/busybox sbin/fbsplash -bin/busybox bin/fsync -bin/busybox usr/bin/ftpget -bin/busybox usr/bin/ftpput -bin/busybox usr/sbin/httpd -bin/busybox sbin/ifenslave -bin/busybox sbin/inotifyd -bin/busybox bin/ipaddr -bin/busybox bin/iplink -bin/busybox bin/iproute -bin/busybox bin/iprule -bin/busybox usr/bin/length -bin/busybox usr/bin/loadfont -bin/busybox sbin/loadkmap -bin/busybox sbin/logread -bin/busybox sbin/makedevs -bin/busybox sbin/mdev -bin/busybox usr/bin/microcom -bin/busybox usr/bin/nmeter -bin/busybox usr/bin/pscan -bin/busybox sbin/raidautorun -bin/busybox usr/bin/readahead -bin/busybox sbin/setconsole -bin/busybox usr/sbin/tftpd -bin/busybox usr/bin/ttysize -bin/busybox bin/usleep -bin/busybox usr/bin/volname diff --git a/debian/busybox-symlinks-bzip2.links b/debian/busybox-symlinks-bzip2.links deleted file mode 100644 index 590ea6c..0000000 --- a/debian/busybox-symlinks-bzip2.links +++ /dev/null @@ -1,3 +0,0 @@ -bin/busybox bin/bunzip2 -bin/busybox bin/bzcat -bin/busybox bin/bzip2 diff --git a/debian/busybox-symlinks-console-tools.links b/debian/busybox-symlinks-console-tools.links deleted file mode 100644 index 9c39eed..0000000 --- a/debian/busybox-symlinks-console-tools.links +++ /dev/null @@ -1,8 +0,0 @@ -bin/busybox usr/bin/chvt -bin/busybox usr/bin/deallocvt -bin/busybox bin/fgconsole -bin/busybox usr/bin/kbd_mode -bin/busybox usr/bin/openvt -bin/busybox usr/bin/setkeycodes -bin/busybox usr/bin/setlogcons -bin/busybox usr/bin/showkey diff --git a/debian/busybox-symlinks-cpio.links b/debian/busybox-symlinks-cpio.links deleted file mode 100644 index b31d727..0000000 --- a/debian/busybox-symlinks-cpio.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox bin/cpio diff --git a/debian/busybox-symlinks-cpio.postinst b/debian/busybox-symlinks-cpio.postinst deleted file mode 100644 index 3c12d3d..0000000 --- a/debian/busybox-symlinks-cpio.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -update-alternatives --install /bin/mt mt /bin/busybox 1 diff --git a/debian/busybox-symlinks-cpio.prerm b/debian/busybox-symlinks-cpio.prerm deleted file mode 100644 index c6a3f50..0000000 --- a/debian/busybox-symlinks-cpio.prerm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -update-alternatives --remove mt /bin/busybox diff --git a/debian/busybox-symlinks-cron.links b/debian/busybox-symlinks-cron.links deleted file mode 100644 index 9b1fe35..0000000 --- a/debian/busybox-symlinks-cron.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/crontab diff --git a/debian/busybox-symlinks-daemontools.links b/debian/busybox-symlinks-daemontools.links deleted file mode 100644 index 3330648..0000000 --- a/debian/busybox-symlinks-daemontools.links +++ /dev/null @@ -1,4 +0,0 @@ -bin/busybox usr/bin/envdir -bin/busybox usr/bin/envuidgid -bin/busybox usr/bin/setuidgid -bin/busybox usr/bin/softlimit diff --git a/debian/busybox-symlinks-dc.links b/debian/busybox-symlinks-dc.links deleted file mode 100644 index 86f8c30..0000000 --- a/debian/busybox-symlinks-dc.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/dc diff --git a/debian/busybox-symlinks-dnsutils.links b/debian/busybox-symlinks-dnsutils.links deleted file mode 100644 index eb44fc7..0000000 --- a/debian/busybox-symlinks-dnsutils.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/nslookup diff --git a/debian/busybox-symlinks-dosfstools.links b/debian/busybox-symlinks-dosfstools.links deleted file mode 100644 index ff83723..0000000 --- a/debian/busybox-symlinks-dosfstools.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox sbin/mkdosfs -bin/busybox sbin/mkfs.vfat diff --git a/debian/busybox-symlinks-ed.links b/debian/busybox-symlinks-ed.links deleted file mode 100644 index 90fbc07..0000000 --- a/debian/busybox-symlinks-ed.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox bin/ed diff --git a/debian/busybox-symlinks-eject.links b/debian/busybox-symlinks-eject.links deleted file mode 100644 index 70e7ff1..0000000 --- a/debian/busybox-symlinks-eject.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/eject diff --git a/debian/busybox-symlinks-fbset.links b/debian/busybox-symlinks-fbset.links deleted file mode 100644 index d2526a1..0000000 --- a/debian/busybox-symlinks-fbset.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox bin/fbset diff --git a/debian/busybox-symlinks-fdflush.links b/debian/busybox-symlinks-fdflush.links deleted file mode 100644 index 66c3d68..0000000 --- a/debian/busybox-symlinks-fdflush.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox bin/fdflush diff --git a/debian/busybox-symlinks-hdparm.links b/debian/busybox-symlinks-hdparm.links deleted file mode 100644 index b7ddf97..0000000 --- a/debian/busybox-symlinks-hdparm.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox sbin/hdparm diff --git a/debian/busybox-symlinks-ifupdown.dirs b/debian/busybox-symlinks-ifupdown.dirs deleted file mode 100644 index d7fd273..0000000 --- a/debian/busybox-symlinks-ifupdown.dirs +++ /dev/null @@ -1,4 +0,0 @@ -etc/network/if-post-down.d -etc/network/if-pre-up.d -etc/network/if-up.d -etc/network/if-down.d diff --git a/debian/busybox-symlinks-ifupdown.links b/debian/busybox-symlinks-ifupdown.links deleted file mode 100644 index 26e4525..0000000 --- a/debian/busybox-symlinks-ifupdown.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox sbin/ifdown -bin/busybox sbin/ifup diff --git a/debian/busybox-symlinks-initscripts.links b/debian/busybox-symlinks-initscripts.links deleted file mode 100644 index 8fca0bb..0000000 --- a/debian/busybox-symlinks-initscripts.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox bin/mountpoint diff --git a/debian/busybox-symlinks-ipcalc.links b/debian/busybox-symlinks-ipcalc.links deleted file mode 100644 index 9cbb249..0000000 --- a/debian/busybox-symlinks-ipcalc.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/ipcalc diff --git a/debian/busybox-symlinks-iproute.links b/debian/busybox-symlinks-iproute.links deleted file mode 100644 index 5875622..0000000 --- a/debian/busybox-symlinks-iproute.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox bin/ip -bin/busybox sbin/ip diff --git a/debian/busybox-symlinks-ipsvd.links b/debian/busybox-symlinks-ipsvd.links deleted file mode 100644 index 1376e43..0000000 --- a/debian/busybox-symlinks-ipsvd.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/bin/tcpsvd -bin/busybox usr/bin/udpsvd diff --git a/debian/busybox-symlinks-iputils-arping.links b/debian/busybox-symlinks-iputils-arping.links deleted file mode 100644 index da66deb..0000000 --- a/debian/busybox-symlinks-iputils-arping.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/arping diff --git a/debian/busybox-symlinks-iputils-ping.links b/debian/busybox-symlinks-iputils-ping.links deleted file mode 100644 index 80d5ce2..0000000 --- a/debian/busybox-symlinks-iputils-ping.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox bin/ping -bin/busybox bin/ping6 diff --git a/debian/busybox-symlinks-klogd.links b/debian/busybox-symlinks-klogd.links deleted file mode 100644 index f7749be..0000000 --- a/debian/busybox-symlinks-klogd.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox sbin/klogd diff --git a/debian/busybox-symlinks-loadlin.links b/debian/busybox-symlinks-loadlin.links deleted file mode 100644 index 4890004..0000000 --- a/debian/busybox-symlinks-loadlin.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/freeramdisk diff --git a/debian/busybox-symlinks-lrzsz.links b/debian/busybox-symlinks-lrzsz.links deleted file mode 100644 index 1a33f12..0000000 --- a/debian/busybox-symlinks-lrzsz.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/rx diff --git a/debian/busybox-symlinks-lzma.links b/debian/busybox-symlinks-lzma.links deleted file mode 100644 index 42f8232..0000000 --- a/debian/busybox-symlinks-lzma.links +++ /dev/null @@ -1,3 +0,0 @@ -bin/busybox usr/bin/lzcat -bin/busybox usr/bin/lzma -bin/busybox usr/bin/unlzma diff --git a/debian/busybox-symlinks-lzop.links b/debian/busybox-symlinks-lzop.links deleted file mode 100644 index 9987db9..0000000 --- a/debian/busybox-symlinks-lzop.links +++ /dev/null @@ -1,3 +0,0 @@ -bin/busybox usr/bin/lzop -bin/busybox usr/bin/lzopcat -bin/busybox usr/bin/unlzop diff --git a/debian/busybox-symlinks-module-init-tools.links b/debian/busybox-symlinks-module-init-tools.links deleted file mode 100644 index 5b1da4a..0000000 --- a/debian/busybox-symlinks-module-init-tools.links +++ /dev/null @@ -1,6 +0,0 @@ -bin/busybox sbin/depmod -bin/busybox sbin/insmod -bin/busybox sbin/lsmod -bin/busybox sbin/modinfo -bin/busybox sbin/modprobe -bin/busybox sbin/rmmod diff --git a/debian/busybox-symlinks-mtd-utils.links b/debian/busybox-symlinks-mtd-utils.links deleted file mode 100644 index e981bc4..0000000 --- a/debian/busybox-symlinks-mtd-utils.links +++ /dev/null @@ -1,6 +0,0 @@ -bin/busybox usr/sbin/flash_eraseall -bin/busybox usr/sbin/flash_lock -bin/busybox usr/sbin/flash_unlock -bin/busybox usr/sbin/flashcp -bin/busybox usr/sbin/ubiattach -bin/busybox usr/sbin/ubidetach diff --git a/debian/busybox-symlinks-net-tools.links b/debian/busybox-symlinks-net-tools.links deleted file mode 100644 index 18df066..0000000 --- a/debian/busybox-symlinks-net-tools.links +++ /dev/null @@ -1,7 +0,0 @@ -bin/busybox usr/sbin/arp -bin/busybox sbin/ifconfig -bin/busybox sbin/iptunnel -bin/busybox sbin/nameif -bin/busybox bin/netstat -bin/busybox sbin/route -bin/busybox sbin/slattach diff --git a/debian/busybox-symlinks-openbsd-inetd.links b/debian/busybox-symlinks-openbsd-inetd.links deleted file mode 100644 index d9b1e3f..0000000 --- a/debian/busybox-symlinks-openbsd-inetd.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/sbin/inetd diff --git a/debian/busybox-symlinks-passwd.links b/debian/busybox-symlinks-passwd.links deleted file mode 100644 index 168db94..0000000 --- a/debian/busybox-symlinks-passwd.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/sbin/chpasswd -bin/busybox usr/bin/passwd diff --git a/debian/busybox-symlinks-patch.links b/debian/busybox-symlinks-patch.links deleted file mode 100644 index 74ed545..0000000 --- a/debian/busybox-symlinks-patch.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/patch diff --git a/debian/busybox-symlinks-ppp.links b/debian/busybox-symlinks-ppp.links deleted file mode 100644 index 5193ff0..0000000 --- a/debian/busybox-symlinks-ppp.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/sbin/chat diff --git a/debian/busybox-symlinks-procps.links b/debian/busybox-symlinks-procps.links deleted file mode 100644 index 62dd8f8..0000000 --- a/debian/busybox-symlinks-procps.links +++ /dev/null @@ -1,9 +0,0 @@ -bin/busybox usr/bin/free -bin/busybox bin/kill -bin/busybox usr/bin/pgrep -bin/busybox usr/bin/pkill -bin/busybox bin/ps -bin/busybox sbin/sysctl -bin/busybox usr/bin/top -bin/busybox usr/bin/uptime -bin/busybox usr/bin/watch diff --git a/debian/busybox-symlinks-psmisc.links b/debian/busybox-symlinks-psmisc.links deleted file mode 100644 index e9f1a83..0000000 --- a/debian/busybox-symlinks-psmisc.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox bin/fuser -bin/busybox usr/bin/killall diff --git a/debian/busybox-symlinks-rdate.links b/debian/busybox-symlinks-rdate.links deleted file mode 100644 index 87edc7f..0000000 --- a/debian/busybox-symlinks-rdate.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/sbin/rdate diff --git a/debian/busybox-symlinks-realpath.links b/debian/busybox-symlinks-realpath.links deleted file mode 100644 index 17f3c90..0000000 --- a/debian/busybox-symlinks-realpath.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/realpath diff --git a/debian/busybox-symlinks-rpm.links b/debian/busybox-symlinks-rpm.links deleted file mode 100644 index b943439..0000000 --- a/debian/busybox-symlinks-rpm.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/bin/rpm -bin/busybox usr/bin/rpm2cpio diff --git a/debian/busybox-symlinks-runit.links b/debian/busybox-symlinks-runit.links deleted file mode 100644 index 14ba9b5..0000000 --- a/debian/busybox-symlinks-runit.links +++ /dev/null @@ -1,5 +0,0 @@ -bin/busybox usr/bin/chpst -bin/busybox usr/bin/runsv -bin/busybox usr/bin/runsvdir -bin/busybox usr/bin/sv -bin/busybox usr/bin/svlogd diff --git a/debian/busybox-symlinks-sharutils.links b/debian/busybox-symlinks-sharutils.links deleted file mode 100644 index adf295a..0000000 --- a/debian/busybox-symlinks-sharutils.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/bin/uudecode -bin/busybox usr/bin/uuencode diff --git a/debian/busybox-symlinks-ssmtp.links b/debian/busybox-symlinks-ssmtp.links deleted file mode 100644 index 4221fd1..0000000 --- a/debian/busybox-symlinks-ssmtp.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/sbin/sendmail diff --git a/debian/busybox-symlinks-sysklogd.links b/debian/busybox-symlinks-sysklogd.links deleted file mode 100644 index 20fb96b..0000000 --- a/debian/busybox-symlinks-sysklogd.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox sbin/syslogd diff --git a/debian/busybox-symlinks-telnetd.links b/debian/busybox-symlinks-telnetd.links deleted file mode 100644 index fc22170..0000000 --- a/debian/busybox-symlinks-telnetd.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/sbin/telnetd diff --git a/debian/busybox-symlinks-tftp.links b/debian/busybox-symlinks-tftp.links deleted file mode 100644 index f9d5794..0000000 --- a/debian/busybox-symlinks-tftp.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/tftp diff --git a/debian/busybox-symlinks-time.links b/debian/busybox-symlinks-time.links deleted file mode 100644 index 9cfd606..0000000 --- a/debian/busybox-symlinks-time.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/time diff --git a/debian/busybox-symlinks-tofrodos.links b/debian/busybox-symlinks-tofrodos.links deleted file mode 100644 index 40760e8..0000000 --- a/debian/busybox-symlinks-tofrodos.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/bin/dos2unix -bin/busybox usr/bin/unix2dos diff --git a/debian/busybox-symlinks-udhcpc.links b/debian/busybox-symlinks-udhcpc.links deleted file mode 100644 index 45827b4..0000000 --- a/debian/busybox-symlinks-udhcpc.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/udhcpc diff --git a/debian/busybox-symlinks-udhcpd.links b/debian/busybox-symlinks-udhcpd.links deleted file mode 100644 index 62f4d1e..0000000 --- a/debian/busybox-symlinks-udhcpd.links +++ /dev/null @@ -1,2 +0,0 @@ -bin/busybox usr/bin/dumpleases -bin/busybox usr/sbin/udhcpd diff --git a/debian/busybox-symlinks-unzip.links b/debian/busybox-symlinks-unzip.links deleted file mode 100644 index 9e7bba2..0000000 --- a/debian/busybox-symlinks-unzip.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/unzip diff --git a/debian/busybox-symlinks-vlan.links b/debian/busybox-symlinks-vlan.links deleted file mode 100644 index bc2fce5..0000000 --- a/debian/busybox-symlinks-vlan.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox sbin/vconfig diff --git a/debian/busybox-symlinks-vlock.links b/debian/busybox-symlinks-vlock.links deleted file mode 100644 index a42391a..0000000 --- a/debian/busybox-symlinks-vlock.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/vlock diff --git a/debian/busybox-symlinks-watchdog.links b/debian/busybox-symlinks-watchdog.links deleted file mode 100644 index c7cfe6e..0000000 --- a/debian/busybox-symlinks-watchdog.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/sbin/watchdog diff --git a/debian/busybox-symlinks-wget.links b/debian/busybox-symlinks-wget.links deleted file mode 100644 index 3d55978..0000000 --- a/debian/busybox-symlinks-wget.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/wget diff --git a/debian/busybox-symlinks-xterm.links b/debian/busybox-symlinks-xterm.links deleted file mode 100644 index aa45607..0000000 --- a/debian/busybox-symlinks-xterm.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/resize diff --git a/debian/busybox-symlinks-zcip.links b/debian/busybox-symlinks-zcip.links deleted file mode 100644 index 5e8f40d..0000000 --- a/debian/busybox-symlinks-zcip.links +++ /dev/null @@ -1 +0,0 @@ -bin/busybox usr/bin/zcip diff --git a/debian/busybox-syslogd.busybox-klogd.init b/debian/busybox-syslogd.busybox-klogd.init deleted file mode 100644 index 9acda52..0000000 --- a/debian/busybox-syslogd.busybox-klogd.init +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh -# -# init.d script with LSB support. -# -# Copyright (c) 2007 Javier Fernandez-Sanguino -# Copyright (c) 2008 Axel Beckert -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### BEGIN INIT INFO -# Provides: busybox-klogd klogd -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Should-Start: syslogd -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts klogd -# Description: Starts the busybox klogd -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -NAME=klogd # Introduce the short server's name here -DAEMON=/sbin/$NAME # Introduce the server's location here -DESC="busybox' $NAME implementation" # Introduce a short description here -NEEDED_OPTS='' -DAEMON_USER='root' - -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -# Default options, these can be overriden by the information -# at /etc/default/$NAME -KLOG_OPTS="" # Additional options given to the server - -DIETIME=10 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -STARTTIME=2 # Time to wait for the server to start, in seconds - # If this value is set each time the server is - # started (on start or restart) the script will - # stall to try to determine if it is running - # If it is not set and the server takes time - # to setup a pid file the log message might - # be a false positive (says it did not start - # when it actually did) - -# Include defaults if available -if [ -f /etc/default/busybox-syslogd ] ; then - . /etc/default/busybox-syslogd -fi - -set -e - -start_server() { - start-stop-daemon --start --verbose --name $NAME \ - --exec $DAEMON -- $NEEDED_OPTS $KLOG_OPTS -} - -stop_server() { - start-stop-daemon --stop --verbose --name $NAME -} - -running() { - cut -d ' ' -f 1-2 /proc/[0-9]*/stat 2> /dev/null | grep -F "($NAME)" -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC " "$NAME" - # Check if it's running first - if running ; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if start_server ; then - # NOTE: Some servers might die some time after they start, - # this code will detect this issue if STARTTIME is set - # to a reasonable value - [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time - if running ; then - # It's ok, the server started and is running - log_end_msg 0 - else - # It is not running after we did start - log_end_msg 1 - fi - else - # Either we could not start it - log_end_msg 1 - fi - ;; - - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - if running ; then - # Only stop the server if we see it running - errcode=0 - stop_server || errcode=$? - log_end_msg $errcode - else - # If it's not running don't do anything - log_progress_msg "apparently not running" - log_end_msg 0 - exit 0 - fi - ;; - - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - errcode=0 - stop_server || errcode=$? - # Wait some sensible amount, some server need this - [ -n "$DIETIME" ] && sleep $DIETIME - start_server || errcode=$? - [ -n "$STARTTIME" ] && sleep $STARTTIME - running || errcode=$? - log_end_msg $errcode - ;; - - status) - log_daemon_msg "Checking status of $DESC" "$NAME" - if running ; then - log_progress_msg "running" - log_end_msg 0 - else - log_progress_msg "apparently not running" - log_end_msg 1 - exit 1 - fi - ;; - - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/busybox-syslogd.default b/debian/busybox-syslogd.default deleted file mode 100644 index bc9a28f..0000000 --- a/debian/busybox-syslogd.default +++ /dev/null @@ -1,7 +0,0 @@ -# Defaults for busybox-syslogd initscript -# This is a POSIX shell fragment sourced by /etc/init.d/busybox-syslogd - -# Additional options that are passed to the daemons. Default is to log -# to ring buffer (to be read with logread(1)) and drop duplicates. -SYSLOG_OPTS="-C128" -KLOG_OPTS="" diff --git a/debian/busybox-syslogd.init b/debian/busybox-syslogd.init deleted file mode 100644 index f489dd2..0000000 --- a/debian/busybox-syslogd.init +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/sh -# -# init.d script with LSB support. -# -# Copyright (c) 2007 Javier Fernandez-Sanguino -# Copyright (c) 2008 Axel Beckert -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### BEGIN INIT INFO -# Provides: busybox-syslogd syslogd -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts syslogd -# Description: Starts the busybox syslogd -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -NAME=syslogd # Introduce the short server's name here -DAEMON=/sbin/$NAME # Introduce the server's location here -DESC="busybox' $NAME implementation" # Introduce a short description here -NEEDED_OPTS='' -DAEMON_USER='root' - -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -# Default options, these can be overriden by the information -# at /etc/default/$NAME -SYSLOG_OPTS="" # Additional options given to the server - -DIETIME=10 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -#STARTTIME=2 # Time to wait for the server to start, in seconds - # If this value is set each time the server is - # started (on start or restart) the script will - # stall to try to determine if it is running - # If it is not set and the server takes time - # to setup a pid file the log message might - # be a false positive (says it did not start - # when it actually did) - -# Include defaults if available -if [ -f /etc/default/busybox-syslogd ] ; then - . /etc/default/busybox-syslogd -fi - -set -e - -start_server() { - start-stop-daemon --start --verbose --name $NAME \ - --exec $DAEMON -- $NEEDED_OPTS $SYSLOG_OPTS -} - -stop_server() { - start-stop-daemon --stop --quiet --name $NAME -} - -running() { - cut -d ' ' -f 1-2 /proc/[0-9]*/stat 2> /dev/null | grep -F "($NAME)" -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC " "$NAME" - # Check if it's running first - if running ; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if start_server ; then - # NOTE: Some servers might die some time after they start, - # this code will detect this issue if STARTTIME is set - # to a reasonable value - [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time - if running ; then - # It's ok, the server started and is running - log_end_msg 0 - else - # It is not running after we did start - log_end_msg 1 - fi - else - # Either we could not start it - log_end_msg 1 - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - if running ; then - # Only stop the server if we see it running - errcode=0 - stop_server || errcode=$? - log_end_msg $errcode - else - # If it's not running don't do anything - log_progress_msg "apparently not running" - log_end_msg 0 - exit 0 - fi - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - errcode=0 - stop_server || errcode=$? - # Wait some sensible amount, some server need this - [ -n "$DIETIME" ] && sleep $DIETIME - start_server || errcode=$? - [ -n "$STARTTIME" ] && sleep $STARTTIME - running || errcode=$? - log_end_msg $errcode - ;; - status) - - log_daemon_msg "Checking status of $DESC" "$NAME" - if running ; then - log_progress_msg "running" - log_end_msg 0 - else - log_progress_msg "apparently not running" - log_end_msg 1 - exit 1 - fi - ;; - # daemon cannot reload - reload) - log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon" - log_warning_msg "cannot re-read the config file (use restart)." - ;; - - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/busybox-syslogd.service b/debian/busybox-syslogd.service deleted file mode 100644 index 36227a2..0000000 --- a/debian/busybox-syslogd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Busybox Logging Service: syslogd - -[Service] -Type=simple -ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service -ExecStart=/sbin/syslogd -n -Sockets=syslog.socket - -[Install] -WantedBy=multi-user.target diff --git a/debian/busybox-systemd-klogd.install b/debian/busybox-systemd-klogd.install deleted file mode 100644 index cbab4d7..0000000 --- a/debian/busybox-systemd-klogd.install +++ /dev/null @@ -1 +0,0 @@ -debian/busybox-klogd.service lib/systemd/system/ diff --git a/debian/busybox-systemd-klogd.links b/debian/busybox-systemd-klogd.links deleted file mode 100644 index 0fae3ea..0000000 --- a/debian/busybox-systemd-klogd.links +++ /dev/null @@ -1 +0,0 @@ -lib/systemd/system/busybox-klogd.service lib/systemd/system/multi-user.target.wants/busybox-klogd.service diff --git a/debian/busybox-systemd-sysklogd.install b/debian/busybox-systemd-sysklogd.install deleted file mode 100644 index 0379dc9..0000000 --- a/debian/busybox-systemd-sysklogd.install +++ /dev/null @@ -1 +0,0 @@ -debian/busybox-syslogd.service lib/systemd/system/ diff --git a/debian/busybox-systemd-sysklogd.links b/debian/busybox-systemd-sysklogd.links deleted file mode 100644 index 1a1f1aa..0000000 --- a/debian/busybox-systemd-sysklogd.links +++ /dev/null @@ -1 +0,0 @@ -lib/systemd/system/busybox-syslogd.service lib/systemd/system/multi-user.target.wants/busybox-syslogd.service diff --git a/debian/busybox-udeb.install b/debian/busybox-udeb.install deleted file mode 100644 index d094590..0000000 --- a/debian/busybox-udeb.install +++ /dev/null @@ -1,2 +0,0 @@ -../../tree/busybox-udeb/* / -_install/* / diff --git a/debian/busybox.dirs b/debian/busybox.dirs deleted file mode 100644 index d653148..0000000 --- a/debian/busybox.dirs +++ /dev/null @@ -1,3 +0,0 @@ -bin -sbin -usr/share/man/man1 diff --git a/debian/busybox.install b/debian/busybox.install deleted file mode 100644 index b2b3f72..0000000 --- a/debian/busybox.install +++ /dev/null @@ -1 +0,0 @@ -busybox bin diff --git a/debian/busybox.links b/debian/busybox.links deleted file mode 100644 index 97a2764..0000000 --- a/debian/busybox.links +++ /dev/null @@ -1,127 +0,0 @@ -bin/busybox bin/ash -bin/busybox bin/cat -bin/busybox bin/chgrp -bin/busybox bin/chmod -bin/busybox bin/chown -bin/busybox bin/cp -bin/busybox bin/date -bin/busybox bin/dd -bin/busybox bin/df -bin/busybox bin/dmesg -bin/busybox bin/dnsdomainname -bin/busybox bin/echo -bin/busybox bin/egrep -bin/busybox bin/false -bin/busybox bin/fgrep -bin/busybox bin/grep -bin/busybox bin/gunzip -bin/busybox bin/gzip -bin/busybox bin/hostname -bin/busybox bin/ln -bin/busybox bin/ls -bin/busybox bin/mkdir -bin/busybox bin/mknod -bin/busybox bin/mktemp -bin/busybox bin/more -bin/busybox bin/mount -bin/busybox bin/mv -bin/busybox bin/pwd -bin/busybox bin/readlink -bin/busybox bin/rm -bin/busybox bin/rmdir -bin/busybox bin/sed -bin/busybox bin/sh -bin/busybox bin/sleep -bin/busybox bin/stty -bin/busybox bin/sync -bin/busybox bin/tar -bin/busybox bin/touch -bin/busybox bin/true -bin/busybox bin/umount -bin/busybox bin/uname -bin/busybox bin/uncompress -bin/busybox bin/zcat -bin/busybox sbin/blkid -bin/busybox sbin/blockdev -bin/busybox sbin/fdisk -bin/busybox sbin/fsck.minix -bin/busybox sbin/getty -bin/busybox sbin/hwclock -bin/busybox sbin/losetup -bin/busybox sbin/mkfs.minix -bin/busybox sbin/mkswap -bin/busybox sbin/pivot_root -bin/busybox sbin/swapoff -bin/busybox sbin/swapon -bin/busybox sbin/switch_root -bin/busybox usr/bin/[ -bin/busybox usr/bin/basename -bin/busybox usr/bin/chrt -bin/busybox usr/bin/cksum -bin/busybox usr/bin/cmp -bin/busybox usr/bin/comm -bin/busybox usr/bin/cut -bin/busybox usr/bin/diff -bin/busybox usr/bin/dirname -bin/busybox usr/bin/du -bin/busybox usr/bin/env -bin/busybox usr/bin/expand -bin/busybox usr/bin/expr -bin/busybox usr/bin/fdformat -bin/busybox usr/bin/find -bin/busybox usr/bin/flock -bin/busybox usr/bin/fold -bin/busybox usr/bin/getopt -bin/busybox usr/bin/head -bin/busybox usr/bin/hostid -bin/busybox usr/bin/id -bin/busybox usr/bin/install -bin/busybox usr/bin/ionice -bin/busybox usr/bin/ipcrm -bin/busybox usr/bin/ipcs -bin/busybox usr/bin/less -bin/busybox usr/bin/linux32 -bin/busybox usr/bin/linux64 -bin/busybox usr/bin/logger -bin/busybox usr/bin/logname -bin/busybox usr/bin/md5sum -bin/busybox usr/bin/mkfifo -bin/busybox usr/bin/nice -bin/busybox usr/bin/nohup -bin/busybox usr/bin/od -bin/busybox usr/bin/printenv -bin/busybox usr/bin/printf -bin/busybox usr/bin/renice -bin/busybox usr/bin/rev -bin/busybox usr/bin/rtcwake -bin/busybox usr/bin/script -bin/busybox usr/bin/scriptreplay -bin/busybox usr/bin/seq -bin/busybox usr/bin/setarch -bin/busybox usr/bin/setsid -bin/busybox usr/bin/sha1sum -bin/busybox usr/bin/sha256sum -bin/busybox usr/bin/sha512sum -bin/busybox usr/bin/sort -bin/busybox usr/bin/split -bin/busybox usr/bin/stat -bin/busybox usr/bin/sum -bin/busybox usr/bin/tac -bin/busybox usr/bin/tail -bin/busybox usr/bin/taskset -bin/busybox usr/bin/tee -bin/busybox usr/bin/test -bin/busybox usr/bin/timeout -bin/busybox usr/bin/tr -bin/busybox usr/bin/tty -bin/busybox usr/bin/unexpand -bin/busybox usr/bin/uniq -bin/busybox usr/bin/wall -bin/busybox usr/bin/wc -bin/busybox usr/bin/who -bin/busybox usr/bin/whoami -bin/busybox usr/bin/xargs -bin/busybox usr/bin/yes -bin/busybox usr/sbin/chroot -bin/busybox usr/sbin/rdev -bin/busybox usr/sbin/readprofile diff --git a/debian/busybox.postinst b/debian/busybox.postinst deleted file mode 100644 index d48f82a..0000000 --- a/debian/busybox.postinst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -update-alternatives --install /usr/bin/pager pager /bin/more 10 -update-alternatives --install /usr/bin/man man /bin/busybox 1 -update-alternatives --install /usr/bin/traceroute traceroute /bin/busybox 1 -update-alternatives --install /usr/bin/pager pager /usr/bin/less 20 -update-alternatives --install /usr/bin/telnet telnet /bin/busybox 1 -update-alternatives --install /usr/bin/awk awk /bin/busybox 1 -update-alternatives --install /usr/bin/vi vi /bin/busybox 1 -dpkg-divert --package busybox --add /bin/sh diff --git a/debian/busybox.prerm b/debian/busybox.prerm deleted file mode 100644 index ec46dd0..0000000 --- a/debian/busybox.prerm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -update-alternatives --remove pager /bin/more -update-alternatives --remove man /bin/busybox -update-alternatives --remove traceroute /bin/busybox -update-alternatives --remove pager /usr/bin/less -update-alternatives --remove telnet /bin/busybox -update-alternatives --remove awk /bin/busybox -update-alternatives --remove vi /bin/busybox -dpkg-divert --package busybox --remove /bin/sh diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index ac9f800..0000000 --- a/debian/changelog +++ /dev/null @@ -1,1350 +0,0 @@ -busybox (3:1.17.1-10slp2+s8) unstable; urgency=low - - * Fix displaying of unicode characters. - * Git: slp/pkgs/b/busybox - * Tag: busybox_3%1.17.1-10slp2+s8 - - -- Rafal Krypa Mon, 16 Apr 2012 13:10:58 +0200 - -busybox (3:1.17.1-10slp2+s7) unstable; urgency=low - - * slp: Disable chat(1) - * Git: slp/pkgs/b/busybox - * Tag: busybox_3%1.17.1-10slp2+s7 - - -- Karol Lewandowski Tue, 17 Jan 2012 11:41:58 +0100 - -busybox (3:1.17.1-10slp2+s6-1) unstable; urgency=low - - * Add tag required by build server - * Git: slp/pkgs/b/busybox - * Tag: busybox_3%1.17.1-10slp2+s6-1 - - -- Karol Lewandowski Thu, 12 Jan 2012 12:45:55 +0100 - -busybox (3:1.17.1-10slp2+s6) unstable; urgency=low - - * slp: Import SMACK patch - * slp: Don't allow SELINUX and SMACK to be enabled at the same time - * slp: Fix obvious mistake in smack patch - - -- Karol Lewandowski Wed, 11 Jan 2012 12:31:43 +0100 - -busybox (3:1.17.1-10slp2+s5) unstable; urgency=low - - * klogd: Handle facility too when reading from /proc/kmsg - * Make sure klogd starts after busybox's syslogd - * Ugly hack: Increase console log level to make camera app work - - -- Karol Lewandowski Mon, 07 Nov 2011 15:40:21 +0100 - -busybox (3:1.17.1-10slp2+s4) unstable; urgency=low - - * mount: Handle list of comma-separated fs types ("-t" option) - - -- Karol Lewandowski Mon, 10 Oct 2011 11:31:10 +0200 - -busybox (3:1.17.1-10slp2+s3) unstable; urgency=low - - * Support receiving server socket from systemd in syslogd - * Add packages with systemd units for syslogd and klogd - - -- Karol Lewandowski Thu, 01 Sep 2011 19:14:44 +0200 - -busybox (3:1.17.1-10slp2+s2) unstable; urgency=low - - [ Rafal Krypa ] - * Enable mktemp applet. - * Make debian/scripts/*.py files executable. - * debian/scripts/README: adapt to SLP - - [ Mike McCormack ] - * Disable netcat. - - [ Yeongil Jang ] - * Add CONFIG_LZOP_COMPR_HIGH option for building 2.6.36 kernel - - -- Rafal Krypa Mon, 01 Aug 2011 11:31:35 +0200 - -busybox (3:1.17.1-10slp2+s1) unstable; urgency=low - - * Bump epoch back to 3 to let things upgrade correctly. - - -- Mike McCormack Tue, 19 Apr 2011 10:51:42 +0900 - -busybox (1:1.17.1-10slp2+s1) unstable; urgency=low - - [ Minho Ban ] - * getty: Disable SW flow control (XON/XOFF). - - [ Rafal Krypa ] - * Merge with Debian. - * Enable blockdev applet, backported by Debian. - - -- Rafal Krypa Fri, 15 Apr 2011 13:19:25 +0200 - -busybox (1:1.17.1-10) unstable; urgency=low - - [ Michael Tokarev ] - * tiny build system changes: from main source to build directories: - don't copy .dotfiles, use ln instead of cp - - [ Joey Hess ] - * Enable sha256sum in udeb, needed by debootstrap to handle Release - files w/o md5sums. - * Did not disable md5sum in udeb because eg anna still uses them to verify - md5sum fields from d-i Packages files. (Those fields are still present.. - for now.) - - -- Joey Hess Mon, 21 Feb 2011 20:32:15 -0400 - -busybox (1:1.17.1-9) unstable; urgency=low - - * Team upload - - [ Matt Palmer ] - * Build busybox udeb with IPv6 support, since otherwise wget has a - severe sadness. - - [ Christian Perrier ] - * Add arping to udeb to allow link detection in netcfg - Closes: #612249 - - -- Christian Perrier Sun, 13 Feb 2011 08:23:54 +0100 - -busybox (1:1.17.1-8) unstable; urgency=low - - * Set udhcpc and udhcpd Section to net, to match overrides. - * Disable blockdev on non-Linux architectures. - - -- Colin Watson Mon, 15 Nov 2010 14:36:31 +0000 - -busybox (1:1.17.1-7) unstable; urgency=low - - * Backport blockdev applet from upstream, so that we can use it in - os-prober (closes: #418163). - - -- Colin Watson Tue, 09 Nov 2010 12:33:35 +0000 - -busybox (3:1.17.1-6slp2+s4) unstable; urgency=low - - * Increase size of log file - - -- Mike McCormack Wed, 16 Mar 2011 17:16:34 +0900 - -busybox (3:1.17.1-6slp2+s3) unstable; urgency=low - - * Add SLP patch: udhcpc-fast-request.patch. - * Enable the new feature. - - -- Rafal Krypa Fri, 10 Dec 2010 12:53:38 +0100 - -busybox (3:1.17.1-6slp2+s2) unstable; urgency=low - - * SLP: adjust the config to be more compatible with BB provided by the - kernel team. - * Remove dependency on busybox-symlinks-busybox from the busybox - package to resolve dependency loop. - - -- Rafal Krypa Sun, 28 Nov 2010 12:39:33 +0900 - -busybox (3:1.17.1-6slp2+s1) unstable; urgency=low - - * debian/patches/03tar.dpatch: remove - applied in upstream. - * debian/patches/top-display-rss.patch: adapt to new upstream version. - * debian/config/slp: move to new location debian/config/pkg/slp. - * Adapt config to new upstream version, enable: wall, flock, rev. - - -- Rafal Krypa Fri, 05 Nov 2010 20:35:13 +0900 - -busybox (1:1.17.1-6) unstable; urgency=low - - * Apply patch from Samuel Thibault to enable - hardware flow control for serial console (closes: #528560). - - -- Otavio Salvador Thu, 21 Oct 2010 16:17:03 -0200 - -busybox (1:1.17.1-5) unstable; urgency=low - - [ Colin Watson ] - * Never execute busybox applets when chrooting (closes: #599101). - - [ Otavio Salvador ] - * Fix initscript error messages in syslogd and klogd (closes: - #591436). - * Fix restart and force-reload for udhcpd initscript (closes: - #597510). - - -- Otavio Salvador Thu, 21 Oct 2010 11:53:52 -0200 - -busybox (1:1.17.1-4) unstable; urgency=low - - * Update u-mount-FreeBSD-support.patch: - - Add a few more mount options. - - Fix mounting of nullfs filesystems. - - -- Aurelien Jarno Mon, 23 Aug 2010 10:19:20 +0200 - -busybox (1:1.17.1-3) unstable; urgency=low - - [ JÃ©rÃ©mie Koenig ] - * Enable CONFIG_FEATURE_INITRD on Hurd (Closes: #593865). - - [ Aurelien Jarno ] - * [udeb] Disable volume id support. - - -- Aurelien Jarno Sun, 22 Aug 2010 19:46:52 +0200 - -busybox (1:1.17.1-2) unstable; urgency=low - - * Upload to unstable. - * [udeb] Enable volume id support. - * [deb] Enable all file system in volume id support. - - -- Aurelien Jarno Fri, 06 Aug 2010 22:54:40 +0200 - -busybox (1:1.17.1-1) experimental; urgency=low - - [ Aurelien Jarno ] - * New upstream release. - - Add --list option (Closes: #405108). - - Fix nc segfaults (Closes: #503672). - - Enable new options: - [all] Add support for unicode (Closes: #395227, #570789) - [all] Enable btrfs volume identification - * Update configuration: - [udeb/deb] Enable dd conv=notrunc (Closes: #552495) - * Fix busybox-udeb description: s/busybox-cvs-udeb/busybox-udeb/ - * Fix busybox description wrt --install option (Closes: #326243). - * Fix /etc/init.d/udhcpd restart (Closes: #581342) - * Fix /etc/init.d/busybox-{klogd,syslogd} to correctly depend on - $remote_fs. - * Fix bashism in udhcpc default.script (Closes: #572008, #572013, - #572622). - - [ JÃ©rÃ©mie Koenig ] - * Refresh patches: - - debian/patches/applets-fallback.patch - - debian/patches/doc-man-name.patch - - debian/patches/shell-ash-export-HOME.patch - * Add per-OS configuration overrides. - * Add FreeBSD and Hurd compatibility patches from the latest git upstream - branch, and a few more to be merged soon (Closes: #323670). - * scripts/gen_build_files.sh: skip .pc files from quilt. - - -- Aurelien Jarno Tue, 03 Aug 2010 06:42:39 +0200 - -busybox (3:1.15.3-1slp2+s5) unstable; urgency=low - - * debian/scripts/debian-mappings.txt: fix mappings for mktemp, - sha256sum, sha512sum, dnsdomainname. - * debian/scripts/create-control.py: modify dependencies for busybox, - don't start output with blank line. - * debian/config/slp: disable lzop, enable applets for 'adduser' - package. - * Recreate control and *.links files. - - -- Rafal Krypa Thu, 14 Oct 2010 12:18:08 +0200 - -busybox (3:1.15.3-1+s4) unstable; urgency=low - - * Apply all quilt patches missed during import (this is 3.0 (quilt) - source format). - * Apply our quilt patches as well. - * Fix busybox-zero-ifr.ifr_hwaddr.sa_data.patch to apply without fuzz - (solves problem with dpkg-source). - - -- Rafal Krypa Wed, 16 Jun 2010 15:15:14 +0200 - -busybox (3:1.15.3-1+s3) unstable; urgency=low - - * Drop /bin/login and /bin/su for slp - it uses standard "shadow" - tools now - * Update maintaners and uploaders lists - * Add Essential tag to busybox package - * Don't use lsb_release in slp variant - * Kill bogus binary-arch_slp rule - - -- Karol Lewandowski Wed, 19 May 2010 19:03:35 +0200 - -busybox (3:1.15.3-1+s2) unstable; urgency=low - - * Workaround for Scratchbox 1 apt problems - drop the Essential tag on - busybox package. - * Scratchbox 1 workaround - reduce debhelper compat level to 5. - - -- Rafal Krypa Tue, 30 Mar 2010 12:42:43 +0200 - -busybox (3:1.15.3-1+s1) unstable; urgency=low - - * Merge Debian version 1.15.3-1 - * Drop patches with features that are now in upstream: - - fsync.patch - - pidof-fix.patch - - ls-s-dont-follow-links.patch - - upstart-support.patch - * Adapt patches to new upstream version: - - 03tar.dpatch - - top-display-rss.patch - * debian/rules: fix install source path for busybox binary - * debian/config/slp: using some new features - * Don't apply shell-hist.patch - it is incompatible with new upstream version - and we don't need it anyway. - - -- Rafal Krypa Wed, 24 Mar 2010 18:23:28 +0100 - -busybox (3:1.10.2.legal-1osso26+0m5+s1) unstable; urgency=low - - * Update configuration of Debian essential packages according to - current Sid version. - * Configure for SLP 2.0. - * Drop build-dependency on lsb-release. - * debian/control: added Uploaders field. - - -- Rafal Krypa Thu, 04 Feb 2010 10:41:03 +0900 - -busybox (3:1.10.2.legal-1osso26+0m5) unstable; urgency=low - - * This entry has been added by BIFH queue processor - Suffix +0m5 added to package revision - - -- Attiq Malik Wed, 01 Jul 2009 13:11:49 +0300 - -busybox (3:1.10.2.legal-1osso26) unstable; urgency=low - - * Enable more fance tar features. Fixes: NB#124832. - - -- Alexander Shishkin Mon, 29 Jun 2009 15:32:56 +0300 - -busybox (3:1.10.2.legal-1osso25) unstable; urgency=low - - * Call telinit to facilitate proper shutdown/reboot. Fixes: NB#120283. - - -- Alexander Shishkin Wed, 24 Jun 2009 14:41:13 +0300 - -busybox (3:1.10.2.legal-1osso24) unstable; urgency=low - - * Don't follow symlinks for -l or -s in ls. Fixes: NB#120999. - - -- Alexander Shishkin Mon, 15 Jun 2009 12:55:17 +0300 - -busybox (3:1.10.2.legal-1osso23) unstable; urgency=low - - * Enable more options for pidof. Fixes: NB#112823. - - -- Alexander Shishkin Thu, 23 Apr 2009 16:10:24 +0300 - -busybox (3:1.10.2.legal-1osso22) unstable; urgency=low - - * Remove 3 second sleep()s from sfdisk. - - -- Alexander Shishkin Thu, 23 Apr 2009 11:32:08 +0300 - -busybox (3:1.10.2.legal-1osso21) unstable; urgency=low - - * Drop dependencies to symlink packages. Fixes: NB#86011. - - -- Alexander Shishkin Wed, 01 Apr 2009 14:14:32 +0300 - -busybox (3:1.10.2.legal-1osso20) unstable; urgency=low - - * Merge sysvinit-maemo into busybox. - * Remove last from provided symlinks. Fixes: NB#108560. - * Patch to display RSS instead of VSZ in top. Fixes: NB#103591. - * Patch to only update history upon shell exit. Fixes: NB#107770. - - -- Alexander Shishkin Tue, 31 Mar 2009 14:28:47 +0300 - -busybox (3:1.10.2.legal-1osso19) unstable; urgency=low - - * Create alternatives directory if missing. Fixes: NB#107784. - * Enable CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY. Fixes: NB#107771. - * Disable wtmp for applets. Fixes: NB#101256. - - -- Alexander Shishkin Wed, 25 Mar 2009 10:28:05 +0200 - -busybox (3:1.10.2.legal-1osso18) unstable; urgency=low - - * Transition: make busybox depend on all packages with symlinks - to facilitate NB#86011. - * Symlinks moved to separate packages to match debian's counterparts. - * Enable xargs support for quotes. Fixes: NB#96575. - - -- Alexander Shishkin Wed, 18 Mar 2009 12:39:35 +0200 - -busybox (3:1.10.2.legal-1osso17) unstable; urgency=low - - * Add IPv6 support. Fixes: NB#98038. - * Add fix for pidof/killall5. Fixes: NB#101755. - - -- Alexander Shishkin Tue, 10 Mar 2009 15:14:05 +0200 - -busybox (3:1.10.2.legal-1osso16) unstable; urgency=low - - * Added CONFIG_CLEAR and CONFIG_RESET to config.maemo - * Added ncurses-bin to Provides/Replaces/Conflicts. Fixes: NB#92440 - - -- Turo Janka Thu, 12 Feb 2009 12:50:42 +0200 - -busybox (3:1.10.2.legal-1osso15) unstable; urgency=low - - * Removed CONFIG_FEATURE_GUNZIP_UNCOMPRESS from config.maemo - * Added CONFIG_UNCOMPRESS to config.maemo. Fixes: NB#98035 - - -- Turo Janka Wed, 11 Feb 2009 16:08:12 +0200 - -busybox (3:1.10.2.legal-1osso14) unstable; urgency=low - - * Fixes time command segfault. Fixes: NB#98230 - - -- Turo Janka Tue, 21 Jan 2009 15:48:12 +0200 - -busybox (3:1.10.2.legal-1osso13) unstable; urgency=low - - * Enable more tools. Fixes: NB#98035 - - -- Turo Janka Tue, 20 Jan 2009 15:18:12 +0200 - -busybox (3:1.10.2.legal-1osso12) unstable; urgency=low - - * Enable MD5SUM and FEATURE_MD5_SHA1_SUM_CHECK. Fixes: NB#95950 - - -- Turo Janka Tue, 20 Jan 2009 11:16:20 +0200 - -busybox (3:1.10.2.legal-1osso11) unstable; urgency=low - - * Enable CONFIG_LFS. Fixes: NB#95830 - - -- Turo Janka Tue, 13 Jan 2009 15:26:23 +0200 - -busybox (3:1.10.2.legal-1osso10) unstable; urgency=low - - * Enable CONFIG_FEATURE_SORT_BIG. Fixes: NB#90925 - - -- Yauheni Kaliuta Mon, 27 Oct 2008 12:20:50 +0200 - -busybox (3:1.10.2.legal-1osso9) unstable; urgency=low - - * Disable runlevel, using a script from mini-rc - - -- Yauheni Kaliuta Mon, 27 Oct 2008 11:54:48 +0200 - -busybox (3:1.10.2.legal-1osso8) unstable; urgency=low - - * Added busybox-zero-ifr.ifr_hwaddr.sa_data.patch - Fixes: NB#89189 - - -- Yauheni Kaliuta Fri, 17 Oct 2008 15:38:53 +0300 - -busybox (3:1.10.2.legal-1osso7) unstable; urgency=low - - * Reverting the utilities, it breaks R&D images - * Revert "enabled xargs -0 (265 bytes)" - * Revert "enabled addgroup (872 bytes), delgroup (652 bytes)" - * Revert "enabled less (6773 bytes)" - * Revert "enabled setsid (111 bytes)" - * Revert "enabled script (1443 bytes), strings (489 bytes)" - * Revert "enabled ip (23780 bytes)" - - -- Yauheni Kaliuta Thu, 09 Oct 2008 15:26:35 +0300 - -busybox (3:1.10.2.legal-1osso6) unstable; urgency=low - - [ Pekka Pessi ] - * fsync.patch: fixed usage - * enabled xargs -0 (265 bytes) - * enabled addgroup (872 bytes), delgroup (652 bytes) - * enabled less (6773 bytes) - * enabled setsid (111 bytes) - * enabled script (1443 bytes), strings (489 bytes) - * enabled ip (23780 bytes) - - -- Yauheni Kaliuta Wed, 08 Oct 2008 13:16:50 +0300 - -busybox (3:1.10.2.legal-1osso5) unstable; urgency=low - - * config.maemo: enable fsync - * Added fsync.patch - - -- Yauheni Kaliuta Tue, 07 Oct 2008 11:15:54 +0300 - -busybox (3:1.10.2.legal-1osso4) unstable; urgency=low - - * Disable modutils, submitting real module-init-tools now - - -- Yauheni Kaliuta Thu, 02 Oct 2008 16:37:48 +0300 - -busybox (3:1.10.2.legal-1osso3) unstable; urgency=low - - * Enable hwclock applet - - -- Yauheni Kaliuta Wed, 24 Sep 2008 16:38:48 +0300 - -busybox (3:1.10.2.legal-1osso2) unstable; urgency=low - - * Install local/tempfile, forgot in upgrade. - Fixes: NB#88128 - - -- Yauheni Kaliuta Thu, 18 Sep 2008 14:23:08 +0300 - -busybox (3:1.10.2.legal-1osso1) unstable; urgency=low - - * Use .legal name (forgot) - * Updated config.maemo for 1.10.2 - - -- Yauheni Kaliuta Thu, 24 Jul 2008 12:35:10 +0300 - -busybox (3:1.10.2-1osso1) unstable; urgency=low - - * osso adoptation - * Added debug package - * tar -m dummy switch added - * build only deb package, no udeb or static - * CONFIG: fixing segfault - * Add tools needed by sysvinit/upstart - * Do not conflict with module-init-tools, divert should work - - -- Yauheni Kaliuta Thu, 24 Jul 2008 12:22:11 +0300 - -busybox (1:1.10.2-1) unstable; urgency=low - - * New upstream release. - - -- Bastian Blank Fri, 06 Jun 2008 19:20:43 +0200 - -busybox (1:1.9.2-3) unstable; urgency=low - - * Readd package version into greeting. - * Ignore init action if device is not available. (closes: #473659) - - -- Bastian Blank Sat, 12 Apr 2008 17:23:30 +0200 - -busybox (1:1.9.2-2) unstable; urgency=low - - * Set correct source section. - * Move busybox-static to extra. - * Update Standards-Version to 3.7.3, no changes. - * Add generic applet fallback. (closes: #472653) - - -- Bastian Blank Wed, 26 Mar 2008 11:33:59 +0100 - -busybox (1:1.9.2-1) unstable; urgency=low - - * New upstream release. - * [deb] Reenable prefer applets. - * [deb, static] Make the shell use applets first. (closes: #472389) - - -- Bastian Blank Mon, 24 Mar 2008 09:40:13 +0100 - -busybox (1:1.9.1-3) unstable; urgency=low - - * debian/config.udeb: - - Reenable fancy prompt. - * Readd copyright file. - - -- Bastian Blank Sat, 22 Mar 2008 23:01:57 +0100 - -busybox (1:1.9.1-2) experimental; urgency=low - - * Readd sections gc to dynamic built binaries. - * debian/config.udeb: - - Fix remaining problems. - - Disable ifconfig. - * util-linux/mount.c: - - Support relatime. (closes: #460824) - - -- Bastian Blank Thu, 13 Mar 2008 14:25:53 +0100 - -busybox (1:1.9.1-1) experimental; urgency=low - - * New upstream release. - * Drop unused busybox-floppy-udeb. - - -- Bastian Blank Fri, 15 Feb 2008 16:25:31 +0000 - -busybox (1:1.1.3-5) unstable; urgency=low - - * debian/config*: - - Drop devfs support. (closes: #431569) - - -- Bastian Blank Tue, 3 Jul 2007 15:45:43 +0000 - -busybox (1:1.1.3-4) unstable; urgency=low - - * coreutils/sort.c: - - Try again to fix sorting issues. Patch by Goswin Brederlow. - (closes: #373704) - - -- Bastian Blank Sun, 21 Jan 2007 15:29:02 +0000 - -busybox (1:1.1.3-3) unstable; urgency=low - - * debian/control: - - Add build dependency to new dpkg-dev. (closes: #383710) - * debian/copyright: - - Mention copyright holders. (closes: #378654) - - -- Bastian Blank Fri, 18 Aug 2006 22:32:04 +0000 - -busybox (1:1.1.3-2) unstable; urgency=low - - * coreutils/sort.c: - - Fix sorting of input which begins with the seperator. (closes: #373704) - - -- Bastian Blank Thu, 29 Jun 2006 19:36:19 +0000 - -busybox (1:1.1.3-1) unstable; urgency=low - - * New upstream version. - * debian/config-udeb: - - Enable fancy head and tail. Readds support for head -1. - * coreutils/tr.c: - - Don't segfault on incorrect input. - - -- Bastian Blank Thu, 01 Jun 2006 18:02:00 +0000 - -busybox (1:1.1.2-2) unstable; urgency=low - - * applets/install.sh: - - Fix installation if libbusybox is disabled. (closes: #368013) - * debian/config*: - - Support umount -a. (closes: #367714) - - -- Bastian Blank Mon, 22 May 2006 17:58:17 +0000 - -busybox (1:1.1.2-1) unstable; urgency=low - - * New upstream version. - * debian/config*: - - Rework. - - Remove modutils support. - * modutils: - - Remove modutils patch. - * shell: - - Export PATH. (closes: #329406) - - -- Bastian Blank Sun, 7 May 2006 19:31:17 +0000 - -busybox (1:1.01-4) unstable; urgency=low - - * debian/config*: (closes: #321304) - - Enable readlink -f support. - - Enable egrep alias. - - Enable ash command builtin. - * debianutils: Add readlink -f support. - * util-linux/umount.c: Fix loop for rootfs. (closes: #317062) - - -- Bastian Blank Sat, 17 Dec 2005 14:35:56 +0100 - -busybox (1:1.01-3) unstable; urgency=low - - * debian/config-deb: - - Recheck options. - - -- Bastian Blank Wed, 12 Oct 2005 14:40:08 +0200 - -busybox (1:1.01-2) unstable; urgency=low - - * debian/rules: - - Use CONFIG_DEBUG=y. - * modutils/obj: - - Fix bad casts that cause insmod (and probably depmod) to fail on - 64-bit architectures. (closes: #321503) - - -- Bastian Blank Thu, 08 Sep 2005 17:07:21 +0200 - -busybox (1:1.01-1) unstable; urgency=low - - * New upstream version. - * Fix more compilation errors. (closes: #325244) - - -- Bastian Blank Wed, 24 Aug 2005 19:28:13 +0200 - -busybox (1:1.00-5) unstable; urgency=low - - * Fix build. - * Enable ip applet in deb. - * Fix remove syslog. - - -- Bastian Blank Tue, 16 Aug 2005 19:20:13 +0200 - -busybox (1:1.00-4) unstable; urgency=low - - * Fix several problems with more strict gcc. (closes: #294474) - - -- Bastian Blank Sun, 31 Jul 2005 13:10:29 +0200 - -busybox (1:1.00-3) unstable; urgency=low - - * shell/ash.c: - - Fix eval. (closes: #315444) - - -- Bastian Blank Tue, 28 Jun 2005 14:45:54 +0200 - -busybox (1:1.00-2) unstable; urgency=low - - * debian/rules: - - Specify -s for debhelper tools. (closes: #314512) - - -- Bastian Blank Mon, 27 Jun 2005 18:09:52 +0200 - -busybox (1:1.00-1) unstable; urgency=low - - * New upstream release. (closes: #276771) - * New maintainer. (closes: #298363) - - -- Bastian Blank Fri, 10 Jun 2005 10:32:29 +0200 - -busybox-cvs (20040623-2) UNRELEASED; urgency=low - - * modutils: - - Fix error. (closes: #258546) - - Don't return failure if the module is already loaded. (closes: #257201) - * util-linux/umount.c: - - Don't ignore proc on umount -a. (closes: #257625) - - -- Bastian Blank Wed, 28 Jul 2004 11:20:58 +0200 - -busybox-cvs (20040623-1) unstable; urgency=low - - * New CVS version. - - Support 64 bit arithmetic. (closes: #251302) - - -- Bastian Blank Wed, 23 Jun 2004 21:53:52 +0200 - -busybox-cvs (20040612-2) unstable; urgency=low - - * modutils: - - Merge changes from modutils 2.4.26 (closes: #254214). - - -- Bastian Blank Sun, 13 Jun 2004 21:11:08 +0200 - -busybox-cvs (20040612-1) unstable; urgency=low - - * New CVS version. - * modutils: - - Fix missdetection of module file extension. - - -- Bastian Blank Fri, 21 May 2004 15:43:11 +0200 - -busybox-cvs (20040507-3) unstable; urgency=low - - * debian/config-udeb*: - - Disable udhcpc. (closes: #220652) - - Enable sleep. - - -- Bastian Blank Fri, 14 May 2004 18:13:52 +0200 - -busybox-cvs (20040507-2) unstable; urgency=low - - * editors/sed.c: - - Never assign the return value of getopt to char. (closes: #248106) - - -- Bastian Blank Sun, 09 May 2004 16:34:41 +0200 - -busybox-cvs (20040507-1) unstable; urgency=low - - * New CVS version - - Fix detection of hardlinks. (closes: #244589) - - Fix CAN-2003-0856. - * debian/config-udeb*: - - Enable netcat. (closes: #243508) - - Enable support for md5sum -c. - * modutils: - - Fix parameter passing for 2.4 modules. (closes: #245560) - - Add biarch support to 2.4 depmod and lsmod. (closes: #231606, #231618) - - Add 2.6 support to lsmod. (closes: #245580) - - -- Bastian Blank Sat, 08 May 2004 14:58:04 +0200 - -busybox-cvs (20040415-3) unstable; urgency=low - - * modutils: - - Fix detection of 2.4 kernel. (closes: #244806) - - -- Bastian Blank Tue, 20 Apr 2004 11:55:12 +0200 - -busybox-cvs (20040415-2) unstable; urgency=low - - * modutils: - - Make depmod quiet. - - Fix name of dependency files. - - -- Bastian Blank Sun, 18 Apr 2004 20:00:51 +0200 - -busybox-cvs (20040415-1) unstable; urgency=low - - * New CVS version - * modutils: - - Merge 2.6 support into insmod and depmod. - * debian/config-*udeb-linux: - - Update. - - -- Bastian Blank Sun, 18 Apr 2004 18:53:44 +0200 - -busybox-cvs (20040408-1) unstable; urgency=low - - * New CVS version - - Fix wget ftp handling. (closes: #242779) - * debian/config-*udeb: - - Disable standalone shell. - - -- Bastian Blank Thu, 15 Apr 2004 22:40:35 +0200 - -busybox-cvs (20040402-1) unstable; urgency=low - - * New CVS version - - Fix llseek mess. (closes: #240918) - * debian/config-*: - - Update. - - -- Bastian Blank Fri, 02 Apr 2004 23:49:25 +0200 - -busybox-cvs (20040306-1) unstable; urgency=low - - * New CVS version - - Fix directory header in ls. (closes: #231994) - - wget checks for empty *_proxy. (closes: #234130) - * debian/config-*: - - Update. - - -- Bastian Blank Mon, 23 Feb 2004 13:22:38 +0100 - -busybox-cvs (20040101-7) unstable; urgency=low - - * archival/libunarchive/get_header_tar.c: - - Fix usage of tar typeflag field (upstream). (closes: #233627) - * debian/config-*: - - Disable oldgnu support in tar. - - -- Bastian Blank Sat, 21 Feb 2004 12:34:40 +0100 - -busybox-cvs (20040101-6) unstable; urgency=low - - * debian/config-udeb*: - - Enable dd. (closes: #228248) - * debian/control: - - Set Standards-Version to 3.6.1, no changes. - - Remove Glenn McGrath from Uploaders. - * shell/cmdedit.c: - - Fix lockup (upstream). (closes: #228915) - * networking/wget.c: - - Fix proxy (upstream). - - -- Bastian Blank Thu, 22 Jan 2004 14:25:24 +0100 - -busybox-cvs (20040101-4) unstable; urgency=low - - * Fix cp truncation bug (Closes: #227081) - - -- Glenn McGrath Mon, 12 Jan 2004 20:51:01 +1100 - -busybox-cvs (20040101-3) unstable; urgency=low - - * debian/control: - - Change descriptions a little bit. - - Build-Depend against di-packages-build (>= 0.5). - * debian/rules: - - Install correct manpages. - - Mark build-* rules as notparallel. - - -- Bastian Blank Fri, 09 Jan 2004 22:09:02 +0100 - -busybox-cvs (20040101-2) unstable; urgency=low - - * coreutils/ln.c: - - Fix check in symlink mode (upstream). (closes: #226722) - - -- Bastian Blank Thu, 08 Jan 2004 12:50:27 +0100 - -busybox-cvs (20040101-1) unstable; urgency=low - - * New CVS version. - - Fix ln. (closes: #216435) - - Make insmod quiet. (closes: #215612) - * debiann/control: - - Build-Depend against di-packages-build (>= 0.4). - * debian/rules: - - Use di-packages-build. - - -- Bastian Blank Mon, 05 Jan 2004 06:21:03 +0100 - -busybox-cvs (20031212-3) unstable; urgency=low - - * debian/config-udeb-linux: - - Enable freeramdisk. (closes: #225360) - - -- Bastian Blank Tue, 30 Dec 2003 22:36:50 +0100 - -busybox-cvs (20031212-2) unstable; urgency=low - - * debian/config-udeb: - - Enable freeramdisk - * archival/libunarchive/data_extract_to_stdout.c: - - Don't extract to much (upstream). - * archival/libunarchive/data_extract_all.c: - - Don't set permissions on symlinks (upstream). - * editors/sed.c: - - Fix (upstream). (closes: #224676) - - -- Bastian Blank Tue, 23 Dec 2003 16:59:13 +0100 - -busybox-cvs (20031212-1) unstable; urgency=low - - * new cvs version - - fixes IOR in fdisk. (closes: #223773) - * debian/config* - - update - - remove mtab support from mount in busybox-static. (closes: #222386) - - enable progress bar for wget. (closes: #223770) - * modutils/obj/obj_s390{,x}.c - - fix abi change, R_390_GOTOFF -> R_390_GOTOFF32. (closes: #216528) - * acknowledge nmu. (closes: #216950, #216756, #215169, #215613) - - -- Bastian Blank Fri, 12 Dec 2003 21:19:41 +0100 - -busybox-cvs (20030926-2.1) unstable; urgency=low - - * NMU - * Remove /sbin/init from the udebs, while still leaving init support - compiled in. rootskel takes over providing init, but then calls bb init. - Remove linuxrc support from the udebs entirely. Closes: #216756 - * config-floppy-udeb-linux: add minimal find, grep. Closes: #215169 - * net-udeb-linux-i386: add loopback mount support. Closes: #215613 - - -- Joey Hess Tue, 21 Oct 2003 12:47:52 -0400 - -busybox-cvs (20030926-2) unstable; urgency=low - - * debian/config-floppy-udeb-linux - - update for new floppy images (closes: #212986, #214102) - - -- Bastian Blank Thu, 09 Oct 2003 12:25:49 +0200 - -busybox-cvs (20030926-1) unstable; urgency=low - - * new cvs version - * Makefile - - fix libpwdgrp link (upstream) (closes: #211675) - * Rules.mak.in - - fix optimization (closes: #212485) - * debian/config* - - update - * debian/config*udeb* - - move linux-i386 to linux (enable modutils on any linux arch) - - rename net to floppy - - enable wget status bar (closes: #211457) - * init/init.c - - workaround race conditions (closes: #212764) - - -- Bastian Blank Fri, 26 Sep 2003 15:10:14 +0200 - -busybox-cvs (0.60.99.cvs20030819-3) unstable; urgency=low - - * shell/ash.c - - fix signal handling (upstream) - - -- Bastian Blank Mon, 15 Sep 2003 18:12:09 +0200 - -busybox-cvs (0.60.99.cvs20030819-2) unstable; urgency=low - - * Fix configure permisions - * Set source Section to embedded - - -- Glenn McGrath Mon, 25 Aug 2003 06:33:19 +0000 - -busybox-cvs (0.60.99.cvs20030819-1) unstable; urgency=low - - * new cvs version - - -- Bastian Blank Tue, 19 Aug 2003 13:18:54 +0200 - -busybox-cvs (0.60.99.cvs20030426-10) unstable; urgency=low - - * archival/libunarchive/* - - add hardlink support (pending) - * debian/config-*udeb* - - add support for oldgnu tar format - - -- Bastian Blank Tue, 10 Jun 2003 12:06:41 +0200 - -busybox-cvs (0.60.99.cvs20030426-9) unstable; urgency=low - - * modutils/depmod.c - - fix base_dir for modules.dep - - -- Bastian Blank Sat, 07 Jun 2003 14:52:54 +0200 - -busybox-cvs (0.60.99.cvs20030426-8) unstable; urgency=low - - * util-linux/fdisk.c - - fix syscalls. (pending) - * libpwd/* - - don't build setgroups.o - - -- Bastian Blank Tue, 03 Jun 2003 11:26:28 +0200 - -busybox-cvs (0.60.99.cvs20030426-7) unstable; urgency=low - - * libbb/*syscallc.c - - fix syscalls. (upstream) (closes: #194631) - * modutils/* - - update complete objects code from upstream. (pending) - * debian/config-*udeb* - - update to busybox-applets.txt:1.14 - - -- Bastian Blank Thu, 29 May 2003 16:17:14 +0200 - -busybox-cvs (0.60.99.cvs20030426-6) unstable; urgency=low - - * modutils/Makefile.in - - don't build anything if deactivated - - -- Bastian Blank Sat, 24 May 2003 18:57:14 +0200 - -busybox-cvs (0.60.99.cvs20030426-5) unstable; urgency=low - - * debian/config-*udeb* - - revert changes (closes: #192717, #192753) - - readd initrd support (workaround) - - make init quiet - * archival/tar.c - - fix usage of tar -O (upstream) (closes: #193788) - - -- Bastian Blank Sat, 24 May 2003 13:25:36 +0200 - -busybox-cvs (0.60.99.cvs20030426-4) unstable; urgency=low - - * debian/config-*udeb* - - update to busybox-applets.txt:1.12 - * debian/rules - - use system instead of arch to determine which config file to use - - -- Bastian Blank Fri, 09 May 2003 11:21:13 +0200 - -busybox-cvs (0.60.99.cvs20030426-3) unstable; urgency=low - - * debian/config-udeb* - - update to busybox-applets.txt:1.11 - - -- Bastian Blank Wed, 07 May 2003 10:37:40 +0200 - -busybox-cvs (0.60.99.cvs20030426-2) unstable; urgency=low - - * modutils/* - - modprobe failes gracefully if the module is already loaded. (pending) - - implement depmod. (pending) - * debian/config* - - update - - -- Bastian Blank Wed, 30 Apr 2003 14:12:36 +0200 - -busybox-cvs (0.60.99.cvs20030426-1) unstable; urgency=low - - * new cvs version - - -- Bastian Blank Sat, 26 Apr 2003 18:33:17 +0200 - -busybox-cvs (0.60.99.cvs20030420-4) unstable; urgency=low - - * network/libiproute/iproute.c - - fix usage of ip route flush (upstream) - - -- Bastian Blank Fri, 25 Apr 2003 16:48:43 +0200 - -busybox-cvs (0.60.99.cvs20030420-3) unstable; urgency=low - - * debian/config-*udeb* - - update to busybox-applets.txt:1.10 - - -- Bastian Blank Fri, 25 Apr 2003 14:03:23 +0200 - -busybox-cvs (0.60.99.cvs20030420-2) unstable; urgency=low - - * archival/tar.c, archival/libunarchive/data_extract_all.c - - unlink files first (upstream patch) - - -- Bastian Blank Mon, 21 Apr 2003 12:42:06 +0200 - -busybox-cvs (0.60.99.cvs20030420-1) unstable; urgency=low - - * new cvs version - * debian/config*-udeb* - - add ifconfig/route for easier transition - * debian/config-net-udeb-i386 - - add logger - * debian/config-udeb* - - add uniq - - -- Bastian Blank Sun, 20 Apr 2003 21:02:58 +0200 - -busybox-cvs (0.60.99.cvs20030405-1) unstable; urgency=low - - * new cvs version - * debian/control - - add busybox-cvs-net-udeb - * debian/rules - - arch depend debs - - new net-udeb - * debian/config* - - cleanup applet list - - -- Bastian Blank Sat, 05 Apr 2003 11:44:50 +0200 - -busybox-cvs (0.60.99.cvs20030221-1) unstable; urgency=low - - * new cvs version - * enable new applets in udeb - - -- Bastian Blank Fri, 21 Feb 2003 23:15:16 +0100 - -busybox-cvs (0.60.99.cvs20030114-1) unstable; urgency=low - - * new cvs version - - -- Bastian Blank Tue, 14 Jan 2003 17:06:43 +0000 - -busybox-cvs (0.60.99.cvs20030105-1) unstable; urgency=low - - * Fix ip command build failure on ia64 (Closes: #172580 - * Dont build with BSD partition table support in fdisk, fails on m68k - - -- Glenn McGrath Sun, 5 Jan 2003 12:48:05 +1100 - -busybox-cvs (0.60.99.cvs20030104-2) unstable; urgency=low - - * floppy-retriever needs the cut command in the udeb - - -- Glenn McGrath Sat, 4 Jan 2003 17:13:05 +1100 - -busybox-cvs (0.60.99.cvs20030104-1) unstable; urgency=low - - * new cvs version - * Include new applets in the static package - * Include ash in the udeb - - -- Glenn McGrath Sat, 4 Jan 2003 13:39:04 +1100 - -busybox-cvs (0.60.99.cvs20021214-1) unstable; urgency=low - - * new cvs version - - udhcp merge. - * fix location of ip link. - - -- Bastian Blank Sat, 14 Dec 2002 13:52:15 +0100 - -busybox-cvs (0.60.99.cvs20021210-1) unstable; urgency=low - - * new cvs version - - various upstream fixes found in the last version. - * busybox-cvs-udeb - - include readlink and realpath. - - -- Bastian Blank Tue, 10 Dec 2002 21:23:40 +0100 - -busybox-cvs (0.60.99.cvs20021209-2) unstable; urgency=low - - * cleanup scripts/config/ within make clean (closes: #172413) - * busybox-cvs-udeb - - include readlink - * include manpages within busybox-cvs and busybox-cvs-static - - -- Bastian Blank Mon, 09 Dec 2002 22:09:52 +0100 - -busybox-cvs (0.60.99.cvs20021209-1) unstable; urgency=low - - * New cvs version. - - fix udhcpc for use with ip. - - klogd supports -c. - * busybox-cvs-udeb - - set priority to extra. (closes: #172302) - - don't longer provide busybox-udeb. - - -- Bastian Blank Mon, 09 Dec 2002 16:22:03 +0100 - -busybox-cvs (0.60.99.cvs20021203-1) unstable; urgency=low - - * New packages based on busybox cvs. - * changes for the udeb - - enable ip applet with address, link and route part. - - enable udhcpc. - - disable ifconfig and route applet. - - disable ls color. - - -- Bastian Blank Tue, 03 Dec 2002 18:51:00 +0100 - -busybox (1:0.60.0-1) unstable; urgency=low - - * New version released. See changelog for details. - - -- Erik Andersen Thu, 2 Aug 2001 12:12:37 -0600 - -busybox (1:0.52-1.1) unstable; urgency=high - - * Non-maintainer upload - * Fixed wget -P handling (closes: #106223). - - -- Matt Kraai Wed, 25 Jul 2001 11:01:38 -0600 - -busybox (1:0.52-1) unstable; urgency=high - - * New version released. See changelog for details. - - -- Erik Andersen Sat, 7 Jul 2001 01:23:45 -0600 - -busybox (1:0.51-10) unstable; urgency=high - - * Fix a compile problem with gcc 3.0 on hppa (closes: #102045) - - -- Erik Andersen Sat, 23 Jun 2001 23:55:57 -0600 - -busybox (1:0.51-9) unstable; urgency=high - - * tar was creating leading directories with 0777 permissions as - as reult of faulty umask handling. This fixes it, repairing - a grave security problem in the woody the boot floppies. - (closes: #101169) - - -- Erik Andersen Wed, 20 Jun 2001 16:17:38 -0600 - -busybox (1:0.51-8) unstable; urgency=high - - * Fix cp from /proc, where size=0 (closes: #100369) - * Add some padding to struct sysinfo for m68k. - * Apparently some bugs failed to be closed when master choked - (closes: #99627, #99637, #98571) - * Disable the busybox shell for the .deb, since it is not needed - for the boot floppies. - - -- Erik Andersen Mon, 11 Jun 2001 13:26:07 -0600 - -busybox (1:0.51-7) unstable; urgency=high - - * Fix tar permission setting for existing directories (closes: #99627) - * Do not remove the .cvsignore files on 'make release' (closes: #99637) - - -- Erik Andersen Mon, 4 Jun 2001 10:55:19 -0600 - -busybox (1:0.51-6) testing unstable; urgency=high - - * Update the version in testing so DHCP in the woody boot-floppies will work. - * Enable expr for the boot-floppies (closes: #98433) - * It builds on arm just fine now (closes: #97510) - - -- Erik Andersen Wed, 23 May 2001 14:50:13 -0600 - -busybox (1:0.51-5) unstable; urgency=low - - * Backport a sed fix from 0.52pre - * Backport chroot fix from 0.52pre - - -- Erik Andersen Wed, 16 May 2001 23:50:33 -0600 - -busybox (1:0.51-4) unstable; urgency=low - - * Backport from 0.52pre an endianness bugfix for md5sum - * Backport some updates to grep and sed - * Fix 'wget -O -' so it sets the quiet flag - - -- Erik Andersen Mon, 14 May 2001 14:17:36 -0600 - -busybox (1:0.51-3) unstable; urgency=low - - * This is the "I am an idiot" release. - * Make cp and mv work again (closes: #97290) - * Fix the version number. - - -- Erik Andersen Sat, 12 May 2001 17:35:58 -0600 - -busybox (0.51-2) unstable; urgency=low - - * Backport several release critical fixes into the 0.51 codebase - so the boot-floppies will work again. - * Fix a link ordering problem. (closes: #93362) - * Fixed gunzip (closes: #94331) - * Fixed cp permission setting (closes: #94580) - - -- Erik Andersen Sat, 12 May 2001 11:22:35 -0600 - -busybox (0.51-1) unstable; urgency=low - - * Fixes several critical bugs (see the busybox changelog - for complete details) - * Force USE_SYSTEM_PWD_GRP=false, so busybox bypasses - the glibc NSS libraries. (closes: #93362) - * Fixed a bug in sed's address range handling (closes: #91758) - * Removed irrelevant cruft from the bottem of debian/changelog - - -- Erik Andersen Tue, 10 Apr 2001 14:07:29 -0600 - -busybox (0.50-2) unstable; urgency=low - - * Enabled freeramdisk and pivot_root in the udeb (closes: #91336) - * Disabled lash (the busybox shell) in the udeb (closes: #91337) - * fixed a bug in syslog, a problem with rebooting when booted as - an initrd, and a few other minor problems. - - -- Erik Andersen Sun, 25 Mar 2001 20:59:44 -0700 - - -busybox (0.50-2) unstable; urgency=low - - * Enabled freeramdisk and pivot_root in the udeb (closes: #91336) - * Disabled lash (the busybox shell) in the udeb (closes: #91337) - * fixed a bug in syslog, a problem with rebooting when booted as - an initrd, and a few other minor problems. - - -- Erik Andersen Sun, 25 Mar 2001 20:59:44 -0700 - -busybox (0.50-1) unstable; urgency=low - - * Tons on improvements all around -- See changelog for details. - * Fix malformed Build-Depends (closes: #86930) - * grep has worked for some time now (closes: #81084) - * init compiles with DEBUG_INIT enabled (closes: #85794) - * md5sum no longer displays filename when reading stdin (closes: #81283) - * lsmod, rmmod, and insmod are no longer enabled (closes: #85642) - * busybox and buxybox-static now conflict/replace each other (closes: #80421) - - -- Erik Andersen Thu, 15 Mar 2001 14:45:00 -0700 - -busybox (0.49-1) unstable; urgency=low - - * Lots more source updates and bug fixes. See changelog for details. - - -- Erik Andersen Sat, 27 Jan 2001 01:45:53 -0700 - -busybox (0.48-1) unstable; urgency=low - - * Lots more source updates and bug fixes. See changelog for details. - * Now includes .udeb support for the debian-installer. The .udeb - probably needs some more work, but this should be a good start. - - -- Erik Andersen Wed, 13 Dec 2000 08:36:07 -0700 - -busybox (0.47-1) unstable; urgency=low - - * New version released. See changelog for details. - - -- Erik Andersen Mon, 25 Sep 2000 23:00:56 -0600 - -busybox (0.46-1) unstable; urgency=low - - * New version released. See changelog for details. - - -- Erik Andersen Tue, 11 Jul 2000 12:15:44 -0600 - -busybox (0.45-1) unstable; urgency=low - - * First attempt at packaging BusyBox as a .deb. This has been in - in the Debian boot-floppies CVS tree forever. Hopefully, having it as a - standalone app will make life easier for me, the debian-installer team, and - everyone else as well... - * I have created a busybox-static that can be used as a rescue shell when you - hose your system. Just invoke "busybox sh" to fir up the shell. This has - every app provided by busybox staically linked in. There have been several - times in the past that I would have loved to have this sitting on my system - (i.e. when libc gets screwed up.) - - -- Erik Andersen Tue, 27 Jun 2000 12:26:41 -0600 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/config/config.maemo b/debian/config/config.maemo deleted file mode 100644 index 0535cbd..0000000 --- a/debian/config/config.maemo +++ /dev/null @@ -1,825 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.10.2 -# Thu Jul 24 12:28:58 2008 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_DESKTOP is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_APPLETS_FALLBACK is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y - -# -# Debugging Options -# -CONFIG_DEBUG=y -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_INCLUDE_SUSv2=y - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_FEATURE_RPM_BZ2 is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_BZIP2 is not set -# CONFIG_FEATURE_TAR_LZMA is not set -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -CONFIG_FEATURE_TAR_TOUCH=y -CONFIG_UNCOMPRESS=y -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_UNZIP is not set - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_INODE is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -CONFIG_EXPAND=y -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_FSYNC=y -CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -# CONFIG_FEATURE_LS_FILETYPES is not set -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -# CONFIG_FEATURE_STAT_FORMAT is not set -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_TR=y -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_MATH is not set -CONFIG_CMP=y -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_BINARY is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_FEATURE_DIFF_MINIMAL is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -# CONFIG_FEATURE_FIND_MMIN is not set -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -# CONFIG_FEATURE_FIND_EXEC is not set -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -CONFIG_CALL_TELINIT=y -CONFIG_TELINIT_PATH="/sbin/telinit" -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_DELUSER is not set -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -# CONFIG_FEATURE_WTMP is not set -CONFIG_LOGIN=y -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set -# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_2_6_MODULES is not set -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -CONFIG_GETOPT=y -# CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -CONFIG_HWCLOCK=y -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -# CONFIG_FEATURE_MOUNT_LABEL is not set -CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MTAB_SUPPORT=y - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_LAST is not set -# CONFIG_LESS is not set -CONFIG_FEATURE_LESS_MAXLINES= -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SCRIPT is not set -# CONFIG_STRINGS is not set -CONFIG_SETSID=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_TIME=y -# CONFIG_TTYSIZE is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFENSLAVE is not set -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NC is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SENDMAIL is not set -# CONFIG_FETCHMAIL is not set -CONFIG_SLATTACH=y -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_TFTP is not set -# CONFIG_TFTPD is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_DHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= -# CONFIG_VCONFIG is not set -# CONFIG_WGET is not set -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_ZCIP is not set -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -# CONFIG_NMETER is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -# CONFIG_ASH_GETOPTS is not set -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_CTTYHACK is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -CONFIG_LOGGER=y - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_SV is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set diff --git a/debian/config/os/hurd b/debian/config/os/hurd deleted file mode 100644 index 827a002..0000000 --- a/debian/config/os/hurd +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_PLATFORM_LINUX=n -CONFIG_INIT_TERMINAL_TYPE="mach" -CONFIG_FEATURE_INITRD=y -CONFIG_BLOCKDEV=n -CONFIG_MOUNT=n -CONFIG_UMOUNT=n -CONFIG_SWAPONOFF=n diff --git a/debian/config/os/kfreebsd b/debian/config/os/kfreebsd deleted file mode 100644 index 9e40944..0000000 --- a/debian/config/os/kfreebsd +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_PLATFORM_LINUX=n -CONFIG_INIT_TERMINAL_TYPE="cons25" -CONFIG_BLOCKDEV=n diff --git a/debian/config/os/linux b/debian/config/os/linux deleted file mode 100644 index 6af524c..0000000 --- a/debian/config/os/linux +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_PLATFORM_LINUX=y - diff --git a/debian/control b/debian/control deleted file mode 100644 index 9890abf..0000000 --- a/debian/control +++ /dev/null @@ -1,597 +0,0 @@ -Source: busybox -Priority: optional -Section: utils -Maintainer: Rafal Krypa -Uploaders: Karol Lewandowski -X-Maemo-Maintainer: Yauheni Kaliuta -X-Original-Maintainer: Debian Install System Team -X-Original-Uploaders: Bastian Blank -Build-Depends: debhelper (>> 5), python, quilt, libsystemd-daemon-dev -Standards-Version: 3.7.3 - -Package: busybox -Priority: required -Essential: yes -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: ash, awk, bsdutils, coreutils, diffutils, editor, findutils, grep, gzip, hostname, less, man-browser, mount, sed, tar, telnet-client, traceroute, util-linux -Replaces: ash, bsdutils, coreutils, diffutils, findutils, grep, gzip, hostname, mount, sed, tar, util-linux -Conflicts: ash, bsdutils, coreutils, diffutils, findutils, grep, gzip, hostname, mount, sed, tar, util-linux -Description: Tiny utilities for small and embedded systems - BusyBox combines tiny versions of many common UNIX utilities into a single - small executable. It provides minimalist replacements for the most common - utilities you would usually find on your desktop system (i.e., ls, cp, mv, - mount, tar, etc.). The utilities in BusyBox generally have fewer options than - their full-featured GNU cousins; however, the options that are included - provide the expected functionality and behave very much like their GNU - counterparts. - . - This package installs: - - the BusyBox binary - - symlinks for tools included into it that correspond to binaries - in essential Debian packages - - alternatives from packages that don't have anything else - . - Symlinks to other tools included into BusyBox which correspond to binaries - in non-essential Debian packages are provided in separate symlink packages. - Those package are split and named according to the corresponding Debian - packages. - -Package: busybox-dbg -Architecture: any -Depends: busybox (= ${binary:Version}) -Section: devel -Description: Debug symbols for BusyBox - Debug symbol file for BusyBox. BusyBox provides tiny utilities for small - and embedded systems. - -Package: busybox-symlinks-busybox -Architecture: all -Depends: busybox (= ${binary:Version}) -Description: BusyBox specific symlinks - BusyBox symlinks for utilities without counterparts in Debian. - These are in separate package because they aren't essentials - (e.g. needed for system package upgrades). - -Package: busybox-symlinks-adduser -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: adduser -Replaces: adduser -Conflicts: adduser -Description: BusyBox symlinks to provide 'adduser' - BusyBox symlinks for utilities corresponding to 'adduser' package. - -Package: busybox-symlinks-adjtimex -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: adjtimex -Replaces: adjtimex -Conflicts: adjtimex -Description: BusyBox symlinks to provide 'adjtimex' - BusyBox symlinks for utilities corresponding to 'adjtimex' package. - -Package: busybox-symlinks-binutils -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: binutils -Replaces: binutils -Conflicts: binutils -Description: BusyBox symlinks to provide 'binutils' - BusyBox symlinks for utilities corresponding to 'binutils' package. - -Package: busybox-symlinks-bridge-utils -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: bridge-utils -Replaces: bridge-utils -Conflicts: bridge-utils -Description: BusyBox symlinks to provide 'bridge-utils' - BusyBox symlinks for utilities corresponding to 'bridge-utils' package. - -Package: busybox-symlinks-bsdmainutils -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: bsdmainutils -Replaces: bsdmainutils -Conflicts: bsdmainutils -Description: BusyBox symlinks to provide 'bsdmainutils' - BusyBox symlinks for utilities corresponding to 'bsdmainutils' package. - -Package: busybox-symlinks-bzip2 -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: bzip2 -Replaces: bzip2 -Conflicts: bzip2 -Description: BusyBox symlinks to provide 'bzip2' - BusyBox symlinks for utilities corresponding to 'bzip2' package. - -Package: busybox-symlinks-console-tools -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: console-tools -Replaces: console-tools -Conflicts: console-tools -Description: BusyBox symlinks to provide 'console-tools' - BusyBox symlinks for utilities corresponding to 'console-tools' package. - -Package: busybox-symlinks-cpio -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: cpio -Replaces: cpio -Conflicts: cpio -Description: BusyBox symlinks to provide 'cpio' - BusyBox symlinks for utilities corresponding to 'cpio' package. - -Package: busybox-symlinks-cron -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: cron -Replaces: cron -Conflicts: cron -Description: BusyBox symlinks to provide 'cron' - BusyBox symlinks for utilities corresponding to 'cron' package. - -Package: busybox-symlinks-daemontools -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: daemontools -Replaces: daemontools -Conflicts: daemontools -Description: BusyBox symlinks to provide 'daemontools' - BusyBox symlinks for utilities corresponding to 'daemontools' package. - -Package: busybox-symlinks-dc -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: dc -Replaces: dc -Conflicts: dc -Description: BusyBox symlinks to provide 'dc' - BusyBox symlinks for utilities corresponding to 'dc' package. - -Package: busybox-symlinks-dnsutils -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: dnsutils -Replaces: dnsutils -Conflicts: dnsutils -Description: BusyBox symlinks to provide 'dnsutils' - BusyBox symlinks for utilities corresponding to 'dnsutils' package. - -Package: busybox-symlinks-dosfstools -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: dosfstools -Replaces: dosfstools -Conflicts: dosfstools -Description: BusyBox symlinks to provide 'dosfstools' - BusyBox symlinks for utilities corresponding to 'dosfstools' package. - -Package: busybox-symlinks-ed -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: ed -Replaces: ed -Conflicts: ed -Description: BusyBox symlinks to provide 'ed' - BusyBox symlinks for utilities corresponding to 'ed' package. - -Package: busybox-symlinks-eject -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: eject -Replaces: eject -Conflicts: eject -Description: BusyBox symlinks to provide 'eject' - BusyBox symlinks for utilities corresponding to 'eject' package. - -Package: busybox-symlinks-fbset -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: fbset -Replaces: fbset -Conflicts: fbset -Description: BusyBox symlinks to provide 'fbset' - BusyBox symlinks for utilities corresponding to 'fbset' package. - -Package: busybox-symlinks-fdflush -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: fdflush -Replaces: fdflush -Conflicts: fdflush -Description: BusyBox symlinks to provide 'fdflush' - BusyBox symlinks for utilities corresponding to 'fdflush' package. - -Package: busybox-symlinks-hdparm -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: hdparm -Replaces: hdparm -Conflicts: hdparm -Description: BusyBox symlinks to provide 'hdparm' - BusyBox symlinks for utilities corresponding to 'hdparm' package. - -Package: busybox-symlinks-ifupdown -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: ifupdown -Replaces: ifupdown -Conflicts: ifupdown -Description: BusyBox symlinks to provide 'ifupdown' - BusyBox symlinks for utilities corresponding to 'ifupdown' package. - -Package: busybox-symlinks-initscripts -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: initscripts -Replaces: initscripts -Conflicts: initscripts -Description: BusyBox symlinks to provide 'initscripts' - BusyBox symlinks for utilities corresponding to 'initscripts' package. - -Package: busybox-symlinks-ipcalc -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: ipcalc -Replaces: ipcalc -Conflicts: ipcalc -Description: BusyBox symlinks to provide 'ipcalc' - BusyBox symlinks for utilities corresponding to 'ipcalc' package. - -Package: busybox-symlinks-iproute -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: iproute -Replaces: iproute -Conflicts: iproute -Description: BusyBox symlinks to provide 'iproute' - BusyBox symlinks for utilities corresponding to 'iproute' package. - -Package: busybox-symlinks-ipsvd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: ipsvd -Replaces: ipsvd -Conflicts: ipsvd -Description: BusyBox symlinks to provide 'ipsvd' - BusyBox symlinks for utilities corresponding to 'ipsvd' package. - -Package: busybox-symlinks-iputils-arping -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: iputils-arping -Replaces: iputils-arping -Conflicts: iputils-arping -Description: BusyBox symlinks to provide 'iputils-arping' - BusyBox symlinks for utilities corresponding to 'iputils-arping' package. - -Package: busybox-symlinks-iputils-ping -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: iputils-ping -Replaces: iputils-ping -Conflicts: iputils-ping -Description: BusyBox symlinks to provide 'iputils-ping' - BusyBox symlinks for utilities corresponding to 'iputils-ping' package. - -Package: busybox-symlinks-klogd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: klogd -Replaces: klogd -Conflicts: klogd -Description: BusyBox symlinks to provide 'klogd' - BusyBox symlinks for utilities corresponding to 'klogd' package. - -Package: busybox-symlinks-loadlin -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: loadlin -Replaces: loadlin -Conflicts: loadlin -Description: BusyBox symlinks to provide 'loadlin' - BusyBox symlinks for utilities corresponding to 'loadlin' package. - -Package: busybox-symlinks-lrzsz -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: lrzsz -Replaces: lrzsz -Conflicts: lrzsz -Description: BusyBox symlinks to provide 'lrzsz' - BusyBox symlinks for utilities corresponding to 'lrzsz' package. - -Package: busybox-symlinks-lzma -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: lzma -Replaces: lzma -Conflicts: lzma -Description: BusyBox symlinks to provide 'lzma' - BusyBox symlinks for utilities corresponding to 'lzma' package. - -Package: busybox-symlinks-lzop -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: lzop -Replaces: lzop -Conflicts: lzop -Description: BusyBox symlinks to provide 'lzop' - BusyBox symlinks for utilities corresponding to 'lzop' package. - -Package: busybox-symlinks-module-init-tools -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: module-init-tools -Replaces: module-init-tools -Conflicts: module-init-tools -Description: BusyBox symlinks to provide 'module-init-tools' - BusyBox symlinks for utilities corresponding to 'module-init-tools' package. - -Package: busybox-symlinks-mtd-utils -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: mtd-utils -Replaces: mtd-utils -Conflicts: mtd-utils -Description: BusyBox symlinks to provide 'mtd-utils' - BusyBox symlinks for utilities corresponding to 'mtd-utils' package. - -Package: busybox-symlinks-net-tools -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: net-tools -Replaces: net-tools -Conflicts: net-tools -Description: BusyBox symlinks to provide 'net-tools' - BusyBox symlinks for utilities corresponding to 'net-tools' package. - -Package: busybox-symlinks-openbsd-inetd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: openbsd-inetd -Replaces: openbsd-inetd -Conflicts: openbsd-inetd -Description: BusyBox symlinks to provide 'openbsd-inetd' - BusyBox symlinks for utilities corresponding to 'openbsd-inetd' package. - -Package: busybox-symlinks-passwd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: passwd -Replaces: passwd -Conflicts: passwd -Description: BusyBox symlinks to provide 'passwd' - BusyBox symlinks for utilities corresponding to 'passwd' package. - -Package: busybox-symlinks-patch -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: patch -Replaces: patch -Conflicts: patch -Description: BusyBox symlinks to provide 'patch' - BusyBox symlinks for utilities corresponding to 'patch' package. - -Package: busybox-symlinks-ppp -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: ppp -Replaces: ppp -Conflicts: ppp -Description: BusyBox symlinks to provide 'ppp' - BusyBox symlinks for utilities corresponding to 'ppp' package. - -Package: busybox-symlinks-procps -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: procps -Replaces: procps -Conflicts: procps -Description: BusyBox symlinks to provide 'procps' - BusyBox symlinks for utilities corresponding to 'procps' package. - -Package: busybox-symlinks-psmisc -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: psmisc -Replaces: psmisc -Conflicts: psmisc -Description: BusyBox symlinks to provide 'psmisc' - BusyBox symlinks for utilities corresponding to 'psmisc' package. - -Package: busybox-symlinks-rdate -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: rdate -Replaces: rdate -Conflicts: rdate -Description: BusyBox symlinks to provide 'rdate' - BusyBox symlinks for utilities corresponding to 'rdate' package. - -Package: busybox-symlinks-realpath -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: realpath -Replaces: realpath -Conflicts: realpath -Description: BusyBox symlinks to provide 'realpath' - BusyBox symlinks for utilities corresponding to 'realpath' package. - -Package: busybox-symlinks-rpm -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: rpm -Replaces: rpm -Conflicts: rpm -Description: BusyBox symlinks to provide 'rpm' - BusyBox symlinks for utilities corresponding to 'rpm' package. - -Package: busybox-symlinks-runit -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: runit -Replaces: runit -Conflicts: runit -Description: BusyBox symlinks to provide 'runit' - BusyBox symlinks for utilities corresponding to 'runit' package. - -Package: busybox-symlinks-sharutils -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: sharutils -Replaces: sharutils -Conflicts: sharutils -Description: BusyBox symlinks to provide 'sharutils' - BusyBox symlinks for utilities corresponding to 'sharutils' package. - -Package: busybox-symlinks-ssmtp -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: ssmtp -Replaces: ssmtp -Conflicts: ssmtp -Description: BusyBox symlinks to provide 'ssmtp' - BusyBox symlinks for utilities corresponding to 'ssmtp' package. - -Package: busybox-symlinks-sysklogd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: sysklogd -Replaces: sysklogd -Conflicts: sysklogd -Description: BusyBox symlinks to provide 'sysklogd' - BusyBox symlinks for utilities corresponding to 'sysklogd' package. - -Package: busybox-symlinks-telnetd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: telnetd -Replaces: telnetd -Conflicts: telnetd -Description: BusyBox symlinks to provide 'telnetd' - BusyBox symlinks for utilities corresponding to 'telnetd' package. - -Package: busybox-symlinks-tftp -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: tftp -Replaces: tftp -Conflicts: tftp -Description: BusyBox symlinks to provide 'tftp' - BusyBox symlinks for utilities corresponding to 'tftp' package. - -Package: busybox-symlinks-time -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: time -Replaces: time -Conflicts: time -Description: BusyBox symlinks to provide 'time' - BusyBox symlinks for utilities corresponding to 'time' package. - -Package: busybox-symlinks-tofrodos -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: tofrodos -Replaces: tofrodos -Conflicts: tofrodos -Description: BusyBox symlinks to provide 'tofrodos' - BusyBox symlinks for utilities corresponding to 'tofrodos' package. - -Package: busybox-symlinks-udhcpc -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: udhcpc -Replaces: udhcpc -Conflicts: udhcpc -Description: BusyBox symlinks to provide 'udhcpc' - BusyBox symlinks for utilities corresponding to 'udhcpc' package. - -Package: busybox-symlinks-udhcpd -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: udhcpd -Replaces: udhcpd -Conflicts: udhcpd -Description: BusyBox symlinks to provide 'udhcpd' - BusyBox symlinks for utilities corresponding to 'udhcpd' package. - -Package: busybox-symlinks-unzip -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: unzip -Replaces: unzip -Conflicts: unzip -Description: BusyBox symlinks to provide 'unzip' - BusyBox symlinks for utilities corresponding to 'unzip' package. - -Package: busybox-symlinks-vlan -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: vlan -Replaces: vlan -Conflicts: vlan -Description: BusyBox symlinks to provide 'vlan' - BusyBox symlinks for utilities corresponding to 'vlan' package. - -Package: busybox-symlinks-vlock -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: vlock -Replaces: vlock -Conflicts: vlock -Description: BusyBox symlinks to provide 'vlock' - BusyBox symlinks for utilities corresponding to 'vlock' package. - -Package: busybox-symlinks-watchdog -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: watchdog -Replaces: watchdog -Conflicts: watchdog -Description: BusyBox symlinks to provide 'watchdog' - BusyBox symlinks for utilities corresponding to 'watchdog' package. - -Package: busybox-symlinks-wget -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: wget -Replaces: wget -Conflicts: wget -Description: BusyBox symlinks to provide 'wget' - BusyBox symlinks for utilities corresponding to 'wget' package. - -Package: busybox-symlinks-xterm -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: xterm -Replaces: xterm -Conflicts: xterm -Description: BusyBox symlinks to provide 'xterm' - BusyBox symlinks for utilities corresponding to 'xterm' package. - -Package: busybox-symlinks-zcip -Architecture: all -Depends: busybox (= ${binary:Version}) -Provides: zcip -Replaces: zcip -Conflicts: zcip -Description: BusyBox symlinks to provide 'zcip' - BusyBox symlinks for utilities corresponding to 'zcip' package. - -Package: busybox-systemd-klogd -Architecture: all -Depends: busybox-symlinks-klogd (= ${binary:Version}) -Description: systemd unit file for BusyBox's klogd - This package provides systemd unit file for BusyBox's klogd - -Package: busybox-systemd-sysklogd -Architecture: all -Depends: busybox-symlinks-sysklogd (= ${binary:Version}) -Description: systemd unit file for BusyBox's syslogd - This package provides systemd unit file for BusyBox's syslogd diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 7d98fb8..0000000 --- a/debian/copyright +++ /dev/null @@ -1,28 +0,0 @@ -This package was debianized by Erik Andersen on -Sun, 18 Jun 2000 23:31:02 -0600 - -It was downloaded from ftp://ftp.busybox.net/busybox - -BusyBox is an aggregate of multiple packages. These packages are copyrighted -by their respective authors. - -Copyright: 1999-2005 Erik Andersen - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/local/bash b/debian/local/bash deleted file mode 100644 index 1006ab8..0000000 --- a/debian/local/bash +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/ash -/bin/ash "$@" diff --git a/debian/local/faketrue b/debian/local/faketrue deleted file mode 100644 index 1a24852..0000000 --- a/debian/local/faketrue +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh diff --git a/debian/local/tempfile b/debian/local/tempfile deleted file mode 100644 index d94f654..0000000 --- a/debian/local/tempfile +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -#set -x - -mode=0600 -ver=0.0.1 - -usage() { - cat < -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff --git a/Makefile.flags b/Makefile.flags -index 988d6e7..e55e3a2 100644 ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -41,7 +41,7 @@ CFLAGS += $(call cc-option,-Os -fno-builtin-strlen -finline-limit=0 -fomit-frame - # of branch probabilities (hopefully makes bloatcheck more stable): - CFLAGS += $(call cc-option,-fno-guess-branch-probability,) - CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,) --CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,) -+CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1 $(THUMB),) - - # FIXME: These warnings are at least partially to be concerned about and should - # be fixed.. diff --git a/debian/patches/06ls.dpatch b/debian/patches/06ls.dpatch deleted file mode 100644 index b953d77..0000000 --- a/debian/patches/06ls.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-unnamed.dpatch by Yauheni Kaliuta -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff --git a/coreutils/ls.c b/coreutils/ls.c -index 067e463..39aa63e 100644 ---- a/coreutils/ls.c -+++ b/coreutils/ls.c -@@ -431,6 +431,7 @@ static void showfiles(struct dnode **dn, int nfiles) - } - } - putchar('\n'); -+ fflush(NULL); - column = 0; - } - } diff --git a/debian/patches/applets-fallback.patch b/debian/patches/applets-fallback.patch deleted file mode 100644 index 880cbe5..0000000 --- a/debian/patches/applets-fallback.patch +++ /dev/null @@ -1,197 +0,0 @@ ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -7241,25 +7241,10 @@ - - - static void --tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **envp) -+tryexec(IF_FEATURE_SH_STANDALONE(int applet_no UNUSED_PARAM,) char *cmd, char **argv, char **envp) - { - int repeated = 0; - --#if ENABLE_FEATURE_SH_STANDALONE -- if (applet_no >= 0) { -- if (APPLET_IS_NOEXEC(applet_no)) { -- clearenv(); -- while (*envp) -- putenv(*envp++); -- run_applet_no_and_exit(applet_no, argv); -- } -- /* re-exec ourselves with the new arguments */ -- execve(bb_busybox_exec_path, argv, envp); -- /* If they called chroot or otherwise made the binary no longer -- * executable, fall through */ -- } --#endif -- - repeat: - #ifdef SYSV - do { -@@ -7309,14 +7294,14 @@ - - clearredir(/*drop:*/ 1); - envp = listvars(VEXPORT, VUNSET, /*end:*/ NULL); -- if (strchr(argv[0], '/') != NULL --#if ENABLE_FEATURE_SH_STANDALONE -- || (applet_no = find_applet_by_name(argv[0])) >= 0 --#endif -- ) { -+ if (strchr(argv[0], '/') != NULL) { - tryexec(IF_FEATURE_SH_STANDALONE(applet_no,) argv[0], argv, envp); - e = errno; - } else { -+#if ENABLE_FEATURE_SH_STANDALONE -+ bb_execv_applet(argv[0], argv, envp); -+#endif -+ - e = ENOENT; - while ((cmdname = path_advance(&path, argv[0])) != NULL) { - if (--idx < 0 && pathopt == NULL) { ---- a/libbb/execable.c -+++ b/libbb/execable.c -@@ -9,6 +9,9 @@ - - #include "libbb.h" - -+#include -+#include -+ - /* check if path points to an executable file; - * return 1 if found; - * return 0 otherwise; -@@ -68,12 +71,60 @@ - } - - #if ENABLE_FEATURE_PREFER_APPLETS -+int FAST_FUNC bb_execv_applet(const char *name, char *const argv[], char *const envp[]) -+{ -+ const char **path = bb_busybox_exec_paths; -+ -+ errno = ENOENT; -+ -+ if (find_applet_by_name(name) < 0) -+ return -1; -+ -+ for (; *path; ++path) -+ execve(*path, argv, envp); -+ -+ return -1; -+} -+ - /* just like the real execvp, but try to launch an applet named 'file' first - */ - int FAST_FUNC bb_execvp(const char *file, char *const argv[]) - { -- return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : file, -- argv); -+ int ret = bb_execv_applet(file, argv, environ); -+ if (errno != ENOENT) -+ return ret; -+ -+ return execvp(file, argv); -+} -+ -+int FAST_FUNC bb_execlp(const char *file, const char *arg, ...) -+{ -+#define INITIAL_ARGV_MAX 16 -+ size_t argv_max = INITIAL_ARGV_MAX; -+ const char **argv = malloc(argv_max * sizeof (const char *)); -+ va_list args; -+ unsigned int i = 0; -+ int ret; -+ -+ va_start (args, arg); -+ while (argv[i++] != NULL) { -+ if (i == argv_max) { -+ const char **nptr; -+ argv_max *= 2; -+ nptr = realloc (argv, argv_max * sizeof (const char *)); -+ if (nptr == NULL) -+ return -1; -+ argv = nptr; -+ } -+ -+ argv[i] = va_arg (args, const char *); -+ } -+ va_end (args); -+ -+ ret = bb_execvp(file, (char *const *)argv); -+ free(argv); -+ -+ return ret; - } - #endif - ---- a/libbb/messages.c -+++ b/libbb/messages.c -@@ -45,6 +45,15 @@ - const char bb_path_motd_file[] ALIGN1 = "/etc/motd"; - const char bb_dev_null[] ALIGN1 = "/dev/null"; - const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH; -+const char *bb_busybox_exec_paths[] ALIGN1 = { -+#ifdef __linux__ -+ "/proc/self/exe", -+#endif -+#ifdef CONFIG_BUSYBOX_EXEC_PATH -+ CONFIG_BUSYBOX_EXEC_PATH, -+#endif -+ NULL -+}; - const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; - /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, - * but I want to save a few bytes here. Check libbb.h before changing! */ ---- a/include/libbb.h -+++ b/include/libbb.h -@@ -830,11 +830,11 @@ - * but it may exec busybox and call applet instead of searching PATH. - */ - #if ENABLE_FEATURE_PREFER_APPLETS -+int bb_execv_applet(const char *name, char *const argv[], char *const envp[]) FAST_FUNC; - int bb_execvp(const char *file, char *const argv[]) FAST_FUNC; --#define BB_EXECVP(prog,cmd) bb_execvp(prog,cmd) --#define BB_EXECLP(prog,cmd,...) \ -- execlp((find_applet_by_name(prog) >= 0) ? CONFIG_BUSYBOX_EXEC_PATH : prog, \ -- cmd, __VA_ARGS__) -+int bb_execlp(const char *file, const char *arg, ...) FAST_FUNC; -+#define BB_EXECVP(prog,cmd) bb_execvp(prog,cmd) -+#define BB_EXECLP(prog,cmd,...) bb_execlp(prog,cmd, __VA_ARGS__) - #else - #define BB_EXECVP(prog,cmd) execvp(prog,cmd) - #define BB_EXECLP(prog,cmd,...) execlp(prog,cmd, __VA_ARGS__) -@@ -1575,6 +1575,7 @@ - extern const char bb_path_wtmp_file[]; - extern const char bb_dev_null[]; - extern const char bb_busybox_exec_path[]; -+extern const char *bb_busybox_exec_paths[]; - /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, - * but I want to save a few bytes here */ - extern const char bb_PATH_root_path[]; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */ ---- a/Config.in -+++ b/Config.in -@@ -386,13 +386,10 @@ - - config BUSYBOX_EXEC_PATH - string "Path to BusyBox executable" -- default "/proc/self/exe" -+ default "/bin/busybox" - help - When Busybox applets need to run other busybox applets, BusyBox -- sometimes needs to exec() itself. When the /proc filesystem is -- mounted, /proc/self/exe always points to the currently running -- executable. If you haven't got /proc, set this to wherever you -- want to run BusyBox from. -+ sometimes needs to exec() itself. - - # These are auto-selected by other options - ---- a/coreutils/chroot.c -+++ b/coreutils/chroot.c -@@ -30,5 +30,7 @@ - argv[1] = (char *) "-i"; - } - -- BB_EXECVP_or_die(argv); -+ execvp(argv[0], argv); -+ xfunc_error_retval = (errno == ENOENT) ? 127 : 126; -+ bb_perror_msg_and_die("can't execute '%s'", argv[0]); - } diff --git a/debian/patches/blockdev.patch b/debian/patches/blockdev.patch deleted file mode 100644 index 46f57b7..0000000 --- a/debian/patches/blockdev.patch +++ /dev/null @@ -1,210 +0,0 @@ -Description: Backport blockdev applet from upstream - This allows os-prober to avoid replaying journals when mounting block - devices read-only. -Origin: http://git.busybox.net/busybox/tree/util-linux/blockdev.c -Bug-Debian: http://bugs.debian.org/418163 -Author: Sergey Naumov -Author: Denys Vlasenko -Forwarded: not-needed -Last-Update: 2010-11-09 - -Index: b/util-linux/blockdev.c -=================================================================== ---- /dev/null -+++ b/util-linux/blockdev.c -@@ -0,0 +1,195 @@ -+/* -+ * blockdev implementation for busybox -+ * -+ * Copyright (C) 2010 Sergey Naumov -+ * -+ * Licensed under GPLv2, see file LICENSE in this source tree. -+ */ -+ -+//applet:IF_BLOCKDEV(APPLET(blockdev, _BB_DIR_SBIN, _BB_SUID_DROP)) -+ -+//kbuild:lib-$(CONFIG_BLOCKDEV) += blockdev.o -+ -+//config:config BLOCKDEV -+//config: bool "blockdev" -+//config: default y -+//config: help -+//config: Performs some ioctls with block devices. -+ -+//usage:#define blockdev_trivial_usage -+//usage: "OPTION BLOCKDEV" -+//usage:#define blockdev_full_usage "\n\n" -+//usage: "Options:" -+//usage: "\n --setro Set ro" -+//usage: "\n --setrw Set rw" -+//usage: "\n --getro Get ro" -+//usage: "\n --getss Get sector size" -+//usage: "\n --getbsz Get block size" -+//usage: "\n --setbsz BYTES Set block size" -+//usage: "\n --getsize Get device size in 512-byte sectors" -+//usage: "\n --getsize64 Get device size in bytes" -+//usage: "\n --flushbufs Flush buffers" -+//usage: "\n --rereadpt Reread partition table" -+ -+ -+#include "libbb.h" -+#include -+ -+enum { -+ ARG_NONE = 0, -+ ARG_INT = 1, -+ ARG_ULONG = 2, -+ /* Yes, BLKGETSIZE64 takes pointer to uint64_t, not ullong! */ -+ ARG_U64 = 3, -+ ARG_MASK = 3, -+ -+ FL_USRARG = 4, /* argument is provided by user */ -+ FL_NORESULT = 8, -+}; -+ -+struct bdc { -+ uint32_t ioc; /* ioctl code */ -+ const char name[sizeof("flushbufs")]; /* "--setfoo" wothout "--" */ -+ uint8_t flags; -+ int8_t argval; /* default argument value */ -+}; -+ -+static const struct bdc bdcommands[] = { -+ { -+ .ioc = BLKROSET, -+ .name = "setro", -+ .flags = ARG_INT + FL_NORESULT, -+ .argval = 1, -+ },{ -+ .ioc = BLKROSET, -+ .name = "setrw", -+ .flags = ARG_INT + FL_NORESULT, -+ .argval = 0, -+ },{ -+ .ioc = BLKROGET, -+ .name = "getro", -+ .flags = ARG_INT, -+ .argval = -1, -+ },{ -+ .ioc = BLKSSZGET, -+ .name = "getss", -+ .flags = ARG_INT, -+ .argval = -1, -+ },{ -+ .ioc = BLKBSZGET, -+ .name = "getbsz", -+ .flags = ARG_INT, -+ .argval = -1, -+ },{ -+ .ioc = BLKBSZSET, -+ .name = "setbsz", -+ .flags = ARG_INT + FL_NORESULT + FL_USRARG, -+ .argval = 0, -+ },{ -+ .ioc = BLKGETSIZE, -+ .name = "getsize", -+ .flags = ARG_ULONG, -+ .argval = -1, -+ },{ -+ .ioc = BLKGETSIZE64, -+ .name = "getsize64", -+ .flags = ARG_U64, -+ .argval = -1, -+ },{ -+ .ioc = BLKFLSBUF, -+ .name = "flushbufs", -+ .flags = ARG_NONE + FL_NORESULT, -+ .argval = 0, -+ },{ -+ .ioc = BLKRRPART, -+ .name = "rereadpt", -+ .flags = ARG_NONE + FL_NORESULT, -+ .argval = 0, -+ } -+}; -+ -+static const struct bdc *find_cmd(const char *s) -+{ -+ const struct bdc *bdcmd = bdcommands; -+ if (s[0] == '-' && s[1] == '-') { -+ s += 2; -+ do { -+ if (strcmp(s, bdcmd->name) == 0) -+ return bdcmd; -+ bdcmd++; -+ } while (bdcmd != bdcommands + ARRAY_SIZE(bdcommands)); -+ } -+ bb_show_usage(); -+} -+ -+int blockdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -+int blockdev_main(int argc, char **argv) -+{ -+ const struct bdc *bdcmd; -+ int fd; -+ uint64_t u64; -+ union { -+ int i; -+ unsigned long lu; -+ uint64_t u64; -+ } ioctl_val_on_stack; -+ -+ if ((unsigned)(argc - 3) > 1) /* must have 2 or 3 args */ -+ bb_show_usage(); -+ -+ bdcmd = find_cmd(*++argv); -+ -+ u64 = (int)bdcmd->argval; -+ if (bdcmd->flags & FL_USRARG) -+ u64 = xatoi_u(*++argv); -+ -+ if (!*++argv || argv[1]) -+ bb_show_usage(); -+ fd = xopen(*argv, O_RDONLY); -+ -+ ioctl_val_on_stack.u64 = u64; -+#if BB_BIG_ENDIAN -+ /* Store data properly wrt data size. -+ * (1) It's no-op for little-endian. -+ * (2) it's no-op for 0 and -1. Only --setro uses arg != 0 and != -1, -+ * and it is ARG_INT. --setbsz USER_VAL is also ARG_INT. -+ * Thus, we don't need to handle ARG_ULONG. -+ */ -+ switch (bdcmd->flags & ARG_MASK) { -+ case ARG_INT: -+ ioctl_val_on_stack.i = (int)u64; -+ break; -+# if 0 /* unused */ -+ case ARG_ULONG: -+ ioctl_val_on_stack.lu = (unsigned long)u64; -+ break; -+# endif -+ } -+#endif -+ -+ if (ioctl(fd, bdcmd->ioc, &ioctl_val_on_stack.u64) == -1) -+ bb_simple_perror_msg_and_die(*argv); -+ -+ /* Fetch it into register(s) */ -+ u64 = ioctl_val_on_stack.u64; -+ -+ /* Zero- or one-extend the value if needed, then print */ -+ switch (bdcmd->flags & (ARG_MASK+FL_NORESULT)) { -+ case ARG_INT: -+ /* Smaller code when we use long long -+ * (gcc tail-merges printf call) -+ */ -+ printf("%lld\n", (long long)(int)u64); -+ break; -+ case ARG_ULONG: -+ u64 = (unsigned long)u64; -+ /* FALLTHROUGH */ -+ case ARG_U64: -+ printf("%llu\n", (unsigned long long)u64); -+ break; -+ } -+ -+ if (ENABLE_FEATURE_CLEAN_UP) -+ close(fd); -+ return EXIT_SUCCESS; -+} diff --git a/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch b/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch deleted file mode 100644 index aafbed2..0000000 --- a/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e7a0632b7b38f635853a08c276dad2fbd395ba92 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 29 Jul 2010 04:29:53 +0200 -Subject: [PATCH 11/12] bootchartd: mounting tmpfs is Linux-specific - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - init/bootchartd.c | 20 +++++++++++++------- - 1 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/init/bootchartd.c b/init/bootchartd.c -index a1c0164..465a349 100644 ---- a/init/bootchartd.c -+++ b/init/bootchartd.c -@@ -6,7 +6,6 @@ - //config:config BOOTCHARTD - //config: bool "bootchartd" - //config: default y --//config: depends on PLATFORM_LINUX - //config: help - //config: bootchartd is commonly used to profile the boot process - //config: for the purpose of speeding it up. In this case, it is started -@@ -46,12 +45,15 @@ - #include "libbb.h" - /* After libbb.h, since it needs sys/types.h on some systems */ - #include --#include --#ifndef MS_SILENT --# define MS_SILENT (1 << 15) --#endif --#ifndef MNT_DETACH --# define MNT_DETACH 0x00000002 -+ -+#ifdef __linux__ -+# include -+# ifndef MS_SILENT -+# define MS_SILENT (1 << 15) -+# endif -+# ifndef MNT_DETACH -+# define MNT_DETACH 0x00000002 -+# endif - #endif - - #define BC_VERSION_STR "0.8" -@@ -175,6 +177,7 @@ static char *make_tempdir(void) - char template[] = "/tmp/bootchart.XXXXXX"; - char *tempdir = xstrdup(mkdtemp(template)); - if (!tempdir) { -+#ifdef __linux__ - /* /tmp is not writable (happens when we are used as init). - * Try to mount a tmpfs, them cd and lazily unmount it. - * Since we unmount it at once, we can mount it anywhere. -@@ -192,6 +195,9 @@ static char *make_tempdir(void) - if (umount2(try_dir, MNT_DETACH) != 0) { - bb_perror_msg_and_die("can't %smount tmpfs", "un"); - } -+#else -+ bb_perror_msg_and_die("can't create temporary directory"); -+#endif - } else { - xchdir(tempdir); - } --- -1.7.1 - diff --git a/debian/patches/busybox-zero-ifr.ifr_hwaddr.sa_data.patch b/debian/patches/busybox-zero-ifr.ifr_hwaddr.sa_data.patch deleted file mode 100644 index 9fc6f7d..0000000 --- a/debian/patches/busybox-zero-ifr.ifr_hwaddr.sa_data.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/networking/interface.c b/networking/interface.c -index ef187be..6cb1afa 100644 ---- a/networking/interface.c -+++ b/networking/interface.c -@@ -623,6 +623,7 @@ static int if_fetch(struct interface *ife) - - strncpy_IFNAMSIZ(ifr.ifr_name, ifname); - memset(ife->hwaddr, 0, 32); -+ memset(ifr.ifr_hwaddr.sa_data, 0, 8); - if (ioctl(skfd, SIOCGIFHWADDR, &ifr) >= 0) - memcpy(ife->hwaddr, ifr.ifr_hwaddr.sa_data, 8); - diff --git a/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch b/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch deleted file mode 100644 index 7228615..0000000 --- a/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 430ba79c39eeed4725c36e9c2ad61c438c8a5d3e Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Fri, 30 Jul 2010 06:21:21 +0200 -Subject: [PATCH 13/19] cttyhack: serial console detection is Linux-specific - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - shell/cttyhack.c | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -Index: busybox-1.17.1/shell/cttyhack.c -=================================================================== ---- busybox-1.17.1.orig/shell/cttyhack.c 2010-08-01 05:38:31.000000000 +0200 -+++ busybox-1.17.1/shell/cttyhack.c 2010-08-01 05:39:26.000000000 +0200 -@@ -6,6 +6,10 @@ - */ - #include "libbb.h" - -+#if !defined(__linux__) && !defined(TIOCGSERIAL) -+# warning cttyhack will not be able to detect a controlling tty on this system -+#endif -+ - /* From */ - struct vt_stat { - unsigned short v_active; /* active vt */ -@@ -59,13 +63,19 @@ - close(fd); - } else { - /* We don't have ctty (or don't have "/dev/tty" node...) */ -- if (ioctl(0, TIOCGSERIAL, &u.sr) == 0) { -+ if (0) {} -+#ifdef TIOCGSERIAL -+ else if (ioctl(0, TIOCGSERIAL, &u.sr) == 0) { - /* this is a serial console */ - sprintf(console + 8, "S%d", u.sr.line); -- } else if (ioctl(0, VT_GETSTATE, &u.vt) == 0) { -+ } -+#endif -+#ifdef __linux__ -+ else if (ioctl(0, VT_GETSTATE, &u.vt) == 0) { - /* this is linux virtual tty */ - sprintf(console + 8, "S%d" + 1, u.vt.v_active); - } -+#endif - if (console[8]) { - fd = xopen(console, O_RDWR); - //bb_error_msg("switching to '%s'", console); -Index: busybox-1.17.1/shell/Config.src -=================================================================== ---- busybox-1.17.1.orig/shell/Config.src 2010-08-01 05:39:44.000000000 +0200 -+++ busybox-1.17.1/shell/Config.src 2010-08-01 05:39:49.000000000 +0200 -@@ -370,7 +370,6 @@ - config CTTYHACK - bool "cttyhack" - default y -- depends on PLATFORM_LINUX - help - One common problem reported on the mailing list is "can't access tty; - job control turned off" error message which typically appears when diff --git a/debian/patches/debian-changes-1:1.17.1-10 b/debian/patches/debian-changes-1:1.17.1-10 deleted file mode 100644 index 6bb43e4..0000000 --- a/debian/patches/debian-changes-1:1.17.1-10 +++ /dev/null @@ -1,70 +0,0 @@ -Description: Upstream changes introduced in version 1:1.17.1-10 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - busybox (1:1.17.1-10) unstable; urgency=low - . - [ Michael Tokarev ] - * tiny build system changes: from main source to build directories: - don't copy .dotfiles, use ln instead of cp - . - [ Joey Hess ] - * Enable sha256sum in udeb, needed by debootstrap to handle Release - files w/o md5sums. - * Did not disable md5sum in udeb because eg anna still uses them to verify - md5sum fields from d-i Packages files. (Those fields are still present.. - for now.) - . - The person named in the Author field signed this changelog entry. -Author: Joey Hess - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- /dev/null -+++ busybox-1.17.1/busybox-1.17.1/.indent.pro -@@ -0,0 +1,33 @@ -+--blank-lines-after-declarations -+--blank-lines-after-procedures -+--break-before-boolean-operator -+--no-blank-lines-after-commas -+--braces-on-if-line -+--braces-on-struct-decl-line -+--comment-indentation25 -+--declaration-comment-column25 -+--no-comment-delimiters-on-blank-lines -+--cuddle-else -+--continuation-indentation4 -+--case-indentation0 -+--else-endif-column33 -+--space-after-cast -+--line-comments-indentation0 -+--declaration-indentation1 -+--dont-format-first-column-comments -+--dont-format-comments -+--honour-newlines -+--indent-level4 -+/* changed from 0 to 4 */ -+--parameter-indentation4 -+--line-length78 /* changed from 75 */ -+--continue-at-parentheses -+--no-space-after-function-call-names -+--dont-break-procedure-type -+--dont-star-comments -+--leave-optional-blank-lines -+--dont-space-special-semicolon -+--tab-size4 -+/* additions by Mark */ -+--case-brace-indentation0 -+--leave-preprocessor-space diff --git a/debian/patches/doc-man-name.patch b/debian/patches/doc-man-name.patch deleted file mode 100644 index d793c35..0000000 --- a/debian/patches/doc-man-name.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/Makefile.custom -+++ b/Makefile.custom -@@ -107,7 +107,7 @@ - - # Documentation Targets - .PHONY: doc --doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html -+doc: docs/busybox.pod docs/BusyBox.txt docs/busybox.1 docs/BusyBox.html - - # FIXME: Doesn't belong here - cmd_doc = -@@ -134,10 +134,10 @@ - $(Q)-mkdir -p docs - $(Q)-pod2text $< > $@ - --docs/BusyBox.1: docs/busybox.pod -+docs/busybox.1: docs/busybox.pod - $(disp_doc) - $(Q)-mkdir -p docs -- $(Q)-pod2man --center=BusyBox --release="version $(KERNELVERSION)" $< > $@ -+ $(Q)-pod2man --center=busybox --release="version $(KERNELVERSION)" $< > $@ - - docs/BusyBox.html: docs/busybox.net/BusyBox.html - $(disp_doc) diff --git a/debian/patches/init-console-CRTSCTS.patch b/debian/patches/init-console-CRTSCTS.patch deleted file mode 100644 index ddc06fb..0000000 --- a/debian/patches/init-console-CRTSCTS.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/init/init.c.original 2010-10-17 20:12:02.000000000 +0200 -+++ b/init/init.c 2010-10-17 20:12:17.000000000 +0200 -@@ -232,7 +232,11 @@ - #endif - - /* Make it be sane */ -- tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD; -+ tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD -+#ifdef CRTSCTS -+ | CRTSCTS -+#endif -+ ; - tty.c_cflag |= CREAD | HUPCL | CLOCAL; - - /* input modes */ diff --git a/debian/patches/init-console.patch b/debian/patches/init-console.patch deleted file mode 100644 index 6845950..0000000 --- a/debian/patches/init-console.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/init/init.c -+++ b/init/init.c -@@ -441,6 +441,8 @@ - for (a = init_action_list; a; a = a->next) { - if (!(a->action_type & action_type)) - continue; -+ if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) -+ continue; - - if (a->action_type & (SYSINIT | WAIT | ONCE | CTRLALTDEL | SHUTDOWN)) { - pid_t pid = run(a); diff --git a/debian/patches/init-halt-portability-improvements.patch b/debian/patches/init-halt-portability-improvements.patch deleted file mode 100644 index 94618c3..0000000 --- a/debian/patches/init-halt-portability-improvements.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 714674e4da3d92c5dd14e00ab30794a895b91eb4 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:38:44 +0200 -Subject: [PATCH 4/9] init,halt: portability improvements - -* make init and halt use the same RB_* constants for reboot() -* conditionalize the Linux-specific code - -Inspired by init.init.diff from the Debian kFreeBSD patches at: -http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.14/debian - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - init/Config.src | 2 -- - init/halt.c | 14 +------------- - init/init.c | 16 ++++++++-------- - init/reboot.h | 31 +++++++++++++++++++++++++++++++ - 4 files changed, 40 insertions(+), 23 deletions(-) - create mode 100644 init/reboot.h - -Index: busybox-1.17.1/init/Config.src -=================================================================== ---- busybox-1.17.1.orig/init/Config.src 2010-08-01 05:32:43.000000000 +0200 -+++ busybox-1.17.1/init/Config.src 2010-08-01 05:36:47.000000000 +0200 -@@ -10,7 +10,6 @@ - config INIT - bool "init" - default y -- depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - init is the first program run when the system boots. -@@ -93,7 +92,6 @@ - config HALT - bool "poweroff, halt, and reboot" - default y -- depends on PLATFORM_LINUX - help - Stop all processes and either halt, reboot, or power off the system. - -Index: busybox-1.17.1/init/halt.c -=================================================================== ---- busybox-1.17.1.orig/init/halt.c 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/init/halt.c 2010-08-01 05:36:47.000000000 +0200 -@@ -8,7 +8,7 @@ - */ - - #include "libbb.h" --#include -+#include "reboot.h" - - #if ENABLE_FEATURE_WTMP - #include -@@ -36,18 +36,6 @@ - #define write_wtmp() ((void)0) - #endif - --#ifndef RB_HALT_SYSTEM --#define RB_HALT_SYSTEM RB_HALT --#endif -- --#ifndef RB_POWERDOWN --/* Stop system and switch power off if possible. */ --# define RB_POWERDOWN 0x4321fedc --#endif --#ifndef RB_POWER_OFF --# define RB_POWER_OFF RB_POWERDOWN --#endif -- - - int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int halt_main(int argc UNUSED_PARAM, char **argv) -Index: busybox-1.17.1/init/init.c -=================================================================== ---- busybox-1.17.1.orig/init/init.c 2010-08-01 05:36:45.000000000 +0200 -+++ busybox-1.17.1/init/init.c 2010-08-01 05:36:47.000000000 +0200 -@@ -12,7 +12,6 @@ - #include "libbb.h" - #include - #include --#include - #include - #ifdef __linux__ - #include -@@ -20,6 +19,7 @@ - #if ENABLE_FEATURE_UTMP - # include /* DEAD_PROCESS */ - #endif -+#include "reboot.h" /* reboot() constants */ - - /* Used only for sanitizing purposes in set_sane_term() below. On systems where - * the baud rate is stored in a separate field, we can safely disable them. */ -@@ -97,13 +97,6 @@ - enum { - L_LOG = 0x1, - L_CONSOLE = 0x2, --#ifndef RB_HALT_SYSTEM -- RB_HALT_SYSTEM = 0xcdef0123, /* FIXME: this overflows enum */ -- RB_ENABLE_CAD = 0x89abcdef, -- RB_DISABLE_CAD = 0, -- RB_POWER_OFF = 0x4321fedc, -- RB_AUTOBOOT = 0x01234567, --#endif - }; - - /* Print a message to the specified device. -@@ -726,10 +719,12 @@ - - run_shutdown_and_kill_processes(); - -+#ifdef RB_ENABLE_CAD - /* Allow Ctrl-Alt-Del to reboot the system. - * This is how kernel sets it up for init, we follow suit. - */ - reboot(RB_ENABLE_CAD); /* misnomer */ -+#endif - - if (open_stdio_to_tty(a->terminal)) { - dbg_message(L_CONSOLE, "Trying to re-exec %s", a->command); -@@ -872,9 +867,11 @@ - ) { - bb_show_usage(); - } -+#ifdef RB_DISABLE_CAD - /* Turn off rebooting via CTL-ALT-DEL - we get a - * SIGINT on CAD so we can shut things down gracefully... */ - reboot(RB_DISABLE_CAD); /* misnomer */ -+#endif - } - - /* Figure out where the default console should be */ -@@ -897,6 +894,8 @@ - message(L_CONSOLE | L_LOG, "init started: %s", bb_banner); - #endif - -+/* struct sysinfo is linux-specific */ -+#ifdef __linux__ - /* Make sure there is enough memory to do something useful. */ - if (ENABLE_SWAPONOFF) { - struct sysinfo info; -@@ -912,6 +911,7 @@ - run_actions(SYSINIT); /* wait and removing */ - } - } -+#endif - - /* Check if we are supposed to be in single user mode */ - if (argv[1] -Index: busybox-1.17.1/init/reboot.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ busybox-1.17.1/init/reboot.h 2010-08-01 05:36:47.000000000 +0200 -@@ -0,0 +1,31 @@ -+/* -+ * Definitions related to the reboot() system call, -+ * shared between init.c and halt.c. -+ */ -+ -+#include -+ -+#ifndef RB_HALT_SYSTEM -+# if defined(__linux__) -+# define RB_HALT_SYSTEM 0xcdef0123 -+# define RB_ENABLE_CAD 0x89abcdef -+# define RB_DISABLE_CAD 0 -+# define RB_POWER_OFF 0x4321fedc -+# define RB_AUTOBOOT 0x01234567 -+# elif defined(RB_HALT) -+# define RB_HALT_SYSTEM RB_HALT -+# endif -+#endif -+ -+/* Stop system and switch power off if possible. */ -+#ifndef RB_POWER_OFF -+# if defined(RB_POWERDOWN) -+# define RB_POWER_OFF RB_POWERDOWN -+# elif defined(__linux__) -+# define RB_POWER_OFF 0x4321fedc -+# else -+# warning "poweroff unsupported, using halt as fallback" -+# define RB_POWER_OFF RB_HALT_SYSTEM -+# endif -+#endif -+ diff --git a/debian/patches/init-loginutils-termios-portability-fixes.patch b/debian/patches/init-loginutils-termios-portability-fixes.patch deleted file mode 100644 index c612263..0000000 --- a/debian/patches/init-loginutils-termios-portability-fixes.patch +++ /dev/null @@ -1,199 +0,0 @@ -From f812eace1863feeac64dc8af27f4ab0f98119618 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:37:32 +0200 -Subject: [PATCH 3/9] init,loginutils: termios portability fixes - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - init/init.c | 17 ++++++++++++++++- - loginutils/Config.src | 2 -- - loginutils/getty.c | 27 ++++++++++++++------------- - loginutils/login.c | 2 +- - 4 files changed, 31 insertions(+), 17 deletions(-) - -diff --git a/init/init.c b/init/init.c -index 2eb8f1a..1388c75 100644 ---- a/init/init.c -+++ b/init/init.c -@@ -14,11 +14,19 @@ - #include - #include - #include -+#ifdef __linux__ - #include -+#endif - #if ENABLE_FEATURE_UTMP - # include /* DEAD_PROCESS */ - #endif - -+/* Used only for sanitizing purposes in set_sane_term() below. On systems where -+ * the baud rate is stored in a separate field, we can safely disable them. */ -+#ifndef CBAUD -+# define CBAUD 0 -+# define CBAUDEX 0 -+#endif - - /* Was a CONFIG_xxx option. A lot of people were building - * not fully functional init by switching it on! */ -@@ -166,7 +174,9 @@ static void message(int where, const char *fmt, ...) - - static void console_init(void) - { -+#ifdef VT_OPENQRY - int vtno; -+#endif - char *s; - - s = getenv("CONSOLE"); -@@ -190,6 +200,7 @@ static void console_init(void) - } - - s = getenv("TERM"); -+#ifdef VT_OPENQRY - if (ioctl(STDIN_FILENO, VT_OPENQRY, &vtno) != 0) { - /* Not a linux terminal, probably serial console. - * Force the TERM setting to vt102 -@@ -198,7 +209,9 @@ static void console_init(void) - putenv((char*)"TERM=vt102"); - if (!ENABLE_FEATURE_INIT_SYSLOG) - log_console = NULL; -- } else if (!s) -+ } else -+#endif -+ if (!s) - putenv((char*)"TERM=linux"); - } - -@@ -220,8 +233,10 @@ static void set_sane_term(void) - tty.c_cc[VSTOP] = 19; /* C-s */ - tty.c_cc[VSUSP] = 26; /* C-z */ - -+#ifdef __linux__ - /* use line discipline 0 */ - tty.c_line = 0; -+#endif - - /* Make it be sane */ - tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD; -diff --git a/loginutils/Config.src b/loginutils/Config.src -index 425d041..6ec2893 100644 ---- a/loginutils/Config.src -+++ b/loginutils/Config.src -@@ -179,7 +179,6 @@ config DELUSER - config GETTY - bool "getty" - default y -- depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - getty lets you log in on a tty, it is normally invoked by init. -@@ -187,7 +186,6 @@ config GETTY - config LOGIN - bool "login" - default y -- depends on PLATFORM_LINUX - select FEATURE_SUID - select FEATURE_SYSLOG - help -diff --git a/loginutils/getty.c b/loginutils/getty.c -index a5e8e90..7f04d33 100644 ---- a/loginutils/getty.c -+++ b/loginutils/getty.c -@@ -282,10 +282,8 @@ static void termios_init(struct termios *tp, int speed, struct options *op) - * reads will be done in raw mode anyway. Errors will be dealt with - * later on. - */ --#ifdef __linux__ - /* flush input and output queues, important for modems! */ -- ioctl(0, TCFLSH, TCIOFLUSH); /* tcflush(0, TCIOFLUSH)? - same */ --#endif -+ tcflush(0, TCIOFLUSH); - ispeed = ospeed = speed; - if (speed == B0) { - /* Speed was specified as "0" on command line. -@@ -299,10 +297,13 @@ static void termios_init(struct termios *tp, int speed, struct options *op) - cfsetispeed(tp, ispeed); - cfsetospeed(tp, ospeed); - -- tp->c_iflag = tp->c_lflag = tp->c_line = 0; -+ tp->c_iflag = tp->c_lflag = 0; - tp->c_oflag = OPOST | ONLCR; - tp->c_cc[VMIN] = 1; - tp->c_cc[VTIME] = 0; -+#ifdef __linux__ -+ tp->c_line = 0; -+#endif - - /* Optionally enable hardware flow control */ - #ifdef CRTSCTS -@@ -360,10 +361,8 @@ static void auto_baud(char *buf, unsigned size_buf, struct termios *tp) - for (bp = buf; bp < buf + nread; bp++) { - if (isdigit(*bp)) { - speed = bcode(bp); -- if (speed > 0) { -- tp->c_cflag &= ~CBAUD; -- tp->c_cflag |= speed; -- } -+ if (speed > 0) -+ cfsetspeed(tp, speed); - break; - } - } -@@ -417,7 +416,7 @@ static char *get_logname(char *logname, unsigned size_logname, - - /* Flush pending input (esp. after parsing or switching the baud rate). */ - sleep(1); -- ioctl(0, TCFLSH, TCIFLUSH); /* tcflush(0, TCIOFLUSH)? - same */ -+ tcflush(0, TCIOFLUSH); - - /* Prompt for and read a login name. */ - logname[0] = '\0'; -@@ -526,7 +525,9 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat - tp->c_cc[VQUIT] = DEF_QUIT; /* default quit */ - tp->c_cc[VEOF] = DEF_EOF; /* default EOF character */ - tp->c_cc[VEOL] = DEF_EOL; -+#ifdef VSWTC - tp->c_cc[VSWTC] = DEF_SWITCH; /* default switch character */ -+#endif - - /* Account for special characters seen in input. */ - if (cp->eol == CR) { -@@ -572,8 +573,8 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat - #endif - - /* Finally, make the new settings effective */ -- /* It's tcsetattr_stdin_TCSANOW() + error check */ -- ioctl_or_perror_and_die(0, TCSETS, tp, "%s: TCSETS", op->tty); -+ if (tcsetattr_stdin_TCSANOW(tp) < 0) -+ bb_perror_msg_and_die("%s: tcsetattr", op->tty); - } - - int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -@@ -650,8 +651,8 @@ int getty_main(int argc UNUSED_PARAM, char **argv) - * by patching the SunOS kernel variable "zsadtrlow" to a larger value; - * 5 seconds seems to be a good value. - */ -- /* tcgetattr() + error check */ -- ioctl_or_perror_and_die(0, TCGETS, &termios, "%s: TCGETS", options.tty); -+ if (tcgetattr(0, &termios) < 0) -+ bb_perror_msg_and_die("%s: tcgetattr", options.tty); - - pid = getpid(); - #ifdef __linux__ -diff --git a/loginutils/login.c b/loginutils/login.c -index 88ed0af..1001248 100644 ---- a/loginutils/login.c -+++ b/loginutils/login.c -@@ -264,7 +264,7 @@ int login_main(int argc UNUSED_PARAM, char **argv) - - while (1) { - /* flush away any type-ahead (as getty does) */ -- ioctl(0, TCFLSH, TCIFLUSH); -+ tcflush(0, TCIFLUSH); - - if (!username[0]) - get_username_or_die(username, sizeof(username)); --- -1.7.1 - diff --git a/debian/patches/init-make-the-initial-TERM-value-configurable.patch b/debian/patches/init-make-the-initial-TERM-value-configurable.patch deleted file mode 100644 index fb04a1e..0000000 --- a/debian/patches/init-make-the-initial-TERM-value-configurable.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1c05303fdc302725093294eb0305adc003d52bcb Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:46:07 +0200 -Subject: [PATCH 5/9] init: make the initial $TERM value configurable - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - init/Config.src | 12 ++++++++++++ - init/init.c | 2 +- - 2 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/init/Config.src b/init/Config.src -index 590e298..2cac357 100644 ---- a/init/Config.src -+++ b/init/Config.src -@@ -89,6 +89,18 @@ config FEATURE_INITRD - This does not apply to initramfs, which runs /init as PID 1 and - requires no special support. - -+config INIT_TERMINAL_TYPE -+ string "Initial terminal type" -+ default "linux" -+ depends on INIT -+ help -+ This is the initial value set by init for the TERM environment -+ variable. This variable is used by programs which make use of -+ extended terminal capabilities. -+ -+ Note that on Linux, init attempts to detect serial terminal and -+ sets TERM to "vt102" if one is found. -+ - config HALT - bool "poweroff, halt, and reboot" - default y -diff --git a/init/init.c b/init/init.c -index d8bf158..fa1af6d 100644 ---- a/init/init.c -+++ b/init/init.c -@@ -205,7 +205,7 @@ static void console_init(void) - } else - #endif - if (!s) -- putenv((char*)"TERM=linux"); -+ putenv((char*)"TERM=" CONFIG_INIT_TERMINAL_TYPE); - } - - /* Set terminal settings to reasonable defaults. --- -1.7.1 - diff --git a/debian/patches/klogd-make-it-work-on-non-linux-systems.patch b/debian/patches/klogd-make-it-work-on-non-linux-systems.patch deleted file mode 100644 index 033617f..0000000 --- a/debian/patches/klogd-make-it-work-on-non-linux-systems.patch +++ /dev/null @@ -1,246 +0,0 @@ -From 63c2e7ecc0c7a72b2ed35475a8d18d3052039ce4 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Sun, 1 Aug 2010 03:01:44 +0200 -Subject: [PATCH 1/2] klogd: make it work on non-linux systems - -The klogctl() interface allows changing the console loglevel, but is -Linux-specific. The more portable method of reading from _PATH_KLOG is -added as an alternative. - -Adapted from the Debian kFreeBSD patch at: -http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.14/debian/klogd.diff - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - sysklogd/Config.src | 17 ++++++- - sysklogd/klogd.c | 128 +++++++++++++++++++++++++++++++++++++++++++------- - 2 files changed, 126 insertions(+), 19 deletions(-) - -diff --git a/sysklogd/Config.src b/sysklogd/Config.src -index 41c0d28..1e59872 100644 ---- a/sysklogd/Config.src -+++ b/sysklogd/Config.src -@@ -109,7 +109,6 @@ config FEATURE_LOGREAD_REDUCED_LOCKING - config KLOGD - bool "klogd" - default y -- depends on PLATFORM_LINUX - help - klogd is a utility which intercepts and logs all - messages from the Linux kernel and sends the messages -@@ -117,6 +116,22 @@ config KLOGD - you wish to record the messages produced by the kernel, - you should enable this option. - -+config FEATURE_KLOGD_KLOGCTL -+ bool "Use the klogctl() interface" -+ default y -+ depends on KLOGD && PLATFORM_LINUX -+ help -+ The klogd applet supports two interfaces for reading -+ kernel messages. Linux provides the klogctl() interface -+ which allows reading messages from the kernel ring buffer -+ independently from the file system. -+ -+ If you answer 'N' here, klogd will use the more portable -+ approach of reading them from /proc or a device node. -+ However, this method requires the file to be available. -+ -+ If in doubt, say 'Y'. -+ - config LOGGER - bool "logger" - default y -diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c -index c54e80a..3468656 100644 ---- a/sysklogd/klogd.c -+++ b/sysklogd/klogd.c -@@ -4,7 +4,7 @@ - * - * Copyright (C) 2001 by Gennady Feldman . - * Changes: Made this a standalone busybox module which uses standalone -- * syslog() client interface. -+ * syslog() client interface. - * - * Copyright (C) 1999-2004 by Erik Andersen - * -@@ -19,18 +19,93 @@ - - #include "libbb.h" - #include --#include - --static void klogd_signal(int sig) -+ -+/* The Linux-specific klogctl(3) interface does not rely on the filesystem and -+ * allows us to change the console loglevel. Alternatively, we read the -+ * messages from _PATH_KLOG. */ -+ -+#if ENABLE_FEATURE_KLOGD_KLOGCTL -+ -+# include -+ -+static void klogd_open(void) -+{ -+ /* "Open the log. Currently a NOP" */ -+ klogctl(1, NULL, 0); -+} -+ -+static void klogd_setloglevel(int lvl) -+{ -+ /* "printk() prints a message on the console only if it has a loglevel -+ * less than console_loglevel". Here we set console_loglevel = lvl. */ -+ klogctl(8, NULL, lvl); -+} -+ -+static int klogd_read(char *bufp, int len) -+{ -+ return klogctl(2, bufp, len); -+} -+# define READ_ERROR "klogctl(2) error" -+ -+static void klogd_close(void) - { - /* FYI: cmd 7 is equivalent to setting console_loglevel to 7 - * via klogctl(8, NULL, 7). */ - klogctl(7, NULL, 0); /* "7 -- Enable printk's to console" */ - klogctl(0, NULL, 0); /* "0 -- Close the log. Currently a NOP" */ -- syslog(LOG_NOTICE, "klogd: exiting"); -- kill_myself_with_sig(sig); - } - -+#else -+ -+# include -+# ifndef _PATH_KLOG -+# ifdef __GNU__ -+# define _PATH_KLOG "/dev/klog" -+# else -+# error "your system's _PATH_KLOG is unknown" -+# endif -+# endif -+# define PATH_PRINTK "/proc/sys/kernel/printk" -+ -+enum { klogfd = 3 }; -+ -+static void klogd_open(void) -+{ -+ int fd = xopen(_PATH_KLOG, O_RDONLY); -+ xmove_fd(fd, klogfd); -+} -+ -+static void klogd_setloglevel(int lvl) -+{ -+ FILE *fp = fopen_or_warn(PATH_PRINTK, "w"); -+ if (fp) { -+ /* This changes only first value: -+ * "messages with a higher priority than this -+ * [that is, with numerically lower value] -+ * will be printed to the console". -+ * The other three values in this pseudo-file aren't changed. -+ */ -+ fprintf(fp, "%u\n", lvl); -+ fclose(fp); -+ } -+} -+ -+static int klogd_read(char *bufp, int len) -+{ -+ return read(klogfd, bufp, len); -+} -+# define READ_ERROR "read error" -+ -+static void klogd_close(void) -+{ -+ klogd_setloglevel(7); -+ if (ENABLE_FEATURE_CLEAN_UP) -+ close(klogfd); -+} -+ -+#endif -+ - #define log_buffer bb_common_bufsiz1 - enum { - KLOGD_LOGBUF_SIZE = sizeof(log_buffer), -@@ -38,6 +113,19 @@ enum { - OPT_FOREGROUND = (1 << 1), - }; - -+/* TODO: glibc openlog(LOG_KERN) reverts to LOG_USER instead, -+ * because that's how they interpret word "default" -+ * in the openlog() manpage: -+ * LOG_USER (default) -+ * generic user-level messages -+ * and the fact that LOG_KERN is a constant 0. -+ * glibc interprets it as "0 in openlog() call means 'use default'". -+ * I think it means "if openlog wasn't called before syslog() is called, -+ * use default". -+ * Convincing glibc maintainers otherwise is, as usual, nearly impossible. -+ * Should we open-code syslog() here to use correct facility? -+ */ -+ - int klogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int klogd_main(int argc UNUSED_PARAM, char **argv) - { -@@ -55,34 +143,34 @@ int klogd_main(int argc UNUSED_PARAM, char **argv) - bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); - } - -- openlog("kernel", 0, LOG_KERN); -- -- bb_signals(BB_FATAL_SIGS, klogd_signal); -- signal(SIGHUP, SIG_IGN); -+ logmode = LOGMODE_SYSLOG; - -- /* "Open the log. Currently a NOP" */ -- klogctl(1, NULL, 0); -+ /* klogd_open() before openlog(), since it might use fixed fd 3, -+ * and openlog() also may use the same fd 3 if we swap them: -+ */ -+ klogd_open(); -+ openlog("kernel", 0, LOG_KERN); - -- /* "printk() prints a message on the console only if it has a loglevel -- * less than console_loglevel". Here we set console_loglevel = i. */ - if (i) -- klogctl(8, NULL, i); -+ klogd_setloglevel(i); -+ -+ bb_signals(BB_FATAL_SIGS, record_signo); -+ signal(SIGHUP, SIG_IGN); - - syslog(LOG_NOTICE, "klogd started: %s", bb_banner); - -- while (1) { -+ while (!bb_got_signal) { - int n; - int priority; - char *start; - - /* "2 -- Read from the log." */ - start = log_buffer + used; -- n = klogctl(2, start, KLOGD_LOGBUF_SIZE-1 - used); -+ n = klogd_read(start, KLOGD_LOGBUF_SIZE-1 - used); - if (n < 0) { - if (errno == EINTR) - continue; -- syslog(LOG_ERR, "klogd: error %d in klogctl(2): %m", -- errno); -+ bb_perror_msg(READ_ERROR); - break; - } - start[n] = '\0'; -@@ -131,5 +219,9 @@ int klogd_main(int argc UNUSED_PARAM, char **argv) - } - } - -+ klogd_close(); -+ syslog(LOG_NOTICE, "klogd: exiting"); -+ if (bb_got_signal) -+ kill_myself_with_sig(bb_got_signal); - return EXIT_FAILURE; - } --- -1.7.1 - diff --git a/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch b/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch deleted file mode 100644 index 5bec32f..0000000 --- a/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5a71fb82025d8bbb87a2d0a0851cb4c9cc31e888 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 29 Jul 2010 04:29:47 +0200 -Subject: [PATCH 10/12] less: remove misguided dependency on PLATFORM_LINUX - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - miscutils/Config.src | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -Index: busybox-1.17.1/miscutils/Config.src -=================================================================== ---- busybox-1.17.1.orig/miscutils/Config.src 2010-08-01 07:33:11.000000000 +0200 -+++ busybox-1.17.1/miscutils/Config.src 2010-08-02 00:45:01.000000000 +0200 -@@ -351,11 +351,6 @@ - config LESS - bool "less" - default y -- depends on PLATFORM_LINUX -- depends on PLATFORM_LINUX -- depends on PLATFORM_LINUX -- depends on PLATFORM_LINUX -- depends on PLATFORM_LINUX - help - 'less' is a pager, meaning that it displays text files. It possesses - a wide array of features, and is an improvement over 'more'. diff --git a/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch b/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch deleted file mode 100644 index 73c9c32..0000000 --- a/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 29885114a5e3d22ee7aa3ab0e373e00e7cff443c Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:39:24 +0200 -Subject: [PATCH 8/9] libbb: conditionalize AF_* usage in error reporting - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - libbb/xfuncs_printf.c | 4 ++++ - networking/Config.src | 1 - - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c -index 7069a7c..91f7ba2 100644 ---- a/libbb/xfuncs_printf.c -+++ b/libbb/xfuncs_printf.c -@@ -387,8 +387,12 @@ int FAST_FUNC xsocket(int domain, int type, int protocol) - /* Hijack vaguely related config option */ - #if ENABLE_VERBOSE_RESOLUTION_ERRORS - const char *s = "INET"; -+# ifdef AF_PACKET - if (domain == AF_PACKET) s = "PACKET"; -+# endif -+# ifdef AF_NETLINK - if (domain == AF_NETLINK) s = "NETLINK"; -+# endif - IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";) - bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol); - #else -diff --git a/networking/Config.src b/networking/Config.src -index 26c59e7..fc613e8 100644 ---- a/networking/Config.src -+++ b/networking/Config.src -@@ -43,7 +43,6 @@ config FEATURE_PREFER_IPV4_ADDRESS - config VERBOSE_RESOLUTION_ERRORS - bool "Verbose resolution errors" - default n -- depends on PLATFORM_LINUX #because of xsocket() in libbb/xfuncs_prinf.c - help - Enable if you are not satisfied with simplistic - "can't resolve 'hostname.com'" and want to know more. --- -1.7.1 - diff --git a/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch b/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch deleted file mode 100644 index 91ac9bf..0000000 --- a/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 816ed971e4ce60564f7ecbdc016d268d8e936230 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:46:29 +0200 -Subject: [PATCH 6/9] libbb.h: add device names for Hurd and FreeBSD - -Adapted from include.libbb.diff from the Debian kFreeBSD people: -http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.14/debian - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - include/libbb.h | 26 +++++++++++++++++++++----- - 1 files changed, 21 insertions(+), 5 deletions(-) - -Index: busybox-1.17.1/include/libbb.h -=================================================================== ---- busybox-1.17.1.orig/include/libbb.h 2010-08-01 05:24:36.000000000 +0200 -+++ busybox-1.17.1/include/libbb.h 2010-08-01 05:36:59.000000000 +0200 -@@ -1614,7 +1614,27 @@ - /* "sh" */ - #define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6) - --#if ENABLE_FEATURE_DEVFS -+/* The following devices are the same on all systems. */ -+#define CURRENT_TTY "/dev/tty" -+#define DEV_CONSOLE "/dev/console" -+ -+#if defined(__FreeBSD_kernel__) -+# define CURRENT_VC CURRENT_TTY -+# define VC_1 "/dev/ttyv0" -+# define VC_2 "/dev/ttyv1" -+# define VC_3 "/dev/ttyv2" -+# define VC_4 "/dev/ttyv3" -+# define VC_5 "/dev/ttyv4" -+# define VC_FORMAT "/dev/ttyv%d" -+#elif defined(__GNU__) -+# define CURRENT_VC CURRENT_TTY -+# define VC_1 "/dev/tty1" -+# define VC_2 "/dev/tty2" -+# define VC_3 "/dev/tty3" -+# define VC_4 "/dev/tty4" -+# define VC_5 "/dev/tty5" -+# define VC_FORMAT "/dev/tty%d" -+#elif ENABLE_FEATURE_DEVFS /* from now on, assume Linux naming */ - # define CURRENT_VC "/dev/vc/0" - # define VC_1 "/dev/vc/1" - # define VC_2 "/dev/vc/2" -@@ -1661,10 +1681,6 @@ - # define FB_0 "/dev/fb0" - #endif - --/* The following devices are the same on devfs and non-devfs systems. */ --#define CURRENT_TTY "/dev/tty" --#define DEV_CONSOLE "/dev/console" -- - - #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) - diff --git a/debian/patches/make_gen_build_files_skip_quilt.patch b/debian/patches/make_gen_build_files_skip_quilt.patch deleted file mode 100644 index d654468..0000000 --- a/debian/patches/make_gen_build_files_skip_quilt.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: busybox-1.17.1/scripts/gen_build_files.sh -=================================================================== ---- busybox-1.17.1.orig/scripts/gen_build_files.sh 2010-08-01 07:28:13.000000000 +0200 -+++ busybox-1.17.1/scripts/gen_build_files.sh 2010-08-01 07:31:03.000000000 +0200 -@@ -48,7 +48,7 @@ - fi - - # (Re)generate */Kbuild and */Config.in --{ cd -- "$srctree" && find -type d; } | while read -r d; do -+{ cd -- "$srctree" && find -name .\?\* -prune -or -type d -print; } | while read -r d; do - d="${d#./}" - - src="$srctree/$d/Kbuild.src" diff --git a/debian/patches/make_unicode_printable.patch b/debian/patches/make_unicode_printable.patch deleted file mode 100644 index b62ed6f..0000000 --- a/debian/patches/make_unicode_printable.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libbb/printable_string.c b/libbb/printable_string.c -index 83a4821..8a62725 100644 ---- a/libbb/printable_string.c -+++ b/libbb/printable_string.c -@@ -31,8 +31,8 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str) - } - if (c < ' ') - break; -- if (c >= 0x7f) -- break; -+ /* if (c >= 0x7f) */ -+ /* break; */ - s++; - } - -@@ -45,7 +45,8 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str) - unsigned char c = *d; - if (c == '\0') - break; -- if (c < ' ' || c >= 0x7f) -+ /* if (c < ' ' || c >= 0x7f) */ -+ if (c < ' ') - *d = '?'; - d++; - } diff --git a/debian/patches/mark-Linux-specific-configuration-options.patch b/debian/patches/mark-Linux-specific-configuration-options.patch deleted file mode 100644 index 8f89c3e..0000000 --- a/debian/patches/mark-Linux-specific-configuration-options.patch +++ /dev/null @@ -1,915 +0,0 @@ -From 1d7266d3b59be361763dab61f680103bbb70f3e9 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Mon, 19 Jul 2010 00:44:56 +0200 -Subject: [PATCH 2/9] mark Linux-specific configuration options - -PLATFORM_LINUX is used as a dependency for applets or features -which require Linux-specific interfaces. - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - Config.in | 12 ++++++++++++ - console-tools/Config.src | 13 +++++++++++++ - coreutils/Config.src | 2 ++ - coreutils/date.c | 2 +- - e2fsprogs/Config.src | 1 + - init/Config.src | 2 ++ - init/bootchartd.c | 1 + - libbb/Config.src | 1 + - loginutils/Config.src | 3 +++ - miscutils/Config.src | 19 ++++++++++++++++++- - miscutils/conspy.c | 1 + - miscutils/ubi_attach_detach.c | 2 ++ - modutils/Config.src | 1 + - networking/Config.src | 23 ++++++++++++++++++++++- - networking/udhcp/Config.src | 2 ++ - procps/Config.src | 4 +++- - shell/cttyhack.c | 1 + - sysklogd/Config.src | 1 + - util-linux/Config.src | 27 +++++++++++++++++++++++++++ - 19 files changed, 114 insertions(+), 4 deletions(-) - -Index: busybox-1.17.1/Config.in -=================================================================== ---- busybox-1.17.1.orig/Config.in 2010-08-01 05:24:36.000000000 +0200 -+++ busybox-1.17.1/Config.in 2010-08-01 05:32:43.000000000 +0200 -@@ -47,6 +47,17 @@ - compiler other than gcc. - If you do use gcc, this option may needlessly increase code size. - -+config PLATFORM_LINUX -+ bool "Enable Linux-specific applets and features" -+ default y -+ help -+ For the most part, busybox requires only POSIX compatibility -+ from the target system, but some applets and features use -+ Linux-specific interfaces. -+ -+ Answering 'N' here will disable such applets and hide the -+ corresponding configuration options. -+ - choice - prompt "Buffer allocation policy" - default FEATURE_BUFFERS_USE_MALLOC -@@ -353,6 +364,7 @@ - config SELINUX - bool "Support NSA Security Enhanced Linux" - default n -+ depends on PLATFORM_LINUX - help - Enable support for SELinux in applets ls, ps, and id. Also provide - the option of compiling in SELinux applets. -Index: busybox-1.17.1/console-tools/Config.src -=================================================================== ---- busybox-1.17.1.orig/console-tools/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/console-tools/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -10,6 +10,7 @@ - config CHVT - bool "chvt" - default y -+ depends on PLATFORM_LINUX - help - This program is used to change to another terminal. - Example: chvt 4 (change to terminal /dev/tty4) -@@ -17,6 +18,7 @@ - config FGCONSOLE - bool "fgconsole" - default y -+ depends on PLATFORM_LINUX - help - This program prints active (foreground) console number. - -@@ -29,12 +31,14 @@ - config DEALLOCVT - bool "deallocvt" - default y -+ depends on PLATFORM_LINUX - help - This program deallocates unused virtual consoles. - - config DUMPKMAP - bool "dumpkmap" - default y -+ depends on PLATFORM_LINUX - help - This program dumps the kernel's keyboard translation table to - stdout, in binary format. You can then use loadkmap to load it. -@@ -42,18 +46,21 @@ - config KBD_MODE - bool "kbd_mode" - default y -+ depends on PLATFORM_LINUX - help - This program reports and sets keyboard mode. - - config LOADFONT - bool "loadfont" - default y -+ depends on PLATFORM_LINUX - help - This program loads a console font from standard input. - - config LOADKMAP - bool "loadkmap" - default y -+ depends on PLATFORM_LINUX - help - This program loads a keyboard translation table from - standard input. -@@ -61,6 +68,7 @@ - config OPENVT - bool "openvt" - default y -+ depends on PLATFORM_LINUX - help - This program is used to start a command on an unused - virtual terminal. -@@ -92,6 +100,7 @@ - config SETCONSOLE - bool "setconsole" - default y -+ depends on PLATFORM_LINUX - help - This program redirects the system console to another device, - like the current tty while logged in via telnet. -@@ -106,6 +115,7 @@ - config SETFONT - bool "setfont" - default y -+ depends on PLATFORM_LINUX - help - Allows to load console screen map. Useful for i18n. - -@@ -127,6 +137,7 @@ - config SETKEYCODES - bool "setkeycodes" - default y -+ depends on PLATFORM_LINUX - help - This program loads entries into the kernel's scancode-to-keycode - map, allowing unusual keyboards to generate usable keycodes. -@@ -134,12 +145,14 @@ - config SETLOGCONS - bool "setlogcons" - default y -+ depends on PLATFORM_LINUX - help - This program redirects the output console of kernel messages. - - config SHOWKEY - bool "showkey" - default y -+ depends on PLATFORM_LINUX - help - Shows keys pressed. - -Index: busybox-1.17.1/coreutils/Config.src -=================================================================== ---- busybox-1.17.1.orig/coreutils/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/coreutils/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -591,6 +591,7 @@ - config STAT - bool "stat" - default y -+ depends on PLATFORM_LINUX # statfs() - help - display file or filesystem status. - -@@ -606,6 +607,7 @@ - config STTY - bool "stty" - default y -+ depends on PLATFORM_LINUX - help - stty is used to change and print terminal line settings. - -Index: busybox-1.17.1/coreutils/date.c -=================================================================== ---- busybox-1.17.1.orig/coreutils/date.c 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/coreutils/date.c 2010-08-01 05:32:43.000000000 +0200 -@@ -72,7 +72,7 @@ - //config:config FEATURE_DATE_NANO - //config: bool "Support %[num]N nanosecond format specifier" - //config: default n --//config: depends on DATE -+//config: depends on DATE && PLATFORM_LINUX # syscall(__NR_clock_gettime) - //config: help - //config: Support %[num]N format specifier. Adds ~250 bytes of code. - //config: -Index: busybox-1.17.1/e2fsprogs/Config.src -=================================================================== ---- busybox-1.17.1.orig/e2fsprogs/Config.src 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/e2fsprogs/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -33,6 +33,7 @@ - config LSATTR - bool "lsattr" - default y -+ depends on PLATFORM_LINUX - help - lsattr lists the file attributes on a second extended file system. - -Index: busybox-1.17.1/init/Config.src -=================================================================== ---- busybox-1.17.1.orig/init/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/init/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -10,6 +10,7 @@ - config INIT - bool "init" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - init is the first program run when the system boots. -@@ -92,6 +93,7 @@ - config HALT - bool "poweroff, halt, and reboot" - default y -+ depends on PLATFORM_LINUX - help - Stop all processes and either halt, reboot, or power off the system. - -Index: busybox-1.17.1/init/bootchartd.c -=================================================================== ---- busybox-1.17.1.orig/init/bootchartd.c 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/init/bootchartd.c 2010-08-01 05:32:43.000000000 +0200 -@@ -6,6 +6,7 @@ - //config:config BOOTCHARTD - //config: bool "bootchartd" - //config: default y -+//config: depends on PLATFORM_LINUX - //config: help - //config: bootchartd is commonly used to profile the boot process - //config: for the purpose of speeding it up. In this case, it is started -Index: busybox-1.17.1/libbb/Config.src -=================================================================== ---- busybox-1.17.1.orig/libbb/Config.src 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/libbb/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -153,6 +153,7 @@ - config MONOTONIC_SYSCALL - bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" - default n -+ depends on PLATFORM_LINUX - help - Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring - time intervals (time, ping, traceroute etc need this). -Index: busybox-1.17.1/loginutils/Config.src -=================================================================== ---- busybox-1.17.1.orig/loginutils/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/loginutils/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -179,6 +179,7 @@ - config GETTY - bool "getty" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - getty lets you log in on a tty, it is normally invoked by init. -@@ -186,6 +187,7 @@ - config LOGIN - bool "login" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SUID - select FEATURE_SYSLOG - help -@@ -295,6 +297,7 @@ - config VLOCK - bool "vlock" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SUID - help - Build the "vlock" applet which allows you to lock (virtual) terminals. -Index: busybox-1.17.1/miscutils/Config.src -=================================================================== ---- busybox-1.17.1.orig/miscutils/Config.src 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/miscutils/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -10,6 +10,7 @@ - config ADJTIMEX - bool "adjtimex" - default y -+ depends on PLATFORM_LINUX - help - Adjtimex reads and optionally sets adjustment parameters for - the Linux clock adjustment algorithm. -@@ -24,6 +25,7 @@ - config BEEP - bool "beep" - default y -+ depends on PLATFORM_LINUX - help - The beep applets beeps in a given freq/Hz. - -@@ -180,6 +182,7 @@ - config DEVFSD - bool "devfsd (obsolete)" - default n -+ depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - This is deprecated and should NOT be used anymore. -@@ -223,6 +226,7 @@ - config FEATURE_DEVFS - bool "Use devfs names for all devices (obsolete)" - default n -+ depends on PLATFORM_LINUX - help - This is obsolete and should NOT be used anymore. - Use linux >= 2.6 (optionally with hotplug) and mdev instead! -@@ -242,6 +246,7 @@ - config EJECT - bool "eject" - default y -+ depends on PLATFORM_LINUX - help - Used to eject cdroms. (defaults to /dev/cdrom) - -@@ -256,6 +261,7 @@ - config FBSPLASH - bool "fbsplash" - default y -+ depends on PLATFORM_LINUX - help - Shows splash image and progress bar on framebuffer device. - Can be used during boot phase of an embedded device. ~2kb. -@@ -305,6 +311,7 @@ - config IONICE - bool "ionice" - default y -+ depends on PLATFORM_LINUX - help - Set/set program io scheduling class and priority - Requires kernel >= 2.6.13 -@@ -344,6 +351,11 @@ - config LESS - bool "less" - default y -+ depends on PLATFORM_LINUX -+ depends on PLATFORM_LINUX -+ depends on PLATFORM_LINUX -+ depends on PLATFORM_LINUX -+ depends on PLATFORM_LINUX - help - 'less' is a pager, meaning that it displays text files. It possesses - a wide array of features, and is an improvement over 'more'. -@@ -410,6 +422,7 @@ - config HDPARM - bool "hdparm" - default y -+ depends on PLATFORM_LINUX - help - Get/Set hard drive parameters. Primarily intended for ATA - drives. Adds about 13k (or around 30k if you enable the -@@ -526,6 +539,7 @@ - config RAIDAUTORUN - bool "raidautorun" - default y -+ depends on PLATFORM_LINUX - help - raidautorun tells the kernel md driver to - search and start RAID arrays. -@@ -533,7 +547,7 @@ - config READAHEAD - bool "readahead" - default y -- depends on LFS -+ depends on LFS && PLATFORM_LINUX - help - Preload the files listed on the command line into RAM cache so that - subsequent reads on these files will not block on disk I/O. -@@ -550,6 +564,7 @@ - config RFKILL - bool "rfkill" - default n # doesn't build on Ubuntu 9.04 -+ depends on PLATFORM_LINUX - help - Enable/disable wireless devices. - -@@ -570,6 +585,7 @@ - config RX - bool "rx" - default y -+ depends on PLATFORM_LINUX - help - Receive files using the Xmodem protocol. - -@@ -641,6 +657,7 @@ - config WATCHDOG - bool "watchdog" - default y -+ depends on PLATFORM_LINUX - help - The watchdog utility is used with hardware or software watchdog - device drivers. It opens the specified watchdog device special file -Index: busybox-1.17.1/miscutils/conspy.c -=================================================================== ---- busybox-1.17.1.orig/miscutils/conspy.c 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/miscutils/conspy.c 2010-08-01 05:32:43.000000000 +0200 -@@ -17,6 +17,7 @@ - //config:config CONSPY - //config: bool "conspy" - //config: default n -+//config: depends on PLATFORM_LINUX - //config: help - //config: A text-mode VNC like program for Linux virtual terminals. - //config: example: conspy NUM shared access to console num -Index: busybox-1.17.1/miscutils/ubi_attach_detach.c -=================================================================== ---- busybox-1.17.1.orig/miscutils/ubi_attach_detach.c 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/miscutils/ubi_attach_detach.c 2010-08-01 05:32:43.000000000 +0200 -@@ -12,12 +12,14 @@ - //config:config UBIATTACH - //config: bool "ubiattach" - //config: default n -+//config: depends on PLATFORM_LINUX - //config: help - //config: Attach MTD device to an UBI device. - //config: - //config:config UBIDETACH - //config: bool "ubidetach" - //config: default n -+//config: depends on PLATFORM_LINUX - //config: help - //config: Detach MTD device from an UBI device. - -Index: busybox-1.17.1/modutils/Config.src -=================================================================== ---- busybox-1.17.1.orig/modutils/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/modutils/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -4,6 +4,7 @@ - # - - menu "Linux Module Utilities" -+depends on PLATFORM_LINUX - - INSERT - -Index: busybox-1.17.1/networking/Config.src -=================================================================== ---- busybox-1.17.1.orig/networking/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/networking/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -43,6 +43,7 @@ - config VERBOSE_RESOLUTION_ERRORS - bool "Verbose resolution errors" - default n -+ depends on PLATFORM_LINUX #because of xsocket() in libbb/xfuncs_prinf.c - help - Enable if you are not satisfied with simplistic - "can't resolve 'hostname.com'" and want to know more. -@@ -51,18 +52,21 @@ - config ARP - bool "arp" - default y -+ depends on PLATFORM_LINUX - help - Manipulate the system ARP cache. - - config ARPING - bool "arping" - default y -+ depends on PLATFORM_LINUX - help - Ping hosts by ARP packets. - - config BRCTL - bool "brctl" - default y -+ depends on PLATFORM_LINUX - help - Manage ethernet bridges. - Supports addbr/delbr and addif/delif. -@@ -95,6 +99,7 @@ - config ETHER_WAKE - bool "ether-wake" - default y -+ depends on PLATFORM_LINUX - help - Send a magic packet to wake up sleeping machines. - -@@ -269,6 +274,7 @@ - config IFCONFIG - bool "ifconfig" - default y -+ depends on PLATFORM_LINUX - help - Ifconfig is used to configure the kernel-resident network interfaces. - -@@ -316,6 +322,7 @@ - config IFENSLAVE - bool "ifenslave" - default y -+ depends on PLATFORM_LINUX - help - Userspace application to bind several interfaces - to a logical interface (use with kernel bonding driver). -@@ -323,6 +330,7 @@ - config IFPLUGD - bool "ifplugd" - default y -+ depends on PLATFORM_LINUX - help - Network interface plug detection daemon. - -@@ -364,7 +372,7 @@ - config FEATURE_IFUPDOWN_IP_BUILTIN - bool "Use busybox ip applet" - default y -- depends on FEATURE_IFUPDOWN_IP -+ depends on FEATURE_IFUPDOWN_IP && PLATFORM_LINUX - select IP - select FEATURE_IP_ADDRESS - select FEATURE_IP_LINK -@@ -483,6 +491,7 @@ - config IP - bool "ip" - default y -+ depends on PLATFORM_LINUX - help - The "ip" applet is a TCP/IP interface configuration and routing - utility. You generally don't need "ip" to use busybox with -@@ -598,6 +607,7 @@ - config NAMEIF - bool "nameif" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - nameif is used to rename network interface by its MAC address. -@@ -626,6 +636,7 @@ - config NETSTAT - bool "netstat" - default y -+ depends on PLATFORM_LINUX - help - netstat prints information about the Linux networking subsystem. - -@@ -654,6 +665,7 @@ - config NTPD - bool "ntpd" - default y -+ depends on PLATFORM_LINUX - help - The NTP client/server daemon. - -@@ -668,6 +680,7 @@ - config PING - bool "ping" - default y -+ depends on PLATFORM_LINUX - help - ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to - elicit an ICMP ECHO_RESPONSE from a host or gateway. -@@ -696,12 +709,14 @@ - config ROUTE - bool "route" - default y -+ depends on PLATFORM_LINUX - help - Route displays or manipulates the kernel's IP routing tables. - - config SLATTACH - bool "slattach" - default y -+ depends on PLATFORM_LINUX - help - slattach is a small utility to attach network interfaces to serial - lines. -@@ -719,6 +734,7 @@ - config TCPSVD - bool "tcpsvd" - default y -+ depends on PLATFORM_LINUX - help - tcpsvd listens on a TCP port and runs a program for each new - connection. -@@ -888,6 +904,7 @@ - config TRACEROUTE - bool "traceroute" - default y -+ depends on PLATFORM_LINUX - help - Utility to trace the route of IP packets. - -@@ -924,6 +941,7 @@ - config TUNCTL - bool "tunctl" - default y -+ depends on PLATFORM_LINUX - help - tunctl creates or deletes tun devices. - -@@ -949,6 +967,7 @@ - config UDPSVD - bool "udpsvd" - default y -+ depends on PLATFORM_LINUX - help - udpsvd listens on an UDP port and runs a program for each new - connection. -@@ -956,6 +975,7 @@ - config VCONFIG - bool "vconfig" - default y -+ depends on PLATFORM_LINUX - help - Creates, removes, and configures VLAN interfaces - -@@ -990,6 +1010,7 @@ - config ZCIP - bool "zcip" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SYSLOG - help - ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927. -Index: busybox-1.17.1/networking/udhcp/Config.src -=================================================================== ---- busybox-1.17.1.orig/networking/udhcp/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/networking/udhcp/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -8,6 +8,7 @@ - config UDHCPD - bool "udhcp server (udhcpd)" - default y -+ depends on PLATFORM_LINUX - help - udhcpd is a DHCP server geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. -@@ -51,6 +52,7 @@ - config UDHCPC - bool "udhcp client (udhcpc)" - default y -+ depends on PLATFORM_LINUX - help - udhcpc is a DHCP client geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. -Index: busybox-1.17.1/procps/Config.src -=================================================================== ---- busybox-1.17.1.orig/procps/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/procps/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -10,6 +10,7 @@ - config FREE - bool "free" - default y -+ depends on PLATFORM_LINUX #sysinfo() - help - free displays the total amount of free and used physical and swap - memory in the system, as well as the buffers used by the kernel. -@@ -104,7 +105,7 @@ - config FEATURE_PS_TIME - bool "Enable time and elapsed time output" - default y -- depends on PS && DESKTOP -+ depends on PS && DESKTOP && PLATFORM_LINUX #sysinfo() - help - Support -o time and -o etime output specifiers. - -@@ -200,6 +201,7 @@ - config UPTIME - bool "uptime" - default y -+ depends on PLATFORM_LINUX #sysinfo() - help - uptime gives a one line display of the current time, how long - the system has been running, how many users are currently logged -Index: busybox-1.17.1/sysklogd/Config.src -=================================================================== ---- busybox-1.17.1.orig/sysklogd/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/sysklogd/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -109,6 +109,7 @@ - config KLOGD - bool "klogd" - default y -+ depends on PLATFORM_LINUX - help - klogd is a utility which intercepts and logs all - messages from the Linux kernel and sends the messages -Index: busybox-1.17.1/util-linux/Config.src -=================================================================== ---- busybox-1.17.1.orig/util-linux/Config.src 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/util-linux/Config.src 2010-08-01 05:32:43.000000000 +0200 -@@ -10,6 +10,7 @@ - config ACPID - bool "acpid" - default y -+ depends on PLATFORM_LINUX - help - acpid listens to ACPI events coming either in textual form from - /proc/acpi/event (though it is marked deprecated it is still widely -@@ -32,6 +33,7 @@ - config BLKID - bool "blkid" - default y -+ depends on PLATFORM_LINUX - select VOLUMEID - help - Lists labels and UUIDs of all filesystems. -@@ -41,6 +43,7 @@ - config DMESG - bool "dmesg" - default y -+ depends on PLATFORM_LINUX - help - dmesg is used to examine or control the kernel ring buffer. When the - Linux kernel prints messages to the system log, they are stored in -@@ -74,6 +77,7 @@ - config FBSET - bool "fbset" - default y -+ depends on PLATFORM_LINUX - help - fbset is used to show or change the settings of a Linux frame buffer - device. The frame buffer device provides a simple and unique -@@ -102,6 +106,7 @@ - config FDFLUSH - bool "fdflush" - default y -+ depends on PLATFORM_LINUX - help - fdflush is only needed when changing media on slightly-broken - removable media drives. It is used to make Linux believe that a -@@ -114,12 +119,14 @@ - config FDFORMAT - bool "fdformat" - default y -+ depends on PLATFORM_LINUX - help - fdformat is used to low-level format a floppy disk. - - config FDISK - bool "fdisk" - default y -+ depends on PLATFORM_LINUX - help - The fdisk utility is used to divide hard disks into one or more - logical disks, which are generally called partitions. This utility -@@ -187,6 +194,7 @@ - config FINDFS - bool "findfs" - default y -+ depends on PLATFORM_LINUX - select VOLUMEID - help - Prints the name of a filesystem with given label or UUID. -@@ -202,6 +210,7 @@ - config FREERAMDISK - bool "freeramdisk" - default y -+ depends on PLATFORM_LINUX - help - Linux allows you to create ramdisks. This utility allows you to - delete them and completely free all memory that was used for the -@@ -224,12 +233,14 @@ - config MKFS_EXT2 - bool "mkfs_ext2" - default y -+ depends on PLATFORM_LINUX - help - Utility to create EXT2 filesystems. - - config MKFS_MINIX - bool "mkfs_minix" - default y -+ depends on PLATFORM_LINUX - help - The minix filesystem is a nice, small, compact, read-write filesystem - with little overhead. If you wish to be able to create minix -@@ -247,6 +258,7 @@ - config MKFS_REISER - bool "mkfs_reiser" - default n -+ depends on PLATFORM_LINUX - help - Utility to create ReiserFS filesystems. - Note: this applet needs a lot of testing and polishing. -@@ -254,6 +266,7 @@ - config MKFS_VFAT - bool "mkfs_vfat" - default y -+ depends on PLATFORM_LINUX - help - Utility to create FAT32 filesystems. - -@@ -302,6 +315,7 @@ - config HWCLOCK - bool "hwclock" - default y -+ depends on PLATFORM_LINUX - help - The hwclock utility is used to read and set the hardware clock - on a system. This is primarily used to set the current time on -@@ -341,6 +355,7 @@ - config IPCS - bool "ipcs" - default y -+ depends on PLATFORM_LINUX - select FEATURE_SUID - help - The ipcs utility is used to provide information on the currently -@@ -349,6 +364,7 @@ - config LOSETUP - bool "losetup" - default y -+ depends on PLATFORM_LINUX - help - losetup is used to associate or detach a loop device with a regular - file or block device, and to query the status of a loop device. This -@@ -357,6 +373,7 @@ - config LSPCI - bool "lspci" - default y -+ #depends on PLATFORM_LINUX - help - lspci is a utility for displaying information about PCI buses in the - system and devices connected to them. -@@ -366,6 +383,7 @@ - config LSUSB - bool "lsusb" - default y -+ #depends on PLATFORM_LINUX - help - lsusb is a utility for displaying information about USB buses in the - system and devices connected to them. -@@ -375,6 +393,7 @@ - config MDEV - bool "mdev" - default y -+ depends on PLATFORM_LINUX - help - mdev is a mini-udev implementation for dynamically creating device - nodes in the /dev directory. -@@ -473,6 +492,7 @@ - config MOUNT - bool "mount" - default y -+ depends on PLATFORM_LINUX - help - All files and filesystems in Unix are arranged into one big directory - tree. The 'mount' utility is used to graft a filesystem onto a -@@ -555,6 +575,7 @@ - config PIVOT_ROOT - bool "pivot_root" - default y -+ depends on PLATFORM_LINUX - help - The pivot_root utility swaps the mount points for the root filesystem - with some other mounted filesystem. This allows you to do all sorts -@@ -582,12 +603,14 @@ - config READPROFILE - bool "readprofile" - default y -+ #depends on PLATFORM_LINUX - help - This allows you to parse /proc/profile for basic profiling. - - config RTCWAKE - bool "rtcwake" - default y -+ depends on PLATFORM_LINUX - help - Enter a system sleep state until specified wakeup time. - -@@ -607,6 +630,7 @@ - config SETARCH - bool "setarch" - default y -+ depends on PLATFORM_LINUX - help - The linux32 utility is used to create a 32bit environment for the - specified program (usually a shell). It only makes sense to have -@@ -616,6 +640,7 @@ - config SWAPONOFF - bool "swaponoff" - default y -+ depends on PLATFORM_LINUX - help - This option enables both the 'swapon' and the 'swapoff' utilities. - Once you have created some swap space using 'mkswap', you also need -@@ -634,6 +659,7 @@ - config SWITCH_ROOT - bool "switch_root" - default y -+ depends on PLATFORM_LINUX - help - The switch_root utility is used from initramfs to select a new - root device. Under initramfs, you have to use this instead of -@@ -653,6 +679,7 @@ - config UMOUNT - bool "umount" - default y -+ depends on PLATFORM_LINUX - help - When you want to remove a mounted filesystem from its current mount - point, for example when you are shutting down the system, the -Index: busybox-1.17.1/shell/Config.src -=================================================================== ---- busybox-1.17.1.orig/shell/Config.src 2010-08-01 05:33:24.000000000 +0200 -+++ busybox-1.17.1/shell/Config.src 2010-08-01 05:33:34.000000000 +0200 -@@ -370,6 +370,7 @@ - config CTTYHACK - bool "cttyhack" - default y -+ depends on PLATFORM_LINUX - help - One common problem reported on the mailing list is "can't access tty; - job control turned off" error message which typically appears when diff --git a/debian/patches/mkdir-fix-p-on-FreeBSD.patch b/debian/patches/mkdir-fix-p-on-FreeBSD.patch deleted file mode 100644 index fc5bf7f..0000000 --- a/debian/patches/mkdir-fix-p-on-FreeBSD.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 84b01d5afc8230c79a1b8469c222d940c0d4e792 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:46:33 +0200 -Subject: [PATCH 7/9] mkdir: fix -p on FreeBSD - -This patch is libbb.make_directory.diff from Debian kFreeBSD at: -http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.14/debian - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - libbb/make_directory.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libbb/make_directory.c b/libbb/make_directory.c -index 4486eb1..6dd04cf 100644 ---- a/libbb/make_directory.c -+++ b/libbb/make_directory.c -@@ -86,7 +86,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) - if (mkdir(path, 0777) < 0) { - /* If we failed for any other reason than the directory - * already exists, output a diagnostic and return -1 */ -- if (errno != EEXIST -+ if ((errno != EEXIST && errno != EISDIR) - || !(flags & FILEUTILS_RECUR) - || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode)) - ) { --- -1.7.1 - diff --git a/debian/patches/readlink-use-xmalloc_realpath.patch b/debian/patches/readlink-use-xmalloc_realpath.patch deleted file mode 100644 index e1103ec..0000000 --- a/debian/patches/readlink-use-xmalloc_realpath.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b175462422f02a159a14dc5561d8bef6f84b2b66 Mon Sep 17 00:00:00 2001 -From: Jeremie Koenig -Date: Thu, 27 May 2010 15:32:19 +0200 -Subject: [PATCH 1/9] readlink: use xmalloc_realpath() - -Using realpath() directly with a non-NULL output buffer is unsafe because its -behavior is unspecified on systems which don't have PATH_MAX (ie. Hurd) - -I beleive this also fixes a small bug whereby 'buf' would not be freed -on 'readlink -v' with ENABLE_FEATURE_CLEANUP. - -Signed-off-by: Jeremie Koenig -Signed-off-by: Denys Vlasenko ---- - coreutils/readlink.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/coreutils/readlink.c b/coreutils/readlink.c -index 20df38b..2ed5e2c 100644 ---- a/coreutils/readlink.c -+++ b/coreutils/readlink.c -@@ -36,7 +36,6 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) - { - char *buf; - char *fname; -- char pathbuf[PATH_MAX]; - - IF_FEATURE_READLINK_FOLLOW( - unsigned opt; -@@ -56,7 +55,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) - logmode = LOGMODE_NONE; - - if (opt & 1) { /* -f */ -- buf = realpath(fname, pathbuf); -+ buf = xmalloc_realpath(fname); - } else { - buf = xmalloc_readlink_or_warn(fname); - } -@@ -65,7 +64,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) - return EXIT_FAILURE; - printf((opt & 2) ? "%s" : "%s\n", buf); - -- if (ENABLE_FEATURE_CLEAN_UP && !opt) -+ if (ENABLE_FEATURE_CLEAN_UP) - free(buf); - - fflush_stdout_and_exit(EXIT_SUCCESS); --- -1.7.1 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9c507a4..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,45 +0,0 @@ -doc-man-name.patch -shell-ash-export-HOME.patch -applets-fallback.patch -version.patch -init-console.patch -05thumb.dpatch -06ls.dpatch -busybox-zero-ifr.ifr_hwaddr.sa_data.patch -#shell-hist.patch -top-display-rss.patch -strip.patch -make_gen_build_files_skip_quilt.patch - -# The following patches have been merged upstream and will be in version 1.18 -readlink-use-xmalloc_realpath.patch -mark-Linux-specific-configuration-options.patch -init-loginutils-termios-portability-fixes.patch -init-halt-portability-improvements.patch -init-make-the-initial-TERM-value-configurable.patch -libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch -mkdir-fix-p-on-FreeBSD.patch -libbb-conditionalize-AF_-usage-in-error-reporting.patch -tcpsvd-udpsvd-conditionalize-usage-of-SO_ORIGINAL_DS.patch -less-remove-misguided-dependency-on-PLATFORM_LINUX.patch -bootchartd-mounting-tmpfs-is-Linux-specific.patch -vlock-disable-linux-console-calls-on-other-systems.patch -cttyhack-serial-console-detection-is-Linux-specific.patch -klogd-make-it-work-on-non-linux-systems.patch -stty-sort-out-preprocessor-conditionals.patch -update-scripts-kconfig-_shipped.patch -blockdev.patch - -# The following patches will likely be merged soon -u-mount-FreeBSD-support.patch -swaponoff-FreeBSD-support.patch - -# not sent upstream -init-console-CRTSCTS.patch -debian-changes-1:1.17.1-10 - -# SLP -udhcpc-fast-request.patch -smack-busybox-1.17.1.patch -smack-conflict-with-selinux.patch -make_unicode_printable.patch diff --git a/debian/patches/shell-ash-export-HOME.patch b/debian/patches/shell-ash-export-HOME.patch deleted file mode 100644 index 0d3c5ab..0000000 --- a/debian/patches/shell-ash-export-HOME.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -1774,7 +1774,7 @@ - { VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL" , changemail }, - { VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH" , changemail }, - #endif -- { VSTRFIXED|VTEXTFIXED , bb_PATH_root_path, changepath }, -+ { VSTRFIXED|VTEXTFIXED|VEXPORT, bb_PATH_root_path, changepath }, - { VSTRFIXED|VTEXTFIXED , "PS1=$ " , NULL }, - { VSTRFIXED|VTEXTFIXED , "PS2=> " , NULL }, - { VSTRFIXED|VTEXTFIXED , "PS4=+ " , NULL }, diff --git a/debian/patches/shell-hist.patch b/debian/patches/shell-hist.patch deleted file mode 100644 index 889785a..0000000 --- a/debian/patches/shell-hist.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- a/libbb/lineedit.c 2009-03-30 17:15:10.000000000 +0300 -+++ b/libbb/lineedit.c 2009-03-31 17:52:48.000000000 +0300 -@@ -959,49 +959,48 @@ - static void load_history(const char *fromfile) - { - FILE *fp; -- int hi; -+ int hi = 0; - -- /* cleanup old */ -- for (hi = state->cnt_history; hi > 0;) { -- hi--; -- free(state->history[hi]); -- } -- -- fp = fopen(fromfile, "r"); -- if (fp) { -- for (hi = 0; hi < MAX_HISTORY;) { -- char *hl = xmalloc_getline(fp); -- int l; -- -- if (!hl) -- break; -- l = strlen(hl); -- if (l >= MAX_LINELEN) -- hl[MAX_LINELEN-1] = '\0'; -- if (l == 0 || hl[0] == ' ') { -- free(hl); -- continue; -+ if (!state->cnt_history) { -+ fp = fopen(fromfile, "r"); -+ if (fp) { -+ for (hi = 0; hi < MAX_HISTORY;) { -+ char *hl = xmalloc_getline(fp); -+ int l; -+ -+ if (!hl) -+ break; -+ l = strlen(hl); -+ if (l >= MAX_LINELEN) -+ hl[MAX_LINELEN-1] = '\0'; -+ if (l == 0 || hl[0] == ' ') { -+ free(hl); -+ continue; -+ } -+ state->history[hi++] = hl; - } -- state->history[hi++] = hl; -+ fclose(fp); - } -- fclose(fp); -+ state->cur_history = state->cnt_history = hi; - } -- state->cur_history = state->cnt_history = hi; - } - - /* state->flags is already checked to be nonzero */ --static void save_history(const char *tofile) -+void save_history(line_input_t *); -+void save_history(line_input_t *st) - { - FILE *fp; - -- fp = fopen(tofile, "w"); -- if (fp) { -- int i; -+ if (st->cnt_history) { -+ fp = fopen(st->hist_file, "w"); -+ if (fp) { -+ int i; - -- for (i = 0; i < state->cnt_history; i++) { -- fprintf(fp, "%s\n", state->history[i]); -+ for (i = 0; i < st->cnt_history; i++) { -+ fprintf(fp, "%s\n", st->history[i]); -+ } -+ fclose(fp); - } -- fclose(fp); - } - } - #else -@@ -1030,10 +1029,6 @@ - state->history[i++] = xstrdup(str); - state->cur_history = i; - state->cnt_history = i; --#if ENABLE_FEATURE_EDITING_SAVEHISTORY -- if ((state->flags & SAVE_HISTORY) && state->hist_file) -- save_history(state->hist_file); --#endif - USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;) - } - -diff -r -u busybox-1.10.2.legal.orig/shell/ash.c busybox-1.10.2.legal/shell/ash.c ---- busybox-1.10.2.legal.orig/shell/ash.c 2008-07-24 10:16:00.000000000 +0100 -+++ busybox-1.10.2.legal/shell/ash.c 2009-03-23 17:09:11.000000000 +0000 -@@ -1733,6 +1733,9 @@ - #if ENABLE_ASH_RANDOM_SUPPORT - static void change_random(const char *); - #endif -+#if ENABLE_FEATURE_EDITING_SAVEHISTORY -+void save_history(line_input_t *); -+#endif - - static const struct { - int flags; -@@ -12815,6 +12818,10 @@ - char *p; - int status; - -+ if (iflag && (line_input_state->flags & SAVE_HISTORY) -+ && line_input_state->hist_file && !shlvl) { -+ save_history(line_input_state); -+ } - status = exitstatus; - TRACE(("pid %d, exitshell(%d)\n", getpid(), status)); - if (setjmp(loc.loc)) { diff --git a/debian/patches/smack-busybox-1.17.1.patch b/debian/patches/smack-busybox-1.17.1.patch deleted file mode 100644 index a95697f..0000000 --- a/debian/patches/smack-busybox-1.17.1.patch +++ /dev/null @@ -1,1604 +0,0 @@ - -Smack updates for busybox-1.17.1 - ---- - - Config.in | 9 ++ - Makefile | 1 - coreutils/id.c | 26 +++++- - coreutils/ls.c | 28 ++++++ - coreutils/stat.c | 87 ++++++++++++++++---- - findutils/find.c | 31 +++++++ - include/applets.src.h | 4 - include/libbb.h | 21 ++++ - include/usage.src.h | 30 ++++++- - libbb/Kbuild.src | 1 - libbb/messages.c | 3 - libbb/procps.c | 6 + - libbb/smack_common.c | 178 ++++++++++++++++++++++++++++++++++++++++++ - loginutils/adduser.c | 13 ++- - loginutils/login.c | 8 + - loginutils/su.c | 8 + - loginutils/sulogin.c | 6 + - miscutils/crond.c | 11 ++ - miscutils/crontab.c | 13 +++ - procps/ps.c | 48 +++++++++-- - smack/Config.src | 40 +++++++++ - smack/Kbuild.src | 14 +++ - smack/newsmack.c | 61 ++++++++++++++ - smack/smackcipso.c | 119 ++++++++++++++++++++++++++++ - smack/smackenabled.c | 17 ++++ - smack/smackload.c | 93 +++++++++++++++++++++ - 26 files changed, 844 insertions(+), 32 deletions(-) - -diff -uprN busybox-1.17.1/Config.in busybox-1.17.1-smack/Config.in ---- busybox-1.17.1/Config.in 2010-07-24 15:12:56.000000000 -0700 -+++ busybox-1.17.1-smack/Config.in 2011-08-17 15:27:12.889107702 -0700 -@@ -370,6 +370,14 @@ config SELINUX - - Most people will leave this set to 'N'. - -+config SMACK -+ bool "Support Smack" -+ default n -+ help -+ Enable support for Smack in applets ls, ps, and id. Also provide -+ the option of compiling in Smack applets. -+ -+ - config FEATURE_PREFER_APPLETS - bool "exec prefers applets" - default n -@@ -739,4 +747,5 @@ source procps/Config.in - source runit/Config.in - source selinux/Config.in - source shell/Config.in -+source smack/Config.in - source sysklogd/Config.in -diff -uprN busybox-1.17.1/coreutils/id.c busybox-1.17.1-smack/coreutils/id.c ---- busybox-1.17.1/coreutils/id.c 2010-07-05 19:25:53.000000000 -0700 -+++ busybox-1.17.1-smack/coreutils/id.c 2011-08-17 15:27:12.889107702 -0700 -@@ -34,6 +34,9 @@ enum { - #if ENABLE_SELINUX - JUST_CONTEXT = (1 << 5), - #endif -+#if ENABLE_SMACK -+ JUST_LABEL = (1 << 5), -+#endif - }; - - static int print_common(unsigned id, const char *name, const char *prefix) -@@ -116,11 +119,15 @@ int id_main(int argc UNUSED_PARAM, char - #if ENABLE_SELINUX - security_context_t scontext = NULL; - #endif -+#if ENABLE_SMACK -+ char smack[SMACKBUFFSIZE]; -+#endif - /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/ - /* Don't allow more than one username */ - opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG" -- IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G"); -- opt = getopt32(argv, "rnugG" IF_SELINUX("Z")); -+ IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G") -+ IF_SMACK(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G"); -+ opt = getopt32(argv, "rnugG" IF_SELINUX("Z") IF_SMACK("Z")); - - username = argv[optind]; - if (username) { -@@ -187,6 +194,10 @@ int id_main(int argc UNUSED_PARAM, char - printf(" context=%s", scontext); - } - #endif -+#if ENABLE_SMACK -+ if (smack_from_proc(-1, smack, sizeof(smack)) == 0) -+ printf(" label=%s", smack); -+#endif - } else if (opt & PRINT_REAL) { - euid = ruid; - egid = rgid; -@@ -205,6 +216,17 @@ int id_main(int argc UNUSED_PARAM, char - } - fputs(scontext, stdout); - } -+#endif -+#if ENABLE_SMACK -+ else if (opt & JUST_LABEL) { -+ if (username || smack_from_proc(-1, smack, sizeof(smack)) < 0) { -+ bb_error_msg_and_die("can't get process label%s", -+ username ? " for a different user" : ""); -+ } -+ fputs(smack, stdout); -+ } -+#endif -+#if ENABLE_SELINUX - /* freecon(NULL) seems to be harmless */ - if (ENABLE_FEATURE_CLEAN_UP) - freecon(scontext); -diff -uprN busybox-1.17.1/coreutils/ls.c busybox-1.17.1-smack/coreutils/ls.c ---- busybox-1.17.1/coreutils/ls.c 2010-07-05 19:25:53.000000000 -0700 -+++ busybox-1.17.1-smack/coreutils/ls.c 2011-08-17 16:23:44.839147638 -0700 -@@ -141,6 +141,7 @@ static const char ls_options[] ALIGN1 = - IF_FEATURE_LS_RECURSIVE("R") /* 1, 25 */ - IF_FEATURE_HUMAN_READABLE("h") /* 1, 26 */ - IF_SELINUX("KZ") /* 2, 28 */ -+ IF_SMACK("KZ") /* 2, 28 */ - IF_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */ - ; - enum { -@@ -165,6 +166,7 @@ enum { - + 1 * ENABLE_FEATURE_LS_RECURSIVE - + 1 * ENABLE_FEATURE_HUMAN_READABLE - + 2 * ENABLE_SELINUX -+ + 2 * ENABLE_SMACK - + 2 * ENABLE_FEATURE_AUTOWIDTH, - OPT_color = 1 << OPTBIT_color, - }; -@@ -191,6 +193,7 @@ static const unsigned opt_flags[] = { - 0, /* Q (quote filename) - handled via OPT_Q */ - DISP_HIDDEN, /* A */ - ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */ -+ ENABLE_SMACK * LIST_CONTEXT, /* k (ignored if !SMACK) */ - #if ENABLE_FEATURE_LS_TIMESTAMPS - TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */ - LIST_FULLTIME, /* e */ -@@ -216,10 +219,10 @@ static const unsigned opt_flags[] = { - #if ENABLE_FEATURE_HUMAN_READABLE - LS_DISP_HR, /* h */ - #endif --#if ENABLE_SELINUX -+#if ENABLE_SELINUX || ENABLE_SMACK - LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ - #endif --#if ENABLE_SELINUX -+#if ENABLE_SELINUX || ENABLE_SMACK - LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */ - #endif - (1U<<31) -@@ -239,6 +242,7 @@ struct dnode { - smallint fname_allocated; - struct stat dstat; /* the file stat info */ - IF_SELINUX(security_context_t sid;) -+ IF_SMACK(char xattr[SMACKBUFFSIZE];) - }; - - struct globals { -@@ -288,6 +292,10 @@ static struct dnode *my_stat(const char - struct stat dstat; - struct dnode *cur; - IF_SELINUX(security_context_t sid = NULL;) -+#if ENABLE_SMACK -+ char xattr[SMACKBUFFSIZE]; -+ int i; -+#endif - - if ((all_fmt & FOLLOW_LINKS) || force_follow) { - #if ENABLE_SELINUX -@@ -295,6 +303,11 @@ static struct dnode *my_stat(const char - getfilecon(fullname, &sid); - } - #endif -+#if ENABLE_SMACK -+ i = smack_from_file(fullname, xattr, sizeof(xattr), 1); -+ if (i < 0) -+ xattr[0] = '\0'; -+#endif - if (stat(fullname, &dstat)) { - bb_simple_perror_msg(fullname); - exit_code = EXIT_FAILURE; -@@ -306,6 +319,11 @@ static struct dnode *my_stat(const char - lgetfilecon(fullname, &sid); - } - #endif -+#if ENABLE_SMACK -+ i = smack_from_file(fullname, xattr, sizeof(xattr), 0); -+ if (i < 0) -+ xattr[0] = '\0'; -+#endif - if (lstat(fullname, &dstat)) { - bb_simple_perror_msg(fullname); - exit_code = EXIT_FAILURE; -@@ -318,6 +336,7 @@ static struct dnode *my_stat(const char - cur->name = name; - cur->dstat = dstat; - IF_SELINUX(cur->sid = sid;) -+ IF_SMACK(strncpy(cur->xattr, xattr, sizeof(xattr));) - return cur; - } - -@@ -685,6 +704,10 @@ static NOINLINE unsigned list_single(con - freecon(dn->sid); - } - #endif -+#if ENABLE_SMACK -+ if (all_fmt & LIST_CONTEXT) -+ column += printf("%-23s ", dn->xattr); -+#endif - if (all_fmt & LIST_FILENAME) { - #if ENABLE_FEATURE_LS_COLOR - if (show_color) { -@@ -753,6 +776,7 @@ static void showfiles(struct dnode **dn, - } - column_width += tabstops + - IF_SELINUX( ((all_fmt & LIST_CONTEXT) ? 33 : 0) + ) -+ IF_SMACK( ((all_fmt & LIST_CONTEXT) ? 24 : 0) + ) - ((all_fmt & LIST_INO) ? 8 : 0) + - ((all_fmt & LIST_BLOCKS) ? 5 : 0); - ncols = (int) (terminal_width / column_width); -diff -uprN busybox-1.17.1/coreutils/stat.c busybox-1.17.1-smack/coreutils/stat.c ---- busybox-1.17.1/coreutils/stat.c 2010-07-05 19:25:53.000000000 -0700 -+++ busybox-1.17.1-smack/coreutils/stat.c 2011-08-18 17:01:04.060191320 -0700 -@@ -18,6 +18,7 @@ - #define OPT_TERSE (1 << 1) - #define OPT_DEREFERENCE (1 << 2) - #define OPT_SELINUX (1 << 3) -+#define OPT_SMACK (1 << 4) - - #if ENABLE_FEATURE_STAT_FORMAT - typedef bool (*statfunc_ptr)(const char *, const char *); -@@ -154,7 +155,8 @@ static void printfs(char *pformat, const - /* print statfs info */ - static void FAST_FUNC print_statfs(char *pformat, const char m, - const char *const filename, const void *data -- IF_SELINUX(, security_context_t scontext)) -+ IF_SELINUX(, security_context_t scontext) -+ IF_SMACK(, char *smack)) - { - const struct statfs *statfsbuf = data; - if (m == 'n') { -@@ -192,6 +194,10 @@ static void FAST_FUNC print_statfs(char - } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) { - printfs(pformat, scontext); - # endif -+#if ENABLE_SMACK -+ } else if (m == 'C' && (option_mask32 & OPT_SMACK)) { -+ printfs(pformat, smack); -+#endif - } else { - strcatc(pformat, 'c'); - printf(pformat, m); -@@ -201,7 +207,8 @@ static void FAST_FUNC print_statfs(char - /* print stat info */ - static void FAST_FUNC print_stat(char *pformat, const char m, - const char *const filename, const void *data -- IF_SELINUX(, security_context_t scontext)) -+ IF_SELINUX(, security_context_t scontext) -+ IF_SMACK(, char *smack)) - { - #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - struct stat *statbuf = (struct stat *) data; -@@ -296,6 +303,10 @@ static void FAST_FUNC print_stat(char *p - } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) { - printfs(pformat, scontext); - # endif -+#if ENABLE_SMACK -+ } else if (m == 'C' && (option_mask32 & OPT_SMACK)) { -+ printfs(pformat, smack); -+#endif - } else { - strcatc(pformat, 'c'); - printf(pformat, m); -@@ -304,9 +315,10 @@ static void FAST_FUNC print_stat(char *p - - static void print_it(const char *masterformat, - const char *filename, -- void FAST_FUNC (*print_func)(char*, char, const char*, const void* IF_SELINUX(, security_context_t scontext)), -+ void FAST_FUNC (*print_func)(char*, char, const char*, const void* IF_SELINUX(, security_context_t scontext) IF_SMACK(, char *smack)), - const void *data -- IF_SELINUX(, security_context_t scontext)) -+ IF_SELINUX(, security_context_t scontext) -+ IF_SMACK(, char *smack) ) - { - /* Create a working copy of the format string */ - char *format = xstrdup(masterformat); -@@ -349,7 +361,7 @@ static void print_it(const char *masterf - break; - default: - /* Completes "%" with specifier and printfs */ -- print_func(dest, *p, filename, data IF_SELINUX(,scontext)); -+ print_func(dest, *p, filename, data IF_SELINUX(,scontext) IF_SMACK(,smack) ); - break; - } - } -@@ -383,6 +395,18 @@ static bool do_statfs(const char *filena - } - } - #endif -+#if ENABLE_SMACK -+ char smack[SMACKBUFFSIZE]; -+ -+ if (option_mask32 & OPT_SMACK) { -+ int i = option_mask32 & OPT_DEREFERENCE; -+ -+ if (smack_from_file(filename, smack, sizeof(smack), i) < 0) { -+ bb_perror_msg("%s", filename); -+ return 0; -+ } -+ } -+#endif - if (statfs(filename, &statfsbuf) != 0) { - bb_perror_msg("can't read file system information for '%s'", filename); - return 0; -@@ -390,7 +414,7 @@ static bool do_statfs(const char *filena - - #if ENABLE_FEATURE_STAT_FORMAT - if (format == NULL) { --# if !ENABLE_SELINUX -+# if !ENABLE_SELINUX && !ENABLE_SMACK - format = (option_mask32 & OPT_TERSE - ? "%n %i %l %t %s %b %f %a %c %d\n" - : " File: \"%n\"\n" -@@ -400,9 +424,9 @@ static bool do_statfs(const char *filena - "Inodes: Total: %-10c Free: %d"); - # else - format = (option_mask32 & OPT_TERSE -- ? (option_mask32 & OPT_SELINUX ? "%n %i %l %t %s %b %f %a %c %d %C\n": -+ ? (option_mask32 & (OPT_SELINUX | OPT_SMACK) ? "%n %i %l %t %s %b %f %a %c %d %C\n": - "%n %i %l %t %s %b %f %a %c %d\n") -- : (option_mask32 & OPT_SELINUX ? -+ : (option_mask32 & (OPT_SELINUX | OPT_SMACK) ? - " File: \"%n\"\n" - " ID: %-8i Namelen: %-7l Type: %T\n" - "Block size: %-10s\n" -@@ -415,9 +439,9 @@ static bool do_statfs(const char *filena - "Blocks: Total: %-10b Free: %-10f Available: %a\n" - "Inodes: Total: %-10c Free: %d\n") - ); --# endif /* SELINUX */ -+# endif /* SELINUX or Smack */ - } -- print_it(format, filename, print_statfs, &statfsbuf IF_SELINUX(, scontext)); -+ print_it(format, filename, print_statfs, &statfsbuf IF_SELINUX(, scontext) IF_SMACK(, smack) ); - #else /* FEATURE_STAT_FORMAT */ - format = (option_mask32 & OPT_TERSE - ? "%s %llx %lu " -@@ -433,7 +457,7 @@ static bool do_statfs(const char *filena - else - printf("Type: %s\n", human_fstype(statfsbuf.f_type)); - --# if !ENABLE_SELINUX -+# if !ENABLE_SELINUX && !ENABLE_SMACK - format = (option_mask32 & OPT_TERSE - ? "%lu %llu %llu %llu %llu %llu\n" - : "Block size: %-10lu\n" -@@ -448,8 +472,8 @@ static bool do_statfs(const char *filena - (unsigned long long) statfsbuf.f_ffree); - # else - format = (option_mask32 & OPT_TERSE -- ? (option_mask32 & OPT_SELINUX ? "%lu %llu %llu %llu %llu %llu %C\n" : "%lu %llu %llu %llu %llu %llu\n") -- : (option_mask32 & OPT_SELINUX -+ ? (option_mask32 & (OPT_SELINUX | OPT_SMACK) ? "%lu %llu %llu %llu %llu %llu %C\n" : "%lu %llu %llu %llu %llu %llu\n") -+ : (option_mask32 & (OPT_SELINUX | OPT_SMACK) - ? "Block size: %-10lu\n" - "Blocks: Total: %-10llu Free: %-10llu Available: %llu\n" - "Inodes: Total: %-10llu Free: %llu" -@@ -496,6 +520,18 @@ static bool do_stat(const char *filename - } - } - #endif -+#if ENABLE_SMACK -+ char smack[SMACKBUFFSIZE]; -+ -+ if (option_mask32 & OPT_SMACK) { -+ int i = option_mask32 & OPT_DEREFERENCE; -+ -+ if (smack_from_file(filename, smack, sizeof(smack), i) < 0) { -+ bb_perror_msg("%s", filename); -+ return 0; -+ } -+ } -+#endif - if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) { - bb_perror_msg("can't stat '%s'", filename); - return 0; -@@ -503,7 +539,7 @@ static bool do_stat(const char *filename - - #if ENABLE_FEATURE_STAT_FORMAT - if (format == NULL) { --# if !ENABLE_SELINUX -+#if !ENABLE_SELINUX && !ENABLE_SMACK - if (option_mask32 & OPT_TERSE) { - format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o"; - } else { -@@ -526,12 +562,12 @@ static bool do_stat(const char *filename - } - # else - if (option_mask32 & OPT_TERSE) { -- format = (option_mask32 & OPT_SELINUX ? -+ format = (option_mask32 & (OPT_SELINUX | OPT_SMACK) ? - "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n": - "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"); - } else { - if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { -- format = (option_mask32 & OPT_SELINUX ? -+ format = (option_mask32 & (OPT_SELINUX | OPT_SMACK) ? - " File: %N\n" - " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" - "Device: %Dh/%dd\tInode: %-10i Links: %-5h" -@@ -546,7 +582,7 @@ static bool do_stat(const char *filename - "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" - "Access: %x\n" "Modify: %y\n" "Change: %z\n"); - } else { -- format = (option_mask32 & OPT_SELINUX ? -+ format = (option_mask32 & (OPT_SELINUX | OPT_SMACK) ? - " File: %N\n" - " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" - "Device: %Dh/%dd\tInode: %-10i Links: %h\n" -@@ -562,11 +598,14 @@ static bool do_stat(const char *filename - } - # endif - } -- print_it(format, filename, print_stat, &statbuf IF_SELINUX(, scontext)); -+ print_it(format, filename, print_stat, &statbuf IF_SELINUX(, scontext) IF_SMACK(, smack) ); - #else /* FEATURE_STAT_FORMAT */ - if (option_mask32 & OPT_TERSE) { -+#if !ENABLE_SELINUX && !ENABLE_SMACK -+ printf("%s %llu %llu %lx %lu %lu %llx %llu %lu %lx %lx %lu %lu %lu %lu\n" -+#else - printf("%s %llu %llu %lx %lu %lu %llx %llu %lu %lx %lx %lu %lu %lu %lu" -- IF_NOT_SELINUX("\n"), -+#endif - filename, - (unsigned long long) statbuf.st_size, - (unsigned long long) statbuf.st_blocks, -@@ -589,6 +628,12 @@ static bool do_stat(const char *filename - else - bb_putchar('\n'); - # endif -+#if ENABLE_SMACK -+ if (option_mask32 & OPT_SMACK) -+ printf(" %lc\n", smack); -+ else -+ bb_putchar('\n'); -+#endif - } else { - char *linkname = NULL; - -@@ -632,6 +677,9 @@ static bool do_stat(const char *filename - # if ENABLE_SELINUX - printf(" S_Context: %lc\n", *scontext); - # endif -+#if ENABLE_SMACK -+ printf(" Smack: %lc\n", smack); -+#endif - printf("Access: %s\n" "Modify: %s\n" "Change: %s\n", - human_time(statbuf.st_atime), - human_time(statbuf.st_mtime), -@@ -653,6 +701,7 @@ int stat_main(int argc UNUSED_PARAM, cha - opt_complementary = "-1"; /* min one arg */ - opts = getopt32(argv, "ftL" - IF_SELINUX("Z") -+ IF_SMACK("Z") - IF_FEATURE_STAT_FORMAT("c:", &format) - ); - if (opts & OPT_FILESYS) /* -f */ -diff -uprN busybox-1.17.1/findutils/find.c busybox-1.17.1-smack/findutils/find.c ---- busybox-1.17.1/findutils/find.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/findutils/find.c 2011-08-18 17:39:38.790218576 -0700 -@@ -223,6 +223,13 @@ - //config: help - //config: Support the 'find -context' option for matching security context. - //config: -+//config:config FEATURE_FIND_SMACK -+//config: bool "Enable -smack: Smack label matching" -+//config: default n -+//config: depends on FIND && SMACK -+//config: help -+//config: Support the 'find -smack' option for matching Smack label. -+//config: - //config:config FEATURE_FIND_LINKS - //config: bool "Enable -links: link count matching" - //config: default y -@@ -268,6 +275,7 @@ IF_FEATURE_FIND_INUM( ACTS(inum, ino_ - IF_FEATURE_FIND_USER( ACTS(user, uid_t uid;)) - IF_FEATURE_FIND_SIZE( ACTS(size, char size_char; off_t size;)) - IF_FEATURE_FIND_CONTEXT(ACTS(context, security_context_t context;)) -+IF_FEATURE_FIND_SMACK( ACTS(smack, const char *smack;)) - IF_FEATURE_FIND_PAREN( ACTS(paren, action ***subexpr;)) - IF_FEATURE_FIND_PRUNE( ACTS(prune)) - IF_FEATURE_FIND_DELETE( ACTS(delete)) -@@ -573,6 +581,17 @@ ACTF(context) - return rc == 0; - } - #endif -+#if ENABLE_FEATURE_FIND_SMACK -+ACTF(smack) -+{ -+ char smack[SMACKBUFFSIZE]; -+ -+ if (smack_from_file(fileName, smack, SMACKBUFFSIZE, -+ (G.recurse_flags & ACTION_FOLLOWLINKS) ? 1 : 0) < 0) -+ return FALSE; -+ return strcmp(ap->smack, smack) == 0; -+} -+#endif - #if ENABLE_FEATURE_FIND_LINKS - ACTF(links) - { -@@ -704,6 +723,7 @@ static action*** parse_params(char **arg - IF_FEATURE_FIND_GROUP( PARM_group ,) - IF_FEATURE_FIND_SIZE( PARM_size ,) - IF_FEATURE_FIND_CONTEXT(PARM_context ,) -+ IF_FEATURE_FIND_SMACK( PARM_smack ,) - IF_FEATURE_FIND_LINKS( PARM_links ,) - }; - -@@ -738,6 +758,7 @@ static action*** parse_params(char **arg - IF_FEATURE_FIND_GROUP( "-group\0" ) - IF_FEATURE_FIND_SIZE( "-size\0" ) - IF_FEATURE_FIND_CONTEXT("-context\0") -+ IF_FEATURE_FIND_SMACK( "-smack\0" ) - IF_FEATURE_FIND_LINKS( "-links\0" ) - ; - -@@ -1028,6 +1049,13 @@ static action*** parse_params(char **arg - bb_simple_perror_msg(arg1); - } - #endif -+#if ENABLE_FEATURE_FIND_SMACK -+ else if (parm == PARM_smack) { -+ action_smack *ap; -+ ap = ALLOC_ACTION(smack); -+ ap->smack = arg1; -+ } -+#endif - #if ENABLE_FEATURE_FIND_LINKS - else if (parm == PARM_links) { - action_links *ap; -@@ -1115,6 +1143,9 @@ static action*** parse_params(char **arg - //usage: IF_FEATURE_FIND_CONTEXT( - //usage: "\n -context File has specified security context" - //usage: ) -+//usage: IF_FEATURE_FIND_CONTEXT( -+//usage: "\n -smack File has specified Smack label" -+//usage: ) - //usage: IF_FEATURE_FIND_EXEC( - //usage: "\n -exec CMD ARG ; Run CMD with all instances of {} replaced by the" - //usage: "\n matching files" -diff -uprN busybox-1.17.1/include/applets.src.h busybox-1.17.1-smack/include/applets.src.h ---- busybox-1.17.1/include/applets.src.h 2010-07-24 15:12:43.000000000 -0700 -+++ busybox-1.17.1-smack/include/applets.src.h 2011-08-18 11:40:15.809964682 -0700 -@@ -279,6 +279,7 @@ IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_D - IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) - IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP)) -+IF_NEWSMACK(APPLET(newsmack, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) - IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP)) - IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_DROP)) -@@ -356,6 +357,9 @@ IF_SHA512SUM(APPLET_ODDNAME(sha512sum, m - IF_SHOWKEY(APPLET(showkey, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_SLATTACH(APPLET(slattach, _BB_DIR_SBIN, _BB_SUID_DROP)) - IF_SLEEP(APPLET_NOFORK(sleep, sleep, _BB_DIR_BIN, _BB_SUID_DROP, sleep)) -+IF_SMACKCIPSO(APPLET(smackcipso, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) -+IF_SMACKENABLED(APPLET(smackenabled, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) -+IF_SMACKLOAD(APPLET(smackload, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) - IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, softlimit)) - IF_SORT(APPLET_NOEXEC(sort, sort, _BB_DIR_USR_BIN, _BB_SUID_DROP, sort)) - IF_SPLIT(APPLET(split, _BB_DIR_USR_BIN, _BB_SUID_DROP)) -diff -uprN busybox-1.17.1/include/libbb.h busybox-1.17.1-smack/include/libbb.h ---- busybox-1.17.1/include/libbb.h 2010-07-24 15:12:43.000000000 -0700 -+++ busybox-1.17.1-smack/include/libbb.h 2011-08-18 11:54:34.569974792 -0700 -@@ -52,6 +52,12 @@ - #include - #include - #endif -+#if ENABLE_SMACK -+#define SMACKBUFFSIZE 24 -+#define SMACKATTR "security.SMACK64" -+#define SMACKFLOOR "_" -+#define SMACKSTAR "*" -+#endif - #if ENABLE_LOCALE_SUPPORT - # include - #else -@@ -1183,6 +1189,16 @@ extern void selinux_preserve_fcontext(in - #endif - extern void selinux_or_die(void) FAST_FUNC; - -+#if ENABLE_SMACK -+extern int smack_from_file(const char *path, char *result, int len, int follow); -+extern int smack_from_proc(const int pid, char *result, int len); -+extern int smack_to_file(const char *path, const char *smack, int follow); -+extern int smack_to_proc(const int pid, const char *smack); -+extern int smack_user_default(const char *user, char *result, int len); -+extern int smack_user_allowed(const char *user, const char *smack); -+extern int smack_user_add(const char *user, const char *smack); -+#endif -+ - /* setup_environment: - * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die - * if clear_env = 1: cd(pw->pw_dir), clear environment, then set -@@ -1391,6 +1407,7 @@ typedef struct procps_status_t { - char *argv0; - char *exe; - IF_SELINUX(char *context;) -+ IF_SMACK(char smack[SMACKBUFFSIZE];) - /* Everything below must contain no ptrs to malloc'ed data: - * it is memset(0) for each process in procps_scan() */ - unsigned long vsz, rss; /* we round it to kbytes */ -@@ -1453,6 +1470,7 @@ enum { - || ENABLE_SESTATUS - ), - PSSCAN_CONTEXT = (1 << 17) * ENABLE_SELINUX, -+ PSSCAN_SMACK = (1 << 17) * ENABLE_SMACK, - PSSCAN_START_TIME = 1 << 18, - PSSCAN_CPU = (1 << 19) * ENABLE_FEATURE_TOP_SMP_PROCESS, - PSSCAN_NICE = (1 << 20) * ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS, -@@ -1574,6 +1592,9 @@ extern const char bb_path_group_file[]; - extern const char bb_path_motd_file[]; - extern const char bb_path_wtmp_file[]; - extern const char bb_dev_null[]; -+#if ENABLE_SMACK -+extern const char bb_path_smack_user[]; -+#endif - extern const char bb_busybox_exec_path[]; - extern const char *bb_busybox_exec_paths[]; - /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, -diff -uprN busybox-1.17.1/include/usage.src.h busybox-1.17.1-smack/include/usage.src.h ---- busybox-1.17.1/include/usage.src.h 2010-07-24 15:12:43.000000000 -0700 -+++ busybox-1.17.1-smack/include/usage.src.h 2011-08-18 12:10:12.649985839 -0700 -@@ -1764,6 +1764,9 @@ INSERT - IF_SELINUX( \ - "\n -Z Print the security context" \ - ) \ -+ IF_SMACK( \ -+ "\n -Z Print the Smack label" \ -+ ) \ - "\n -u Print user ID" \ - "\n -g Print group ID" \ - "\n -G Print supplementary group IDs" \ -@@ -2982,6 +2985,11 @@ INSERT - "\n -p Display PID/Program name for sockets" \ - ) - -+#define newsmack_trivial_usage \ -+ "label [COMMAND [ARG] ...]" -+#define newsmack_full_usage \ -+ "Run a program or shell with the specified Smack label" \ -+ - #define nmeter_trivial_usage \ - "format_string" - #define nmeter_full_usage "\n\n" \ -@@ -3303,7 +3311,7 @@ INSERT - - #else /* !ENABLE_DESKTOP */ - --#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE -+#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE && !ENABLE_SMACK - #define USAGE_PS "\nThis version of ps accepts no options" - #else - #define USAGE_PS "\nOptions:" -@@ -3317,6 +3325,9 @@ INSERT - IF_SELINUX( \ - "\n -Z Show selinux context" \ - ) \ -+ IF_SMACK( \ -+ "\n -Z Show Smack label" \ -+ ) \ - IF_FEATURE_PS_WIDE( \ - "\n w Wide output" \ - ) -@@ -3845,6 +3856,17 @@ INSERT - "$ sleep 1d 3h 22m 8s\n" \ - "[98528 second delay results]\n") - -+#define smackcipso_trivial_usage -+#define smackcipso_full_usage \ -+ "Read and set Smack CIPSO mappings from the standard input" -+ -+#define smackenabled_trivial_usage -+#define smackenabled_full_usage -+ -+#define smackload_trivial_usage -+#define smackload_full_usage \ -+ "Read and set Smack access rules from the standard input" -+ - #define sort_trivial_usage \ - "[-nru" \ - IF_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") \ -@@ -3982,6 +4004,9 @@ INSERT - IF_SELINUX( \ - "\n -Z Print security context" \ - ) \ -+ IF_SMACK( \ -+ "\n -Z Print Smack label" \ -+ ) \ - IF_FEATURE_STAT_FORMAT( \ - "\n\nValid format sequences for files:\n" \ - " %a Access rights in octal\n" \ -@@ -4019,6 +4044,9 @@ INSERT - IF_SELINUX( \ - " %C Security context in selinux\n" \ - ) \ -+ IF_SMACK( \ -+ " %C Smack label\n" \ -+ ) \ - " %i File System ID in hex\n" \ - " %l Maximum length of filenames\n" \ - " %n File name\n" \ -diff -uprN busybox-1.17.1/libbb/Kbuild.src busybox-1.17.1-smack/libbb/Kbuild.src ---- busybox-1.17.1/libbb/Kbuild.src 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/libbb/Kbuild.src 2011-08-18 15:10:58.330113541 -0700 -@@ -126,6 +126,7 @@ lib-$(CONFIG_FEATURE_UTMP) += utmp.o - # A mix of optimizations (why build stuff we know won't be used) - # and objects which may fail to build (SELinux on selinux-less system) - lib-$(CONFIG_SELINUX) += selinux_common.o -+lib-$(CONFIG_SMACK) += smack_common.o - lib-$(CONFIG_FEATURE_MTAB_SUPPORT) += mtab.o - lib-$(CONFIG_UNICODE_SUPPORT) += unicode.o - lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o -diff -uprN busybox-1.17.1/libbb/messages.c busybox-1.17.1-smack/libbb/messages.c ---- busybox-1.17.1/libbb/messages.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/libbb/messages.c 2011-08-17 15:27:12.889107702 -0700 -@@ -43,6 +43,9 @@ const char bb_path_shadow_file[] ALIGN1 - const char bb_path_group_file[] ALIGN1 = "/etc/group"; - const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow"; - const char bb_path_motd_file[] ALIGN1 = "/etc/motd"; -+#if ENABLE_SMACK -+const char bb_path_smack_user[] ALIGN1 = "/etc/smack/user"; -+#endif - const char bb_dev_null[] ALIGN1 = "/dev/null"; - const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH; - const char *bb_busybox_exec_paths[] ALIGN1 = { -diff -uprN busybox-1.17.1/libbb/procps.c busybox-1.17.1-smack/libbb/procps.c ---- busybox-1.17.1/libbb/procps.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/libbb/procps.c 2011-08-17 15:27:12.909107701 -0700 -@@ -240,6 +240,12 @@ procps_status_t* FAST_FUNC procps_scan(p - sp->context = NULL; - } - #endif -+#if ENABLE_SMACK -+ if (flags & PSSCAN_SMACK) { -+ if (smack_from_proc(sp->pid, sp->smack, SMACKBUFFSIZE) < 0) -+ strcpy(sp->smack, "?"); -+ } -+#endif - - filename_tail = filename + sprintf(filename, "/proc/%u/", pid); - -diff -uprN busybox-1.17.1/libbb/smack_common.c busybox-1.17.1-smack/libbb/smack_common.c ---- busybox-1.17.1/libbb/smack_common.c 1969-12-31 16:00:00.000000000 -0800 -+++ busybox-1.17.1-smack/libbb/smack_common.c 2011-08-18 17:17:53.730203208 -0700 -@@ -0,0 +1,178 @@ -+/* -+ * libbb/smack_common.c -+ * -- common Smack utility functions -+ * -+ * Copyright 2007 Casey Schaufler -+ */ -+#include "libbb.h" -+#include -+ -+#define SMACKPROCPATH "/proc/%d/attr/current" -+#define SMACKUSERFILE "/etc/smack/user" -+#define SMACKFILELINE 256 -+ -+int smack_from_file(const char *path, char *result, int len, int follow) -+{ -+ char buffer[SMACKBUFFSIZE]; -+ int rc; -+ -+ if (follow) -+ rc = getxattr(path, SMACKATTR, buffer, SMACKBUFFSIZE - 1); -+ else -+ rc = lgetxattr(path, SMACKATTR, buffer, SMACKBUFFSIZE - 1); -+ -+ if (rc < 0) -+ return rc; -+ -+ buffer[rc] = '\0'; -+ if (strlen(buffer) > len) -+ return -EINVAL; -+ -+ strcpy(result, buffer); -+ return rc; -+} -+ -+int smack_from_proc(const int pid, char *result, int len) -+{ -+ char path[SMACKFILELINE]; -+ char buffer[SMACKFILELINE]; -+ int fd; -+ int i; -+ -+ sprintf(path, SMACKPROCPATH, (pid < 0) ? getpid() : pid); -+ -+ fd = open(path, O_RDONLY); -+ if (fd < 0) -+ return -EACCES; -+ -+ i = read(fd, buffer, SMACKFILELINE); -+ close(fd); -+ -+ if (i <= 0 || i >= len) -+ return -ERANGE; -+ buffer[i] = '\0'; -+ strcpy(result, buffer); -+ return 0; -+} -+ -+int smack_to_file(const char *path, const char *smack, int follow) -+{ -+ if (follow) -+ return setxattr(path, SMACKATTR, smack, strlen(smack)+1, 0); -+ return lsetxattr(path, SMACKATTR, smack, strlen(smack)+1, 0); -+} -+ -+int smack_to_proc(const int pid, const char *smack) -+{ -+ char path[SMACKFILELINE]; -+ int fd; -+ int i; -+ int slen; -+ -+ slen = strlen(smack) + 1; -+ if (slen >= SMACKBUFFSIZE) -+ return -ERANGE; -+ -+ sprintf(path, SMACKPROCPATH, (pid < 0) ? getpid() : pid); -+ -+ fd = open(path, O_RDWR); -+ if (fd < 0) -+ return -EACCES; -+ -+ i = write(fd, smack, slen); -+ close(fd); -+ -+ if (i != slen) -+ return -EINVAL; -+ return 0; -+} -+ -+int smack_user_default(const char *user, char *result, int len) -+{ -+ char line[SMACKFILELINE]; -+ char ruser[SMACKFILELINE]; -+ char rsmack[SMACKFILELINE]; -+ FILE *fp; -+ -+ fp = fopen(bb_path_smack_user, "r"); -+ if (fp == NULL) -+ return -ENOENT; -+ -+ while (fgets(line, SMACKFILELINE, fp) != NULL) { -+ if (line[0] == '#' || line[0] == '\n') -+ continue; -+ if (sscanf(line, "%s %s", ruser, rsmack) != 2) -+ continue; -+ if (strcmp(ruser, user) != 0) -+ continue; -+ if (strlen(rsmack) >= len) -+ return -ERANGE; -+ strcpy(result, rsmack); -+ return 0; -+ } -+ return -ENOENT; -+} -+ -+int smack_user_allowed(const char *user, const char *smack) -+{ -+ char line[SMACKFILELINE]; -+ char *ruser; -+ char *rsmack; -+ FILE *fp; -+ int rc = 1; -+ -+ fp = fopen(SMACKUSERFILE, "r"); -+ if (fp == NULL) -+ return -ENOENT; -+ -+ while (rc == 1 && fgets(line, SMACKFILELINE, fp) != NULL) { -+ if (line[0] == '#' || line[0] == '\n') -+ continue; -+ -+ ruser = strtok(line, " \t\n"); -+ if (ruser == NULL) -+ continue; -+ -+ if (strcmp(ruser, user) != 0) -+ continue; -+ -+ while (rc == 1 && (rsmack = strtok(NULL, " \t\n")) != NULL) { -+ if (strcmp(rsmack, smack) == 0 || strcmp(rsmack, "+") == 0) -+ rc = 0; -+ } -+ } -+ fclose(fp); -+ return (rc == 1) ? -ENOENT : rc; -+} -+ -+int smack_user_add(const char *user, const char *smack) -+{ -+ char line[SMACKFILELINE]; -+ char *ruser; -+ FILE *fp; -+ int rc = 0; -+ -+ fp = fopen(SMACKUSERFILE, "a+"); -+ if (fp == NULL) -+ return -ENOENT; -+ -+ while (fgets(line, SMACKFILELINE, fp) != NULL) { -+ if (line[0] == '#' || line[0] == '\n') -+ continue; -+ -+ ruser = strtok(line, " \t\n"); -+ if (ruser == NULL) -+ continue; -+ -+ if (strcmp(ruser, user) == 0) { -+ rc = -EEXIST; -+ break; -+ } -+ } -+ -+ if (rc == 0) -+ fprintf(fp, "%s %s\n", user, smack); -+ -+ fclose(fp); -+ return rc; -+} -diff -uprN busybox-1.17.1/loginutils/adduser.c busybox-1.17.1-smack/loginutils/adduser.c ---- busybox-1.17.1/loginutils/adduser.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/loginutils/adduser.c 2011-08-17 15:27:12.909107701 -0700 -@@ -112,6 +112,7 @@ int adduser_main(int argc UNUSED_PARAM, - const char *usegroup = NULL; - char *p; - unsigned opts; -+ IF_SMACK(const char *smack = SMACKSTAR;) - - #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS - applet_long_options = adduser_longopts; -@@ -130,10 +131,10 @@ int adduser_main(int argc UNUSED_PARAM, - /* disable interactive passwd for system accounts */ - opt_complementary = "=1:SD:u+"; - if (sizeof(pw.pw_uid) == sizeof(int)) { -- opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &pw.pw_uid); -+ opts = getopt32(argv, "h:g:s:G:DSHu:" IF_SMACK("L:"), &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &pw.pw_uid IF_SMACK(, &smack) ); - } else { - unsigned uid; -- opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid); -+ opts = getopt32(argv, "h:g:s:G:DSHu:" IF_SMACK("L:"), &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid IF_SMACK(, &smack) ); - if (opts & OPT_UID) { - pw.pw_uid = uid; - } -@@ -220,6 +221,14 @@ int adduser_main(int argc UNUSED_PARAM, - bb_simple_perror_msg(pw.pw_dir); - } - } -+#if ENABLE_SMACK -+ if (smack_user_add(pw.pw_name, smack) < 0) -+ bb_error_msg("cannot add user smack entry"); -+ if (strtok(smack, " \t") != NULL) -+ if (smack_to_file(pw.pw_dir, smack, 0) != 0) -+ bb_error_msg("cannot set smack on home directory"); -+#endif -+ - - if (!(opts & OPT_DONT_SET_PASS)) { - /* interactively set passwd */ -diff -uprN busybox-1.17.1/loginutils/login.c busybox-1.17.1-smack/loginutils/login.c ---- busybox-1.17.1/loginutils/login.c 2010-07-24 15:12:43.000000000 -0700 -+++ busybox-1.17.1-smack/loginutils/login.c 2011-08-17 15:27:12.909107701 -0700 -@@ -218,6 +218,7 @@ int login_main(int argc UNUSED_PARAM, ch - struct passwd pwdstruct; - char pwdbuf[256]; - #endif -+ IF_SMACK(char smack[SMACKBUFFSIZE];) - - username[0] = '\0'; - signal(SIGALRM, alarm_handler); -@@ -376,6 +377,13 @@ int login_main(int argc UNUSED_PARAM, ch - die_if_nologin(); - - IF_SELINUX(initselinux(username, full_tty, &user_sid)); -+#if ENABLE_SMACK -+ if (smack_user_default(pw->pw_name, smack, SMACKBUFFSIZE) < 0) -+ strcpy(smack, SMACKFLOOR); -+ if (smack_to_proc(-1, smack) < 0) -+ bb_perror_msg_and_die("cannot set smack"); -+#endif -+ - - /* Try these, but don't complain if they fail. - * _f_chown is safe wrt race t=ttyname(0);...;chown(t); */ -diff -uprN busybox-1.17.1/loginutils/su.c busybox-1.17.1-smack/loginutils/su.c ---- busybox-1.17.1/loginutils/su.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/loginutils/su.c 2011-08-18 15:13:07.830115065 -0700 -@@ -44,6 +44,7 @@ int su_main(int argc UNUSED_PARAM, char - const char *tty; - char user_buf[64]; - const char *old_user; -+ IF_SMACK(char smack[SMACKBUFFSIZE];) - - flags = getopt32(argv, "mplc:s:", &opt_command, &opt_shell); - //argc -= optind; -@@ -129,6 +130,13 @@ int su_main(int argc UNUSED_PARAM, char - + (!(flags & SU_OPT_mp) * SETUP_ENV_CHANGEENV), - pw); - IF_SELINUX(set_current_security_context(NULL);) -+#if ENABLE_SMACK -+ if (smack_from_proc(-1, smack, SMACKBUFFSIZE) < 0) -+ bb_error_msg_and_die("cannot identify process smack"); -+ if (smack_user_allowed(pw->pw_name, smack) < 0) -+ bb_error_msg_and_die("new usr not allowed current smack"); -+#endif -+ - - /* Never returns */ - run_shell(opt_shell, flags & SU_OPT_l, opt_command, (const char**)argv); -diff -uprN busybox-1.17.1/loginutils/sulogin.c busybox-1.17.1-smack/loginutils/sulogin.c ---- busybox-1.17.1/loginutils/sulogin.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/loginutils/sulogin.c 2011-08-17 15:27:12.909107701 -0700 -@@ -26,6 +26,7 @@ int sulogin_main(int argc UNUSED_PARAM, - char buffer[256]; - struct spwd spw; - #endif -+ IF_SMACK(char smack[SMACKBUFFSIZE];) - - logmode = LOGMODE_BOTH; - openlog(applet_name, 0, LOG_AUTH); -@@ -97,6 +98,11 @@ int sulogin_main(int argc UNUSED_PARAM, - bb_info_msg("System Maintenance Mode"); - - IF_SELINUX(renew_current_security_context()); -+#if ENABLE_SMACK -+ if (smack_to_proc(-1, SMACKFLOOR) < 0) -+ bb_error_msg("login incorrect"); -+#endif -+ - - shell = getenv("SUSHELL"); - if (!shell) -diff -uprN busybox-1.17.1/Makefile busybox-1.17.1-smack/Makefile ---- busybox-1.17.1/Makefile 2010-07-24 15:13:44.000000000 -0700 -+++ busybox-1.17.1-smack/Makefile 2011-08-17 15:27:12.909107701 -0700 -@@ -482,6 +482,7 @@ libs-y := \ - runit/ \ - selinux/ \ - shell/ \ -+ smack/ \ - sysklogd/ \ - util-linux/ \ - util-linux/volume_id/ \ -diff -uprN busybox-1.17.1/miscutils/crond.c busybox-1.17.1-smack/miscutils/crond.c ---- busybox-1.17.1/miscutils/crond.c 2010-07-24 15:12:43.000000000 -0700 -+++ busybox-1.17.1-smack/miscutils/crond.c 2011-08-17 15:27:12.909107701 -0700 -@@ -906,6 +906,7 @@ static void RunJob(const char *user, Cro - { - struct passwd *pas; - pid_t pid; -+ IF_SMACK(char smack[SMACKBUFFSIZE];) - - /* prepare things before vfork */ - pas = getpwnam(user); -@@ -919,6 +920,16 @@ static void RunJob(const char *user, Cro - pid = vfork(); - if (pid == 0) { - /* CHILD */ -+#if ENABLE_SMACK -+ if (smack_user_default(user, smack, SMACKBUFFSIZE) < 0) { -+ crondlog("\024user %s default smack unknown\n", user); -+ exit(0); -+ } -+ if (smack_to_proc(-1, smack) < 0) { -+ crondlog("\024user %s smack unsettable\n", user); -+ exit(0); -+ } -+#endif - /* change running state to the user in question */ - ChangeUser(pas); - if (DebugOpt) { -diff -uprN busybox-1.17.1/miscutils/crontab.c busybox-1.17.1-smack/miscutils/crontab.c ---- busybox-1.17.1/miscutils/crontab.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/miscutils/crontab.c 2011-08-17 15:27:12.909107701 -0700 -@@ -77,6 +77,10 @@ int crontab_main(int argc UNUSED_PARAM, - int fd; - int src_fd; - int opt_ler; -+#if ENABLE_SMACK -+ char psmack[SMACKBUFFSIZE]; -+ char dsmack[SMACKBUFFSIZE]; -+#endif - - /* file [opts] Replace crontab from file - * - [opts] Replace crontab from stdin -@@ -120,6 +124,15 @@ int crontab_main(int argc UNUSED_PARAM, - if ((opt_ler - 1) & opt_ler) /* more than one bit set? */ - bb_show_usage(); - -+#if ENABLE_SMACK -+ if (smack_user_default(pas->pw_name, dsmack, SMACKBUFFSIZE) < 0) -+ bb_perror_msg_and_die("user default smack unknown"); -+ if (smack_from_proc(-1, psmack, SMACKBUFFSIZE) < 0) -+ bb_perror_msg_and_die("user default smack unknown"); -+ if (strcmp(dsmack, psmack) != 0) -+ bb_perror_msg_and_die("current smack is not default smack"); -+#endif -+ - /* Read replacement file under user's UID/GID/group vector */ - src_fd = STDIN_FILENO; - if (!opt_ler) { /* Replace? */ -diff -uprN busybox-1.17.1/procps/ps.c busybox-1.17.1-smack/procps/ps.c ---- busybox-1.17.1/procps/ps.c 2010-07-05 19:25:54.000000000 -0700 -+++ busybox-1.17.1-smack/procps/ps.c 2011-08-18 17:28:10.070210464 -0700 -@@ -25,7 +25,12 @@ enum { MAX_WIDTH = 2*1024 }; - #if ENABLE_SELINUX - #define SELINUX_O_PREFIX "label," - #define DEFAULT_O_STR (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args") --#else -+#endif -+#if ENABLE_SMACK -+#define SMACK_O_PREFIX "label," -+#define DEFAULT_O_STR (SMACK_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args") -+#endif -+#if !ENABLE_SELINUX && !ENABLE_SMACK - #define DEFAULT_O_STR ("pid,user" IF_FEATURE_PS_TIME(",time") ",args") - #endif - -@@ -288,6 +293,13 @@ static void func_label(char *buf, int si - } - #endif - -+#if ENABLE_SMACK -+static void func_label(char *buf, int size, const procps_status_t *ps) -+{ -+ safe_strncpy(buf, ps->smack[0] ? ps->smack : "?", size+1); -+} -+#endif -+ - /* - static void func_nice(char *buf, int size, const procps_status_t *ps) - { -@@ -327,6 +339,9 @@ static const ps_out_t out_spec[] = { - #if ENABLE_SELINUX - { 35 , "label" ,"LABEL" ,func_label ,PSSCAN_CONTEXT }, - #endif -+#if ENABLE_SMACK -+ { 24 , "label" ,"LABEL" ,func_label ,PSSCAN_SMACK }, -+#endif - }; - - static ps_out_t* new_out_t(void) -@@ -516,6 +531,12 @@ int ps_main(int argc UNUSED_PARAM, char - strcpy(default_o, DEFAULT_O_STR + sizeof(SELINUX_O_PREFIX)-1); - } else - #endif -+#if ENABLE_SMACK -+ if (!(opt & 1)) { -+ /* no -Z : do not show LABEL */ -+ strcpy(default_o, DEFAULT_O_STR + sizeof(SMACK_O_PREFIX) -1); -+ } else -+#endif - { - strcpy(default_o, DEFAULT_O_STR); - } -@@ -557,17 +578,17 @@ int ps_main(int argc UNUSED_PARAM, char - | PSSCAN_STATE | PSSCAN_VSZ | PSSCAN_COMM; - unsigned terminal_width IF_NOT_FEATURE_PS_WIDE(= 79); - enum { -- OPT_Z = (1 << 0) * ENABLE_SELINUX, -- OPT_T = (1 << ENABLE_SELINUX) * ENABLE_FEATURE_SHOW_THREADS, -+ OPT_Z = (1 << 0) * (ENABLE_SELINUX | ENABLE_SMACK), -+ OPT_T = (1 << (ENABLE_SELINUX | ENABLE_SMACK)) * ENABLE_FEATURE_SHOW_THREADS, - }; - int opts = 0; - /* If we support any options, parse argv */ --#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE -+#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_SMACK - # if ENABLE_FEATURE_PS_WIDE - /* -w is a bit complicated */ - int w_count = 0; - opt_complementary = "-:ww"; -- opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")"w", &w_count); -+ opts = getopt32(argv, IF_SELINUX("Z")IF_SMACK("Z")IF_FEATURE_SHOW_THREADS("T")"w", &w_count); - /* if w is given once, GNU ps sets the width to 132, - * if w is given more than once, it is "unlimited" - */ -@@ -582,7 +603,7 @@ int ps_main(int argc UNUSED_PARAM, char - # else - /* -w is not supported, only -Z and/or -T */ - opt_complementary = "-"; -- opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")); -+ opts = getopt32(argv, IF_SELINUX("Z")IF_SMACK("Z")IF_FEATURE_SHOW_THREADS("T")); - # endif - #endif - -@@ -593,6 +614,13 @@ int ps_main(int argc UNUSED_PARAM, char - puts(" PID CONTEXT STAT COMMAND"); - } else - #endif -+#if ENABLE_SMACK -+ if (opts & OPT_Z) { -+ psscan_flags = PSSCAN_PID | PSSCAN_SMACK -+ | PSSCAN_STATE | PSSCAN_COMM; -+ puts(" PID CONTEXT STAT COMMAND"); -+ } else -+#endif - { - puts(" PID USER VSZ STAT COMMAND"); - } -@@ -611,6 +639,14 @@ int ps_main(int argc UNUSED_PARAM, char - p->state); - } else - #endif -+#if ENABLE_SMACK -+ if (psscan_flags & PSSCAN_SMACK) { -+ len = printf("%5u %-24.24s %s ", -+ p->pid, -+ p->smack ? p->smack : "unknown", -+ p->state); -+ } else -+#endif - { - const char *user = get_cached_username(p->uid); - //if (p->vsz == 0) -diff -uprN busybox-1.17.1/smack/Config.src busybox-1.17.1-smack/smack/Config.src ---- busybox-1.17.1/smack/Config.src 1969-12-31 16:00:00.000000000 -0800 -+++ busybox-1.17.1-smack/smack/Config.src 2011-08-18 11:19:44.669950186 -0700 -@@ -0,0 +1,40 @@ -+# -+# For a description of the syntax of this configuration file, -+# see scripts/kbuild/config-language.txt. -+# -+ -+menu "Smack Utilities" -+ depends on SMACK -+ -+INSERT -+ -+config SMACKLOAD -+ bool "smackload" -+ default n -+ depends on SMACK -+ help -+ Enable support to load Smack access rules. -+ -+config SMACKCIPSO -+ bool "smackcipso" -+ default n -+ depends on SMACK -+ help -+ Enable support to specify Smack CIPSO mappings. -+ -+config NEWSMACK -+ bool "newsmack" -+ default n -+ depends on SMACK -+ help -+ Enable support to run command with specified Smack label. -+ -+config SMACKENABLED -+ bool "smackenabled" -+ default n -+ depends on SMACK -+ help -+ Enable support for this command to be used within shell scripts -+ to determine if smack is enabled. -+ -+endmenu -diff -uprN busybox-1.17.1/smack/Kbuild.src busybox-1.17.1-smack/smack/Kbuild.src ---- busybox-1.17.1/smack/Kbuild.src 1969-12-31 16:00:00.000000000 -0800 -+++ busybox-1.17.1-smack/smack/Kbuild.src 2011-08-19 13:22:11.301054005 -0700 -@@ -0,0 +1,14 @@ -+# Makefile for busybox -+# -+# Copyright (C) 1999-2005 by Erik Andersen

Orphaned process groups

Index of "); - fmt_html(QUERY_STRING); + fmt_html(location); fmt_str( "