OSDN Git Service
Elliott Hughes [Sat, 12 Nov 2016 02:25:36 +0000 (02:25 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
4be718d62e
am:
c3095b883f
Change-Id: I939c7a1c7a43ad5b692ab084ee5a55a702e2540a
Elliott Hughes [Sat, 12 Nov 2016 02:18:37 +0000 (02:18 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
4be718d62e
Change-Id: Id8298b77e4d0c3402499dbfc079c7f228cab4034
Elliott Hughes [Fri, 11 Nov 2016 23:45:33 +0000 (15:45 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I3a54258f757180bc8a40231ed6a72fc0149943c8
Evgenii Stepanov [Mon, 31 Oct 2016 19:26:11 +0000 (12:26 -0700)]
Fix control flow integrity check failure in ps.
This fixes an indirect function call through a pointer of an
incompatible type.
See http://clang.llvm.org/docs/ControlFlowIntegrity.html for more
details.
Elliott Hughes [Fri, 28 Oct 2016 22:56:01 +0000 (15:56 -0700)]
Implement "dmesg -w".
Annoyingly, this means writing a new dmesg implementation that uses /dev/kmsg
rather than the klogctl system call. Worse, pre-3.5 kernels don't support
that, so we need to keep the old implementation around as long as we still
care about those kernels.
Since I'm here, add the fancy colors from modern dmesg and the -C flag.
Tested on Nexus 9's 3.10 kernel, an Ubuntu 3.13 kernel, and the
Nexus One's 2.6.35 kernel.
Rob Landley [Thu, 27 Oct 2016 04:52:55 +0000 (23:52 -0500)]
Izabera pointed out that split -b -l are exclusive.
Elliott Hughes [Wed, 26 Oct 2016 17:05:05 +0000 (17:05 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
991623dec1
am:
7d37c6e2ff
Change-Id: I9f26b6854b1a09638d3effc21b520dad8d921ebb
Elliott Hughes [Wed, 26 Oct 2016 17:00:35 +0000 (17:00 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
991623dec1
Change-Id: I49da41b2808102bc9c0e4fb8250457968e3332e1
Elliott Hughes [Wed, 26 Oct 2016 16:51:00 +0000 (09:51 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I941b7746e631fd0c69888fa2b8b582dc85b2cb8f
Elliott Hughes [Tue, 25 Oct 2016 22:51:05 +0000 (15:51 -0700)]
Add fallocate -o.
Also improve error reporting.
Elliott Hughes [Tue, 25 Oct 2016 00:14:22 +0000 (17:14 -0700)]
Android O allows '@' in property names.
Bug: http://b/
32371104
Rob Landley [Mon, 24 Oct 2016 23:25:39 +0000 (18:25 -0500)]
Typos.
Rob Landley [Sat, 22 Oct 2016 23:15:09 +0000 (18:15 -0500)]
Tweak help text.
Elliott Hughes [Sat, 22 Oct 2016 18:05:19 +0000 (18:05 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
fb3ebf8f5d
am:
78585ef609
Change-Id: I12629dcffe8b0a84f87955a7c5b7138bae5a09fd
Elliott Hughes [Sat, 22 Oct 2016 18:02:19 +0000 (18:02 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
fb3ebf8f5d
Change-Id: Ic5e554bd996172c794299b2626dff10af65c7793
Elliott Hughes [Sat, 22 Oct 2016 16:12:59 +0000 (09:12 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ief5b3e5e09340c03048048511629f4af38ee16b9
Rob Landley [Fri, 21 Oct 2016 04:14:39 +0000 (23:14 -0500)]
Announce 0.7.2.
Rob Landley [Fri, 21 Oct 2016 03:32:21 +0000 (22:32 -0500)]
Nothing in pending should "default y".
Rob Landley [Fri, 21 Oct 2016 03:30:58 +0000 (22:30 -0500)]
Nothing in pending should "default y".
Rob Landley [Fri, 21 Oct 2016 03:29:10 +0000 (22:29 -0500)]
Close to cutting a release and I don't want to have setfattr in defconfig
without getfattr, so I'm putting it back in pending for now.
Rob Landley [Thu, 20 Oct 2016 21:35:13 +0000 (16:35 -0500)]
Add special "touch -" behavior and require an argument.
Rob Landley [Thu, 20 Oct 2016 20:30:56 +0000 (15:30 -0500)]
Show driver for interface in ifconfig output.
Rob Landley [Thu, 20 Oct 2016 20:29:10 +0000 (15:29 -0500)]
Allow out and escout to be NULL in crunch_str()
Rob Landley [Thu, 20 Oct 2016 20:26:38 +0000 (15:26 -0500)]
Always regenerate config.h for now, so make single and make don't clash.
The problem is that .config and .singleconfig produce the same header file,
so checking that the header is newer than the .config file won't help if
it was last generated from the other file.
Rob Landley [Thu, 20 Oct 2016 01:51:28 +0000 (20:51 -0500)]
More touch tests, and a fix found by one. (The three -t formats can only
reliably be distinguished by checking length, because %H amd %m and such
can match different numbers of digits.)
Elliott Hughes [Thu, 20 Oct 2016 00:24:25 +0000 (00:24 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
5e9108a442
am:
e21288dd9b
Change-Id: I2f792ca97298eb796e325377fc67f57bc0a5eef3
Elliott Hughes [Thu, 20 Oct 2016 00:16:55 +0000 (00:16 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
5e9108a442
Change-Id: I836a48996548b7c2193f122e5ef1df13c76f36f7
Elliott Hughes [Thu, 20 Oct 2016 00:03:06 +0000 (17:03 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I0f0d8078765f95a3092abda819130609b841ac2f
Rob Landley [Tue, 18 Oct 2016 21:52:17 +0000 (16:52 -0500)]
Test infrastructure: collate make "test_single" and "make tests" into common
function, and add $C variable with an absolute path to the command being tested
(you need to call things like printf by path to avoid shell builtins, might as
well be consistent).
Rob Landley [Tue, 18 Oct 2016 21:28:47 +0000 (16:28 -0500)]
Add a printf test that shows a bug.
Rob Landley [Tue, 18 Oct 2016 09:10:01 +0000 (04:10 -0500)]
Unify touch -t and -d handling, allow posix's underspecified "time designator"
T to be a space instead (because the posix says so, no idea why), initialize
default values reliably including zeroing daylight savings time field (which is
handled inconsistently by libc and just screws stuff up).
Rob Landley [Tue, 18 Oct 2016 04:52:51 +0000 (23:52 -0500)]
A few more sed tests.
Rob Landley [Mon, 17 Oct 2016 23:32:35 +0000 (18:32 -0500)]
The recent --help infrastructure fiddling made "toybox --help unknown" segfault
because lookup failure left this->which NULL and error_exit() dereferenced it.
(Oops.)
Elliott Hughes [Tue, 11 Oct 2016 20:03:50 +0000 (13:03 -0700)]
Stop renaming the ADDR field to PC on Android.
It's causing confusion, and it's not obvious that anyone's relying on
it (and even if they are, let's try to find and fix them first).
Rob Landley [Tue, 11 Oct 2016 13:19:41 +0000 (08:19 -0500)]
Make netcat work with nommu and factor out poll() loop into net/net.c.
Elliott Hughes [Mon, 10 Oct 2016 22:41:11 +0000 (22:41 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
64891a65fc am:
8368cdd99f
am:
1954154d9d
Change-Id: Ia4a9aa17adf6d0199ed346c2f2722d7af022d690
Elliott Hughes [Mon, 10 Oct 2016 22:20:42 +0000 (22:20 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
64891a65fc
am:
8368cdd99f
Change-Id: Ie8954cd6ea1141878c4d9b5bd6ea4652d5933493
Elliott Hughes [Mon, 10 Oct 2016 21:59:36 +0000 (21:59 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
64891a65fc
Change-Id: Iba8e51e0b6f1a02d2c80368c68d65dacf1029ea7
Elliott Hughes [Mon, 10 Oct 2016 18:41:47 +0000 (11:41 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I5c32bce3670267f13d5453bc627e2a46b1e570b1
Rob Landley [Sun, 9 Oct 2016 20:35:56 +0000 (15:35 -0500)]
Izabera pointed out that ls defaults to -q when output is a tty.
Rob Landley [Sat, 8 Oct 2016 22:30:50 +0000 (17:30 -0500)]
Teach ps -w not to truncate any fields.
Rob Landley [Sat, 8 Oct 2016 22:27:12 +0000 (17:27 -0500)]
Evgenii Stepanov found a bug where argv0len was set wrong for threads
(no /proc/$PID/cmdline so setting was skipped and previous value retained),
which led to memcpy() with an overlapping source/dest range (annoying asan).
Fix: move temp variable and assignment outside the if() statement so we assign
zero if we can''t read the file.
Rob Landley [Wed, 5 Oct 2016 18:29:55 +0000 (13:29 -0500)]
Explain some generic argument parsing features in toybox --help.
Elliott Hughes [Wed, 5 Oct 2016 04:07:52 +0000 (04:07 +0000)]
Add uudecode/uuencode. am:
eacb349519 am:
d6403b47ef
am:
f71ca9a93a
Change-Id: Ib7bcb1529e38bf9430fee1f1ff820f889a4d332d
Elliott Hughes [Wed, 5 Oct 2016 04:05:53 +0000 (04:05 +0000)]
Add uudecode/uuencode. am:
eacb349519
am:
d6403b47ef
Change-Id: I8fc6b5ba9e01ba404857b296ed62866cea2e3668
Elliott Hughes [Wed, 5 Oct 2016 04:03:22 +0000 (04:03 +0000)]
Add uudecode/uuencode.
am:
eacb349519
Change-Id: Idc00e94d7b2fab07f419c0d55d07756b6734b287
Rob Landley [Tue, 4 Oct 2016 20:08:48 +0000 (15:08 -0500)]
Explain dlist_terminate.
Elliott Hughes [Tue, 4 Oct 2016 16:27:25 +0000 (09:27 -0700)]
Add uudecode/uuencode.
Some firmware flashing scripts rely on sharutils, which rely on
uudecode/uuencode. Since we're several decades too late to expect
anyone to update sharutils to use base64 instead, and POSIX
includes uudecode/uuencode, let's just support them.
Bug: http://b/
31913440
Test: manual
Change-Id: Ia3893de08abfe5b8a8f58349bd298b912fa99e6a
Elliott Hughes [Tue, 4 Oct 2016 02:36:41 +0000 (02:36 +0000)]
Regenerate generated files. am:
591e5474ca am:
62a27179ab
am:
d0b9dce923
Change-Id: I4cd3c52128d55ea76ca79ab6cee25e475248eda6
Elliott Hughes [Tue, 4 Oct 2016 02:36:33 +0000 (02:36 +0000)]
Merge "Add install_airlock target for hermetic build environment setup, and rebuild headers during install to make other install targets robust against single command builds between "make" and "make install" of multiplexer version." am:
f241a4600d am:
8ed45ae4c9
am:
2c24c2f53b
Change-Id: I9bece9a7404cb255619fa667e7b0e8e25332dc9a
Elliott Hughes [Tue, 4 Oct 2016 02:36:23 +0000 (02:36 +0000)]
Merge "du: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32 blocks * 512 bytes, done with unsigned 64 bit math)." am:
fad2309530 am:
b6689367ee
am:
1d9bd9c412
Change-Id: Id4755753dc19ed16f1555164b6fa44bce8992e43
Elliott Hughes [Tue, 4 Oct 2016 02:36:15 +0000 (02:36 +0000)]
Merge "Move --version handling next to --help handling, so it applies to all commands. Say "toybox" before version string. Tweak sed to preserve lie-to-autoconf." am:
28e81a7a2b am:
3f8ebb6a22
am:
33aa11ad0a
Change-Id: I149e850762579cbc3b0213aa1a4e8753fe808ee9
Elliott Hughes [Tue, 4 Oct 2016 02:36:07 +0000 (02:36 +0000)]
Merge "sed -i run as root wasn't preserving ownership." am:
20197847d8 am:
073a48ef6f
am:
11f75a1dce
Change-Id: I59a6064e440aa517ce5422c8f84ba93e81606fd0
Elliott Hughes [Tue, 4 Oct 2016 02:34:23 +0000 (02:34 +0000)]
Regenerate generated files. am:
591e5474ca
am:
62a27179ab
Change-Id: Iff38e20b95eea9f18f2e0fbd4148c80fa13386cd
Elliott Hughes [Tue, 4 Oct 2016 02:34:14 +0000 (02:34 +0000)]
Merge "Add install_airlock target for hermetic build environment setup, and rebuild headers during install to make other install targets robust against single command builds between "make" and "make install" of multiplexer version." am:
f241a4600d
am:
8ed45ae4c9
Change-Id: If071480d85c7d2c70d9294c36833753b5a308a97
Elliott Hughes [Tue, 4 Oct 2016 02:34:05 +0000 (02:34 +0000)]
Merge "du: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32 blocks * 512 bytes, done with unsigned 64 bit math)." am:
fad2309530
am:
b6689367ee
Change-Id: I549cb383c34efebc553926d5acae4fac7861c5eb
Elliott Hughes [Tue, 4 Oct 2016 02:33:57 +0000 (02:33 +0000)]
Merge "Move --version handling next to --help handling, so it applies to all commands. Say "toybox" before version string. Tweak sed to preserve lie-to-autoconf." am:
28e81a7a2b
am:
3f8ebb6a22
Change-Id: I2a840daa016907f71fccff3feefb045a8bb1a61f
Elliott Hughes [Tue, 4 Oct 2016 02:33:50 +0000 (02:33 +0000)]
Merge "sed -i run as root wasn't preserving ownership." am:
20197847d8
am:
073a48ef6f
Change-Id: I22d2f9572297bf648ba4842fc5b23b539e757fac
Elliott Hughes [Tue, 4 Oct 2016 02:32:26 +0000 (02:32 +0000)]
Regenerate generated files.
am:
591e5474ca
Change-Id: I9b3f98f953389c41b4ad0866fa4a1294634c568b
Elliott Hughes [Tue, 4 Oct 2016 02:32:16 +0000 (02:32 +0000)]
Merge "Add install_airlock target for hermetic build environment setup, and rebuild headers during install to make other install targets robust against single command builds between "make" and "make install" of multiplexer version."
am:
f241a4600d
Change-Id: I009724a818f08a2ea9410a6195e435f48d777223
Elliott Hughes [Tue, 4 Oct 2016 02:32:08 +0000 (02:32 +0000)]
Merge "du: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32 blocks * 512 bytes, done with unsigned 64 bit math)."
am:
fad2309530
Change-Id: Ib2dd0d8d17468c8155921d3d97b6e3f1e7722857
Elliott Hughes [Tue, 4 Oct 2016 02:31:59 +0000 (02:31 +0000)]
Merge "Move --version handling next to --help handling, so it applies to all commands. Say "toybox" before version string. Tweak sed to preserve lie-to-autoconf."
am:
28e81a7a2b
Change-Id: Ib65e4c069bc14157fdc9d9d108181579d0560fdf
Elliott Hughes [Tue, 4 Oct 2016 02:31:50 +0000 (02:31 +0000)]
Merge "sed -i run as root wasn't preserving ownership."
am:
20197847d8
Change-Id: Iced27bcf61a099b91b060a370a319bf58987638a
Elliott Hughes [Tue, 4 Oct 2016 02:28:43 +0000 (19:28 -0700)]
Regenerate generated files.
Change-Id: Ieeeba020797fb29851384b76e01e231db3efe755
Elliott Hughes [Tue, 4 Oct 2016 02:27:25 +0000 (02:27 +0000)]
Merge "Add install_airlock target for hermetic build environment setup, and rebuild headers during install to make other install targets robust against single command builds between "make" and "make install" of multiplexer version."
Elliott Hughes [Tue, 4 Oct 2016 02:27:15 +0000 (02:27 +0000)]
Merge "du: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32 blocks * 512 bytes, done with unsigned 64 bit math)."
Elliott Hughes [Tue, 4 Oct 2016 02:27:04 +0000 (02:27 +0000)]
Merge "Move --version handling next to --help handling, so it applies to all commands. Say "toybox" before version string. Tweak sed to preserve lie-to-autoconf."
Elliott Hughes [Tue, 4 Oct 2016 02:26:51 +0000 (02:26 +0000)]
Merge "sed -i run as root wasn't preserving ownership."
Elliott Hughes [Fri, 30 Sep 2016 23:33:12 +0000 (16:33 -0700)]
Updated Android roadmap.
Since we're actually getting close to the end of the toolbox list,
expand the "other stuff" with everything that's currently in /system/bin
that could reasonably be replaced by toybox (and remove things that might
sound practical, but actually aren't). Also update the list of things
being built from pending.
Rob Landley [Mon, 3 Oct 2016 19:09:59 +0000 (14:09 -0500)]
David Hedges pointed out that interface names can be longer than 10 chars.
Rob Landley [Mon, 3 Oct 2016 03:41:55 +0000 (22:41 -0500)]
Add install_airlock target for hermetic build environment setup, and rebuild
headers during install to make other install targets robust against single
command builds between "make" and "make install" of multiplexer version.
Rob Landley [Sat, 1 Oct 2016 23:19:45 +0000 (18:19 -0500)]
du: 32 bit systems were maxing out at 2GB when they should max out at 2TB
(1<<32 blocks * 512 bytes, done with unsigned 64 bit math).
Rob Landley [Sat, 1 Oct 2016 20:52:00 +0000 (15:52 -0500)]
Move --version handling next to --help handling, so it applies to all commands.
Say "toybox" before version string. Tweak sed to preserve lie-to-autoconf.
Rob Landley [Fri, 30 Sep 2016 22:35:34 +0000 (17:35 -0500)]
sed -i run as root wasn't preserving ownership.
Elliott Hughes [Thu, 29 Sep 2016 22:53:26 +0000 (22:53 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
4cce9b0f49 am:
b70edb5cc9
am:
e61df5503f
Change-Id: Ia22bdc60961bedb040de4c8b6c8dca576e58b4cd
Elliott Hughes [Thu, 29 Sep 2016 22:34:35 +0000 (22:34 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
4cce9b0f49
am:
b70edb5cc9
Change-Id: I4f9709b23aeeb6ba80d1b0ccbce921e3b7054744
Elliott Hughes [Thu, 29 Sep 2016 22:24:35 +0000 (22:24 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
4cce9b0f49
Change-Id: I1af124e0e82203f86a950a24d336886322dd8f3d
Elliott Hughes [Thu, 29 Sep 2016 20:28:01 +0000 (13:28 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 28 Sep 2016 18:00:30 +0000 (11:00 -0700)]
Accept extra ps arguments as additional pids.
POSIX says nothing, but traditional ps lets you say "ps 123" in addition
to "ps -p 123". (You can mix and match too: "ps -p 123,124 666 667" works
fine.)
Bug:
31778761
Elliott Hughes [Tue, 27 Sep 2016 19:20:41 +0000 (12:20 -0700)]
Show thread names with "ps -T" on Android.
Android uses NAME rather than CMD by default, but that's not what we
want with -T. Noticed because it broke systrace's reporting of thread
names (see https://developer.android.com/studio/profile/systrace.html).
Bug:
31741954
Rob Landley [Wed, 28 Sep 2016 20:13:41 +0000 (15:13 -0500)]
Make setns depend on TOYBOX_CONTAINER probed value.
Rob Landley [Wed, 28 Sep 2016 19:22:34 +0000 (14:22 -0500)]
Kernels between 2006 and 2010 (such as the one in Centos 6.6) provide unshare()
but not nsenter(). So probe for both.
Lipi C.H. Lee [Sun, 25 Sep 2016 23:55:53 +0000 (08:55 +0900)]
Changed xopen_stdin() to xopen_stdio().
Dimitry Ivanov [Sat, 24 Sep 2016 22:14:33 +0000 (22:14 +0000)]
Add missing liblog dependency am:
a31c4a356f am:
2c4dc7733b
am:
9dd2d78afd
Change-Id: I755de688dc343281c1b7dd1bc294666a70a78aa8
Dimitry Ivanov [Sat, 24 Sep 2016 22:12:00 +0000 (22:12 +0000)]
Add missing liblog dependency am:
a31c4a356f
am:
2c4dc7733b
Change-Id: I90c06c6ad275adf29a3b508426e0c8a6d6dfb817
Dimitry Ivanov [Sat, 24 Sep 2016 22:10:00 +0000 (22:10 +0000)]
Add missing liblog dependency
am:
a31c4a356f
Change-Id: If8d51770146a2e612d627d5cbf178d768df98154
Dimitry Ivanov [Sat, 24 Sep 2016 00:07:07 +0000 (17:07 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: Id1ad1f43352caabea776a75bc3fe3da7bed8c151
Elliott Hughes [Thu, 15 Sep 2016 17:09:07 +0000 (17:09 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
d716ba6533 am:
5e4ff06a52
am:
0c9ddc93d9
Change-Id: I1179cfba6e0da84670de99d4ebdcd498d1b5afe6
Elliott Hughes [Thu, 15 Sep 2016 17:06:46 +0000 (17:06 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
d716ba6533
am:
5e4ff06a52
Change-Id: I6c220beaddb8f50bf192d9cbd6eb5ac962b03a9f
Elliott Hughes [Thu, 15 Sep 2016 17:03:06 +0000 (17:03 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
d716ba6533
Change-Id: I429e855c09e75bea305fc94048f8e4c7b772b0a1
Elliott Hughes [Thu, 15 Sep 2016 16:45:43 +0000 (09:45 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I034440bdeecc2a804f6b2a431307807dc707dacf
Elliott Hughes [Mon, 12 Sep 2016 19:30:33 +0000 (12:30 -0700)]
Fix ls -lh.
The recent refactoring broke ls -lh by multiplying all sizes by 0
rather than 1.
Elliott Hughes [Tue, 13 Sep 2016 21:35:43 +0000 (14:35 -0700)]
Add ar archive support to file.
Elliott Hughes [Tue, 13 Sep 2016 20:55:59 +0000 (13:55 -0700)]
Add -h and -L to file.
On a toybox system, most of your bin directory is symbolic links.
Bug: http://b/
31294746
Elliott Hughes [Mon, 12 Sep 2016 20:23:32 +0000 (20:23 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
acd101ac63 am:
b11a72dc2d
am:
92163c0851
Change-Id: I77e8b94c47b83c1dca756cd285ec794dad5e4ac4
Elliott Hughes [Mon, 12 Sep 2016 20:19:47 +0000 (20:19 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
acd101ac63
am:
b11a72dc2d
Change-Id: I9b8e0b90f802ff20958da7b00d1ec388baa0f864
Elliott Hughes [Mon, 12 Sep 2016 20:16:21 +0000 (20:16 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
acd101ac63
Change-Id: I4d213aa23c3c26ab9a19c69090dd032afb454321
Elliott Hughes [Mon, 12 Sep 2016 18:23:48 +0000 (11:23 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Mon, 12 Sep 2016 04:55:36 +0000 (23:55 -0500)]
Izabera pointed out that "file -" was inconsistent (calling stat on "-" but
then reading from stdin if it detected a file). Fixed it so "-" always
means stdin and you have to say ./- to look at a local "-".
Did some whitespace tweaks while I was there...
Rob Landley [Tue, 6 Sep 2016 05:14:24 +0000 (00:14 -0500)]
Teach sed s/// how to handle [:space:] type sequences.
Or more accurately, s@[[:space:]@]@replace@ which can't treat the @ in
[] as a delimiter but has to know about nested [[]] to make that decision.