OSDN Git Service
Chih-Wei Huang [Wed, 27 Apr 2011 07:11:32 +0000 (15:11 +0800)]
fix building issues on honeycomb
The project external/clearsilver is removed in honeycomb.
Chih-Wei Huang [Thu, 9 Jun 2011 09:55:01 +0000 (17:55 +0800)]
enable more applets
* chvt
* deallocvt
* halt
* lzmacat
* openvt
* poweroff
* reboot
* switch_root
* unlzma
Chih-Wei Huang [Thu, 9 Jun 2011 09:45:17 +0000 (17:45 +0800)]
busybox: add missing LOCAL_MODULE_TAGS
Chih-Wei Huang [Thu, 9 Jun 2011 06:57:44 +0000 (14:57 +0800)]
xlseek: large file support
This fixes the issue that mke2fs can't format large disks.
Chih-Wei Huang [Tue, 6 Jul 2010 05:34:33 +0000 (13:34 +0800)]
change KERNEL_MODULES_DIR to be /system/lib/modules
Chih-Wei Huang [Wed, 30 Jun 2010 10:48:02 +0000 (18:48 +0800)]
fix a compiling issue on x86
Denys Vlasenko [Sun, 22 Aug 2010 07:28:46 +0000 (07:28 +0000)]
Fix an annoying Makefile error message while building
When running make (for anything from the top dir), it always complains
like that a few times (try to google this string!):
Makefile:1279: *** mixed implicit and normal rules.
Apparently, GNU make 3.83 doesn't like a particular piece of Makefile.
Note that somehow busybox is still buildable w/o this patch, it's
probably because either its top Makefile is not being used for build.
But it is read when we run make from top dir and it spits the ugly error.
The fix is already there in the busybox git:
https://bugs.busybox.net/show_bug.cgi?id=2323
http://kan.gd/43n
Below is the original changelog message:
build system: make 3.82 fix. Closes bug 2323
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Change-Id: If1cc080748bd7634812920478a70ea316149526c
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Austen Dicken [Wed, 9 Mar 2011 19:38:56 +0000 (13:38 -0600)]
fix modprobe for android
modprobe typically looks for modules under a folder specific to
the kernel version that they were built against (namely
DEFAULT_MODULE_DIR/$(uname -r)), but this is broken on some devices
that simply place the modules under DEFAULT_MODULE_DIR. This patch
tells modprobe to verify that DEFAULT_MODULE_DIR/$(uname -r) exists
prior to attempting to xchdir to it. If the folder exists, it moves
into it and loads modules from there, if not, it remains in
DEFAULT_MODULE_DIR and attempts to load modules from there.
Change-Id: I42e8b09916928c1530a76615768913227ed76ea5
David Kohen [Thu, 3 Mar 2011 14:20:28 +0000 (16:20 +0200)]
Made it so scripts without shebangs will work on Android
Basically, busybox has a default shell setting that I changed when ANDROID is defined
Change-Id: Ie6dcee76d6169d50144f7bb79a4fcb2458cb0fe5
Giulio Cervera [Fri, 7 Jan 2011 19:04:44 +0000 (20:04 +0100)]
busybox: enable mount label for ext
Change-Id: If8e7809c3796391d218d072e56b9bb1548b43c99
Koushik Dutta [Sun, 19 Dec 2010 06:17:08 +0000 (22:17 -0800)]
Busybox fixes.
Change-Id: Ia89730b617086dfadd58cd0863cbd200ac6c4f79
Koushik Dutta [Sat, 18 Dec 2010 03:44:41 +0000 (19:44 -0800)]
Fix up mass string formatting fail due to new gcc error levels.
Change-Id: I4899e7f1b57039b22283902fba7953d7fccdb50b
Jason [Mon, 2 Aug 2010 00:46:31 +0000 (20:46 -0400)]
add 'ip rule' to busybox-full config.
This change adds the ability to mess with routing tables in the kernel.
This is useful for default routing all traffic into an openvpn tunnel without
mucking with the main routing table. No static host route for the server,
and no changing the default gateway. Just add a new table with a higher
prio that throws the server ip out and defaults into the vpn tunnel, like so:
$ export VPN_TBL=10
$ ip route add throw ${SERVER_IP} table ${VPN_TBL}
$ ip route add default via ${VPN_GW} dev tap0 table ${VPN_TBL}
$ ip rule add from all lookup ${VPN_TBL} prio 1000
And when the vpn is shut down:
$ ip route flush table ${VPN_TBL}
Neat, huh? ;-)
Signed-off-by: Jason <github@lakedaemon.net>
Koushik Dutta [Thu, 1 Jul 2010 06:18:25 +0000 (23:18 -0700)]
froyo added more stubs that need to be worked around.
Koushik Dutta [Mon, 28 Jun 2010 16:07:46 +0000 (09:07 -0700)]
include files necessary to build on stock bionic, if CYANOGEN_BIONIC is not present
Koushik Dutta [Sun, 27 Jun 2010 05:06:01 +0000 (22:06 -0700)]
fixes to make busybox work on stock froyo bionic
Michael Casadevall [Thu, 24 Jun 2010 05:08:10 +0000 (01:08 -0400)]
Fixed failure to build of busybox due to conflicting symbols
with bionic by renaming said symbols in busybox. Also removed an
unnecessary typedef for bionic
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
Steve Kondik [Fri, 18 Jun 2010 13:56:43 +0000 (09:56 -0400)]
Merge branch 'master' of git://github.com/dylex/android_external_busybox into HEAD
Conflicts:
Android.mk
Makefile
editors/diff.c
Dylan Simon [Tue, 15 Jun 2010 22:50:34 +0000 (18:50 -0400)]
Merge 1.16.2 remote branch 'remotes/busybox/1_16_stable'
Conflicts:
Makefile
Denys Vlasenko [Sat, 12 Jun 2010 13:52:00 +0000 (15:52 +0200)]
bump version to 1.16.2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Sat, 12 Jun 2010 13:51:29 +0000 (15:51 +0200)]
post-1.16.1 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Steve Kondik [Tue, 30 Mar 2010 13:09:17 +0000 (09:09 -0400)]
Revert "autoconf.h: enable color ls by default"
This reverts commit
df4c16eaf6259b155a75774b7ec6e464992d6dd6.
Steve Kondik [Thu, 1 Apr 2010 13:37:16 +0000 (09:37 -0400)]
Revert "ash will search for a .profile on /sd-ext."
This reverts commit
45564e730194b4e6b60e2c22528757bba408ba7c.
Not needed, can be done without source changes.
Steve Kondik [Tue, 30 Mar 2010 19:22:23 +0000 (15:22 -0400)]
ash will search for a .profile on /sd-ext.
Patch from gleam via koush.
Steve Kondik [Tue, 30 Mar 2010 13:09:17 +0000 (09:09 -0400)]
Revert "autoconf.h: enable color ls by default"
This reverts commit
df4c16eaf6259b155a75774b7ec6e464992d6dd6.
Dylan Simon [Mon, 29 Mar 2010 02:37:51 +0000 (22:37 -0400)]
Merge 1.16.1 remote branch 'remotes/busybox/1_16_stable'
Conflicts:
Makefile
editors/diff.c
Denys Vlasenko [Sun, 28 Mar 2010 18:01:31 +0000 (20:01 +0200)]
apply post-1.16.0 fixes, bump version to 1.16.1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Dylan Simon [Mon, 29 Mar 2010 02:37:51 +0000 (22:37 -0400)]
Merge 1.16.1 remote branch 'remotes/busybox/1_16_stable'
Conflicts:
Makefile
editors/diff.c
Denys Vlasenko [Sun, 28 Mar 2010 18:01:31 +0000 (20:01 +0200)]
apply post-1.16.0 fixes, bump version to 1.16.1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Dylan Simon [Sat, 27 Mar 2010 04:06:34 +0000 (00:06 -0400)]
Allow multiple configurations to support minimal libbusybox for recovery
Dylan Simon [Sat, 27 Mar 2010 04:06:34 +0000 (00:06 -0400)]
Allow multiple configurations to support minimal libbusybox for recovery
Chih-Wei Huang [Thu, 18 Mar 2010 06:20:55 +0000 (14:20 +0800)]
Android.mk: fix compiling warnings about gcc
Chih-Wei Huang [Thu, 18 Mar 2010 04:50:33 +0000 (12:50 +0800)]
enable color ls by default
Steve Kondik [Wed, 24 Mar 2010 20:03:08 +0000 (16:03 -0400)]
Merge branch 'master' of git://github.com/koush/android_external_busybox
Chih-Wei Huang [Thu, 18 Mar 2010 06:20:55 +0000 (14:20 +0800)]
Android.mk: fix compiling warnings about gcc
Chih-Wei Huang [Thu, 18 Mar 2010 04:50:33 +0000 (12:50 +0800)]
autoconf.h: enable color ls by default
Koushik K. Dutta [Wed, 24 Mar 2010 06:46:37 +0000 (23:46 -0700)]
do not build libbusybox with this config
Steve Kondik [Tue, 23 Mar 2010 15:08:17 +0000 (11:08 -0400)]
Add a script to update headers and links.
Steve Kondik [Tue, 23 Mar 2010 14:56:12 +0000 (10:56 -0400)]
Enabled ntpd and dnsd applets.
Steve Kondik [Tue, 23 Mar 2010 15:08:17 +0000 (11:08 -0400)]
Add a script to update headers and links.
Steve Kondik [Tue, 23 Mar 2010 14:56:12 +0000 (10:56 -0400)]
Enabled ntpd and dnsd applets.
Steve Kondik [Sun, 14 Mar 2010 18:38:07 +0000 (14:38 -0400)]
Enable brctl and update configuration
Steve Kondik [Sun, 14 Mar 2010 18:42:42 +0000 (14:42 -0400)]
Merge branch 'master' of git@github.com:cyanogen/android_external_busybox
Steve Kondik [Sun, 14 Mar 2010 18:38:07 +0000 (14:38 -0400)]
Enable brctl and update configuration
Steve Kondik [Sun, 14 Mar 2010 18:38:07 +0000 (14:38 -0400)]
Enable brctl and update configuration
Koushik K. Dutta [Wed, 3 Mar 2010 08:43:15 +0000 (00:43 -0800)]
merge busybox and other tools into recovery.
Koushik K. Dutta [Wed, 3 Mar 2010 08:43:15 +0000 (00:43 -0800)]
merge busybox and other tools into recovery.
Koushik K. Dutta [Sat, 13 Feb 2010 23:46:27 +0000 (15:46 -0800)]
build a static busybox for the recovery system
Fixed so that both binaries are not statically linked from using the same intermediate symbols file.
Koushik K. Dutta [Mon, 22 Feb 2010 23:08:33 +0000 (15:08 -0800)]
fix build
Koushik K. Dutta [Mon, 22 Feb 2010 20:22:21 +0000 (12:22 -0800)]
dont use bionic getmntent
Koushik K. Dutta [Sun, 21 Feb 2010 09:05:11 +0000 (01:05 -0800)]
fix up name to match convention
Koushik K. Dutta [Tue, 16 Feb 2010 21:35:50 +0000 (13:35 -0800)]
Remove the symlink generation stuff, that is handled by the recovery image process now
Koushik K. Dutta [Sat, 13 Feb 2010 23:46:27 +0000 (15:46 -0800)]
build a static busybox for the recovery system
Dylan Simon [Sun, 7 Feb 2010 22:36:36 +0000 (17:36 -0500)]
Add a couple features to help testcases pass
This completes fix set from 1.16.0 merge
Dylan Simon [Sun, 7 Feb 2010 22:35:48 +0000 (17:35 -0500)]
android-specific testcase fixes
Dylan Simon [Sun, 7 Feb 2010 22:34:41 +0000 (17:34 -0500)]
Change tmpfile path for diff to /data/local/tmp
Dylan Simon [Sun, 7 Feb 2010 22:33:59 +0000 (17:33 -0500)]
Fix tail: +N with N > file length test
Dylan Simon [Sun, 7 Feb 2010 07:04:10 +0000 (02:04 -0500)]
Fix ifconfig crash due to incorrect freeaddrinfo semantics
Dylan Simon [Sun, 7 Feb 2010 06:43:45 +0000 (01:43 -0500)]
Workaround error in stdin/global FILE handling
For some reason,
FILE *fp[2] = { (&__sF[0]), (&__sF[0]) };
was making the compiler define a local uninitialized version of __sF
which ended up in the final executable and broke stdio. This seems like
a compiler bug to me.
Dylan Simon [Sun, 7 Feb 2010 06:41:04 +0000 (01:41 -0500)]
Merge remote branch 'busybox/1_16_stable'
Fix compilation issues and update config only. BROKEN.
Conflicts:
Makefile
archival/cpio.c
archival/libunarchive/decompress_unlzma.c
archival/tar.c
coreutils/ls.c
coreutils/uniq.c
findutils/find.c
include/platform.h
libbb/lineedit.c
libbb/xfuncs_printf.c
miscutils/flash_eraseall.c
miscutils/time.c
networking/ftpgetput.c
shell/ash.c
shell/hush.c
shell/hush_test/hush-trap/subshell.right
shell/hush_test/hush-trap/subshell.tests
util-linux/more.c
util-linux/mount.c
Dylan Simon [Fri, 5 Feb 2010 21:53:31 +0000 (16:53 -0500)]
Propegate config update, and clean up nslookup fix
Make android-specific changes conditional and restore original code.
Make nslookup use correct bionic _nres resolver state.
Steve Kondik [Thu, 4 Feb 2010 18:40:25 +0000 (13:40 -0500)]
Update links.
Steve Kondik [Thu, 4 Feb 2010 18:38:31 +0000 (13:38 -0500)]
Enable some extra applets, fix ip & nslookup.
Dylan Simon [Fri, 29 Jan 2010 07:05:26 +0000 (02:05 -0500)]
Make modules dir configurable via makefile var
KERNEL_MODULES_DIR defaults to /system/modules/lib/modules but may be assigned in any vendor/product config.
E.g., I have "KERNEL_MODULES_DIR:=/system/lib/modules" in my product makefile.
Note that there's no makefile dependency so it won't pick up changes, but a clean build will work fine.
Accomplished simplistically by removing CONFIG_DEFAULT_MODULES_DIR from the busybox config system.
Dylan Simon [Thu, 28 Jan 2010 22:45:07 +0000 (17:45 -0500)]
Fix cyanogen module path
cyanogenmod specific: Change module path to /system/modules/lib/modules which it uses rather than the /system/lib/modules I use
Dylan Simon [Thu, 28 Jan 2010 22:39:21 +0000 (17:39 -0500)]
Enable a few more applets
Reenable and fix a few more applets that had been previously been enabled
Dylan Simon [Wed, 27 Jan 2010 19:02:40 +0000 (14:02 -0500)]
Propagated config change into generated files
Steve Kondik [Wed, 27 Jan 2010 13:07:33 +0000 (08:07 -0500)]
Enable LZOP.
Denys Vlasenko [Tue, 26 Jan 2010 07:19:00 +0000 (08:19 +0100)]
Bump version to 1.16.0
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Tue, 26 Jan 2010 07:17:45 +0000 (08:17 +0100)]
modprobe: protect against possible SEGV
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Tue, 26 Jan 2010 07:04:18 +0000 (08:04 +0100)]
whitespace fix
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Mon, 25 Jan 2010 18:30:16 +0000 (19:30 +0100)]
ntpd: explain why scripts can be run in quick succession
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Mon, 25 Jan 2010 12:39:24 +0000 (13:39 +0100)]
whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Mon, 25 Jan 2010 12:24:06 +0000 (13:24 +0100)]
unicode_wcwidth.c: shrink
function old new delta
static.combining1 - 184 +184
in_interval_table - 78 +78
bb_wcwidth 328 406 +78
in_table 78 - -78
static.combining 516 148 -368
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 1/1 up/down: 340/-446) Total: -106 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Mon, 25 Jan 2010 01:00:16 +0000 (02:00 +0100)]
testsuite-discovered fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Sun, 24 Jan 2010 22:33:06 +0000 (23:33 +0100)]
scripts/randomtest: tweaks for non-eliminable warnings and broken static glibc
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Sun, 24 Jan 2010 21:52:21 +0000 (22:52 +0100)]
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Sun, 24 Jan 2010 06:44:03 +0000 (07:44 +0100)]
libbb: better unicode width support. Hopefully fixes bug 839.
Also opens up a possibility to make other unicode stuff smaller
and more correct later. but:
function old new delta
static.combining - 516 +516
bb_wcwidth - 328 +328
unicode_cut_nchars - 141 +141
mbstowc_internal - 93 +93
in_table - 78 +78
cal_main 899 961 +62
static.combining0x10000 - 40 +40
unicode_strlen - 31 +31
bb_mbstrlen 31 - -31
bb_mbstowcs 173 102 -71
------------------------------------------------------------------------------
(add/remove: 7/1 grow/shrink: 1/1 up/down: 1289/-102) Total: 1187 bytes
Uses code of Markus Kuhn, which is in public domain:
http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
"Permission to use, copy, modify, and distribute this software
for any purpose and without fee is hereby granted. The author
disclaims all warranties with regard to this software."
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Sat, 23 Jan 2010 22:37:52 +0000 (23:37 +0100)]
date: introduce FEATURE_DATE_COMPAT; shrink
function old new delta
date_main 889 862 -27
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Bernhard Reutner-Fischer [Sat, 23 Jan 2010 11:52:40 +0000 (12:52 +0100)]
ping: use ICMP_MINLEN
no code changes
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Michael Grzeschik [Sat, 23 Jan 2010 02:40:28 +0000 (03:40 +0100)]
fbset: add possibility to set timing and sync polarity
function old new delta
copy_changed_values - 48 +48
copy_if_gt0 - 27 +27
fbset_main 1268 1235 -33
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/1 up/down: 75/-33) Total: 42 bytes
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Fri, 22 Jan 2010 23:13:32 +0000 (00:13 +0100)]
chown: -2 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Thu, 21 Jan 2010 21:30:25 +0000 (19:30 -0200)]
chown: support long options
function old new delta
chown_longopts - 81 +81
chown_main 182 192 +10
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Fri, 22 Jan 2010 04:10:33 +0000 (05:10 +0100)]
patch: accept and ignore -g NUM
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Thu, 21 Jan 2010 20:58:03 +0000 (18:58 -0200)]
diff: fix flag -B, cleanups and a couple more tests V2
function old new delta
diffreg 1157 1268 +111
uni_range 51 - -51
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Fri, 22 Jan 2010 03:17:07 +0000 (04:17 +0100)]
patch: add more long opts; but remove -g for now
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Dylan Simon [Wed, 20 Jan 2010 06:27:21 +0000 (01:27 -0500)]
Fix various bugs related to filesize vs. off_t
Fix assumptions that sizeof(off_t) == sizeof(stat.st_size). Bionic uses
long long for st_size (since it's actually stat64), while off_t is only
long. This broke tar primarily.
Dylan Simon [Wed, 20 Jan 2010 05:55:39 +0000 (00:55 -0500)]
Disable largefile support
Bionic's off_t is only 32 bits, so it doesn't work anyway.
Dylan Simon [Wed, 20 Jan 2010 05:31:03 +0000 (00:31 -0500)]
Patch over bionic's vfork for now
Bionic's vfork is rather broken, and seems to corrupt the stack,
especially when the parent returns before the child completes. For
now, replace vfork with fork until the issues are sorted out.
Dylan Simon [Wed, 20 Jan 2010 05:33:59 +0000 (00:33 -0500)]
Remove crond, since it doesn't work anyway
Denys Vlasenko [Wed, 20 Jan 2010 01:51:09 +0000 (02:51 +0100)]
*: small code shrinks and compile fix for unicode
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Mikhail Gusarov [Tue, 19 Jan 2010 14:22:30 +0000 (20:22 +0600)]
tar: handle -m (--touch) switch, enabled by FEATURE_TAR_NOPRESERVE_TIME
function old new delta
.rodata 2731 2779 +48
usage_messages 432 471 +39
tar_main 603 614 +11
tar_longopts 211 219 +8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 106/0) Total: 106 bytes
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Tue, 19 Jan 2010 20:44:15 +0000 (18:44 -0200)]
patch: ignore flag -g. +22 bytes
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Tue, 19 Jan 2010 01:34:29 +0000 (23:34 -0200)]
diff: don't exit in case we can't open input files. -2 bytes
>>From
d4cf19d20596bca797d58563f4404cf6a4932977 Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizvekov@gmail.com>
Date: Mon, 18 Jan 2010 23:27:56 -0200
Subject: [PATCH] diff: don't exit in case we can't open input files
This prevents recursion being aborted due to failures to open files.
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Tue, 19 Jan 2010 00:21:40 +0000 (22:21 -0200)]
diff: don't use FILE_and_pos_t where it's not needed. -31 bytes
>>From
3ead41fc3cbdd904e478ff7a710f5960c8ed4288 Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizvekov@gmail.com>
Date: Mon, 18 Jan 2010 22:14:46 -0200
Subject: [PATCH] diff: don't use FILE_and_pos_t where it's not needed. -31 bytes
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Mon, 18 Jan 2010 22:40:23 +0000 (20:40 -0200)]
diff: correct handling of labels. -10 bytes
>>From
05eeb173f0431b4fbed7684d7a9cea42f747f63e Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizvekov@gmail.com>
Date: Mon, 18 Jan 2010 20:33:55 -0200
Subject: [PATCH] diff: correct handling of labels
This fixes an issue where diff would apply labels to files in the
inverse order, when using -L or --label.
This fixes it in order to be compatible with gnu diff.
It also makes it not an error to specify more than one label.
The behavior for such cases is that they override the label for the new
file.
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Mon, 18 Jan 2010 20:40:02 +0000 (18:40 -0200)]
diff: support long options
>>From
7b74284ebe6222cb714c37cdbb94633965f29e9b Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizvekov@gmail.com>
Date: Mon, 18 Jan 2010 18:36:52 -0200
Subject: [PATCH] diff: support long options
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Mon, 18 Jan 2010 18:07:07 +0000 (16:07 -0200)]
diff: implement flag -B (Ignore changes whose lines are all blank)
>>From
7c3ce93213590bd0592435dc27d1272d0fd3309b Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizvekov@gmail.com>
Date: Mon, 18 Jan 2010 15:52:31 -0200
Subject: [PATCH] diff: implement flag -B (Ignore changes whose lines are all blank)
function old new delta
diffreg 1196 1240 +44
.rodata 6538 6561 +23
packed_usage 457 478 +21
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 88/0) Total: 88 bytes
text data bss dec hex filename
70123 733 8576 79432 13648 busybox_old
70190 733 8576 79499 1368b busybox_unstripped
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Matheus Izvekov [Mon, 18 Jan 2010 16:25:46 +0000 (14:25 -0200)]
diff: honor flag -i (ignore case differences)
>>From
503a1e1d2597f7cdf86a9ea39ebd2aee050ca759 Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizvekov@gmail.com>
Date: Mon, 18 Jan 2010 14:06:26 -0200
Subject: [PATCH] diff: honor flag -i (ignore case differences)
function old new delta
read_token 157 178 +21
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 21/0) Total: 21 bytes
text data bss dec hex filename
70102 733 8576 79411 13633 busybox_old
70123 733 8576 79432 13648 busybox_unstripped
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko [Tue, 19 Jan 2010 01:26:38 +0000 (02:26 +0100)]
watch: compat: use stderr to determine screen dimensions
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>