Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'busybox' into merge | Ron Yorston | 2014-01-02 | 1 | -1/+1 | |
|\| | | | | | | | | | | | Conflicts: archival/Config.src shell/ash.c | |||||
| * | fix failures found by randomconfig builds | Denys Vlasenko | 2013-12-31 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge branch 'busybox' into merge | Ron Yorston | 2013-08-27 | 1 | -2/+0 | |
|\| | ||||||
| * | Move create_icmp[6]_socket to its only user, and simplify it | Denys Vlasenko | 2013-06-28 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta run_applet_and_exit 711 714 +3 sendping_tail 239 236 -3 common_ping_main 1798 1770 -28 create_icmp_socket 65 - -65 create_icmp6_socket 65 - -65 ------------------------------------------------------------------------------ (add/remove: 0/4 grow/shrink: 1/2 up/down: 3/-161) Total: -158 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit '1_20_0' into merge | Ron Yorston | 2012-04-23 | 1 | -0/+1 | |
|\| | ||||||
| * | fix build breakage found by randconfig | Denys Vlasenko | 2012-04-20 | 1 | -0/+1 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge | Ron Yorston | 2012-03-23 | 1 | -0/+6 | |
|\| | | | | | | | | | | | Conflicts: Makefile.flags scripts/basic/fixdep.c | |||||
| * | networking: consolidate the IP checksum code. -129 bytes. | Baruch Siach | 2011-09-07 | 1 | -0/+6 | |
| | | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge | Ron Yorston | 2012-03-22 | 1 | -0/+9 | |
|\| | | | | | | | | | Conflicts: include/platform.h | |||||
| * | platform.h: tweaks for cygwin | Denys Vlasenko | 2011-07-08 | 1 | -1/+9 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge | Ron Yorston | 2012-03-22 | 1 | -3/+1 | |
|\| | | | | | | | | | Conflicts: procps/ps.c | |||||
| * | parse_config: make test applet easier to enable; fix its code | Denys Vlasenko | 2011-06-18 | 1 | -1/+0 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
| * | only compile obscure.c when needed | Dan Fandrich | 2011-06-03 | 1 | -2/+1 | |
| | | | | | | | | | | Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge | Ron Yorston | 2012-03-22 | 1 | -1/+0 | |
|\| | | | | | | | | | | | | | Conflicts: coreutils/ls.c include/platform.h libbb/bb_basename.c | |||||
| * | find: cater for libc w/o FNM_CASEFOLD | Denys Vlasenko | 2011-05-23 | 1 | -1/+0 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge | Ron Yorston | 2012-03-21 | 1 | -1/+2 | |
|\| | | | | | | | | | | | | | Conflicts: include/platform.h libbb/Kbuild.src libbb/messages.c | |||||
| * | FreeBSD compat for match_fstype | Chris Rees | 2011-01-24 | 1 | -1/+2 | |
| | | | | | | | | | | Signed-off-by: Chris Rees <utisoft@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Include safe_gethostname() | Daniel Klessing | 2011-11-21 | 1 | -1/+1 | |
| | | | | | | | | | | Fixed compilation under mingw32 by making safe_gethostname.c globally available, as the compiler couldn't find safe_gethostname() | |||||
* | | Merge remote-tracking branch 'upstream/master' | Nguyễn Thái Ngọc Duy | 2011-01-04 | 1 | -0/+1 | |
|\| | ||||||
| * | fixes for bugs discovered by randomconfig builds and tests | Denys Vlasenko | 2010-11-22 | 1 | -0/+1 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge commit 'b5aa1d95a158683d936ea41eed0513aa20ed2e74' | Nguyễn Thái Ngọc Duy | 2011-01-04 | 1 | -2/+2 | |
|\| | | | | | | | | | Conflicts: libbb/Kbuild.src | |||||
| * | libbb/hash_sha.c -> libbb/hash_md5_sha.c | Denys Vlasenko | 2010-10-18 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | |||||
* | | Merge commit 'eb7fe6dbf5bc93a229379a8047539dd8b90e0974' | Nguyễn Thái Ngọc Duy | 2011-01-04 | 1 | -1/+0 | |
|\| | | | | | | | | | Conflicts: libbb/Kbuild.src | |||||
| * | libbb: move md5 and shaN into a common source file. no code changes | Denys Vlasenko | 2010-10-18 | 1 | -1/+0 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | |||||
* | | Merge commit 'eb7fe6dbf5bc93a229379a8047539dd8b90e0974^' | Nguyễn Thái Ngọc Duy | 2011-01-04 | 1 | -0/+1 | |
|\| | ||||||
| * | *: deinline SWAP_xE64 on 32-bit CPUs. Wins !90 bytes both on 32 and 64 bits | Denys Vlasenko | 2010-10-18 | 1 | -0/+1 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | |||||
* | | Merge commit '06f719fd79fe15ce6fd5431bc58fcb22851de24d' | Nguyễn Thái Ngọc Duy | 2011-01-04 | 1 | -3/+3 | |
|\| | | | | | | | | | Conflicts: libbb/Kbuild.src | |||||
| * | libbb: rename hash source files. no code changes | Denys Vlasenko | 2010-10-18 | 1 | -3/+3 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | |||||
* | | win32: re-enable xconnect.c | Nguyễn Thái Ngọc Duy | 2010-09-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -1/+0 | |
|\| | | | | | | | | | | | Conflicts: include/libbb.h libbb/messages.c | |||||
| * | better shared strings trick | Denys Vlasenko | 2010-09-01 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | text data bss dec hex filename 861980 441 7540 869961 d4649 busybox_old 861914 441 7540 869895 d4607 busybox_unstripped Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | |||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -1/+1 | |
|\| | ||||||
| * | *: make GNU licensing statement forms more regular | Denys Vlasenko | 2010-08-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -0/+3 | |
|\| | ||||||
| * | libbb: factor out common code from mpstat/iostat | Denys Vlasenko | 2010-08-16 | 1 | -0/+3 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -4/+2 | |
|\| | ||||||
| * | libbb: reduce number of *error_msg[_and_die].c files by four | Denys Vlasenko | 2010-07-04 | 1 | -4/+0 | |
| | | | | | | | | | | | | No code changes. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
| * | fix compile breakage with "make -j" | Denys Vlasenko | 2010-07-03 | 1 | -0/+2 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -0/+2 | |
|\| | ||||||
| * | *: add INSERTs to *.src files where appropriate | Denys Vlasenko | 2010-06-08 | 1 | -0/+2 | |
| | | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -0/+1 | |
|\| | | | | | | | | | Conflicts: libbb/Kbuild.src | |||||
| * | pipe_progress: make it independent of printf machinery | Denys Vlasenko | 2010-06-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta bb_putchar_stderr - 24 +24 ParseField 494 471 -23 progress_meter 212 188 -24 xargs_main 888 842 -46 pipe_progress_main 151 105 -46 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 0/4 up/down: 24/-139) Total: -115 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | |||||
* | | Merge branch 'origin/master' (early part) | Nguyễn Thái Ngọc Duy | 2010-09-14 | 1 | -14/+15 | |
|/ | ||||||
* | mass renaming Kbuild -> Kbuild.src, Config.in -> Config.src | Denys Vlasenko | 2010-06-04 | 1 | -0/+172 | |
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> |