OSDN Git Service
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: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: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."
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: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: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: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: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.
Rob Landley [Mon, 5 Sep 2016 05:55:24 +0000 (00:55 -0500)]
Replace loopfiles' failok with WARN_ONLY open flag.
Rob Landley [Mon, 5 Sep 2016 05:52:44 +0000 (00:52 -0500)]
Export notstdio() wrapper.
Rob Landley [Mon, 5 Sep 2016 05:32:38 +0000 (00:32 -0500)]
Fluff up cmp tests.
Rob Landley [Mon, 5 Sep 2016 00:13:31 +0000 (19:13 -0500)]
make test_cmp caused the make invocation to exit with an error because the
last test exited with nonzero status and the script preserved it. In the
current context, that's counterproductive.
Rob Landley [Sun, 4 Sep 2016 23:07:12 +0000 (18:07 -0500)]
Add comment so I don't undo and then redo a thing again.
Rob Landley [Sun, 4 Sep 2016 22:42:32 +0000 (17:42 -0500)]
Remove a chunk of copied header that hasn't been upated in a while.
Rob Landley [Sun, 4 Sep 2016 22:26:34 +0000 (17:26 -0500)]
Add openro() and WARN_ONLY flag so xopen() and friends can warn without exiting.
Rob Landley [Sun, 4 Sep 2016 22:18:31 +0000 (17:18 -0500)]
Switch help.c from #ifdef to if()
Rob Landley [Sat, 3 Sep 2016 20:41:55 +0000 (15:41 -0500)]
Move genericish function to lib.
Elliott Hughes [Mon, 29 Aug 2016 17:31:20 +0000 (17:31 +0000)]
Add symlink for chrt. am:
0f7f3a5291
am:
6348187d86
Change-Id: I0b4909f49f2691a37adffb92f0d47301df6c7db4
Elliott Hughes [Mon, 29 Aug 2016 17:28:27 +0000 (17:28 +0000)]
Add symlink for chrt.
am:
0f7f3a5291
Change-Id: Iab9e5f00838ef0476ee738ce835720c147b15b50
Elliott Hughes [Mon, 29 Aug 2016 16:07:53 +0000 (16:07 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
5d83f7a6f9
am:
acc11f0720
Change-Id: I5576d6330cfe52c565187cd5e035f028c25c1162
Elliott Hughes [Mon, 29 Aug 2016 16:07:38 +0000 (09:07 -0700)]
Add symlink for chrt.
Bug: http://b/
30955717
Change-Id: Ia7e30a77ecd3c925817a9b4d9f57c289edd4e372
Elliott Hughes [Mon, 29 Aug 2016 16:04:24 +0000 (16:04 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
5d83f7a6f9
Change-Id: Ie338e8e67633f5b1ca4e022f8c41b1839e413449
Elliott Hughes [Mon, 29 Aug 2016 15:26:36 +0000 (08:26 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ib0b86bedbf7b9a4370533847ac0acad5aa478795
Rob Landley [Sun, 28 Aug 2016 05:32:41 +0000 (00:32 -0500)]
Add tap support to tunctl.
Rob Landley [Sun, 28 Aug 2016 04:27:45 +0000 (23:27 -0500)]
Make "LC_ALL=C ls -Cs --color" produce the same output on toybox and ubuntu.
(Two spaces padding between columns, and -k is hardwired on.)
Rob Landley [Sun, 28 Aug 2016 04:07:04 +0000 (23:07 -0500)]
Remove some redundancy and unnecessary xprintf().
(We should use xprintf and similar to flush and check if stdout went away
once per line. No point flushing partway through a line, so in ls only use it
on things outputting a newline char.)
Elliott Hughes [Thu, 25 Aug 2016 23:28:05 +0000 (16:28 -0700)]
Fix ls -sh.
-h should apply to -s too. (Previously it only applied to the "total"
line in -s output.)
Elliott Hughes [Wed, 24 Aug 2016 21:50:05 +0000 (14:50 -0700)]
Add chrt to pending.
Requested by a Google team whose product is based on Android.
Rob Landley [Tue, 23 Aug 2016 04:03:18 +0000 (23:03 -0500)]
Add tunctl.
Elliott Hughes [Mon, 22 Aug 2016 21:13:27 +0000 (21:13 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
a0637cef8f
am:
e9452d6abe
Change-Id: Iaf34a99429a545b90f241de39b6cea11cfac5275
Elliott Hughes [Mon, 22 Aug 2016 21:09:06 +0000 (21:09 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
a0637cef8f
Change-Id: Iff9bf69c0fcb29aa6ba317be0e59481437f1a729
Elliott Hughes [Mon, 22 Aug 2016 20:45:55 +0000 (13:45 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I7018a680508d767b89418cede90c0bd9ba0bd53c
Rob Landley [Mon, 22 Aug 2016 04:45:19 +0000 (23:45 -0500)]
A round of dd cleanup.
Rob Landley [Sun, 21 Aug 2016 01:24:30 +0000 (20:24 -0500)]
Promote setfattr
Rob Landley [Sun, 21 Aug 2016 01:20:06 +0000 (20:20 -0500)]
Clean up setfattr.
Rob Landley [Fri, 19 Aug 2016 02:33:27 +0000 (21:33 -0500)]
Change xgetpwnamid/xgetgrnamid to xgetuid/xgetgid returning the id number
instead of a struct. This means it can return "12345" even if that user/group
doesn't exist in /etc/passwd and similar.
All the users were immediately dereferencing it to get pw_uid or gr_gid
anyway, so just return it directly and adjust the users. This fixes
things like "chown 12345:23456 filename".
Rob Landley [Tue, 16 Aug 2016 19:14:22 +0000 (14:14 -0500)]
Add length modifier to date escapes, and length sanity check.
Rob Landley [Mon, 15 Aug 2016 07:02:32 +0000 (02:02 -0500)]
Make "stat -c %37G file" and "stat -c %.5G file" work, and fix %U and %G to
not segfault on a lookup failure (they print the number instead of UNKNOWN).
The whitespace in the default output may need some adjusting.
Rob Landley [Mon, 15 Aug 2016 00:04:02 +0000 (19:04 -0500)]
Explain shared library policy, fix an unblanaced tag, add some links.
Rob Landley [Sat, 13 Aug 2016 22:53:32 +0000 (17:53 -0500)]
Document deviations from posix for echo.
Rob Landley [Sat, 13 Aug 2016 22:50:54 +0000 (17:50 -0500)]
Add TOYFLAG_NOHELP to disable --help processing for individual commands,
apply it to "true" and "false".
Rob Landley [Sat, 13 Aug 2016 20:19:29 +0000 (15:19 -0500)]
Move getusername/getgroupname to lib. (Return name or string representation
of number, but never NULL. Both returned in static buffer good through
next call.)
Rob Landley [Thu, 11 Aug 2016 14:46:36 +0000 (09:46 -0500)]
Matthias Urhahn pointed out that %b returns hardwired 512 byte units
(man 2 stat says so) and %B is the units on %b (I.E. always 512), so change
output and help text. This matches what other implementations produce.
Rob Landley [Sun, 7 Aug 2016 00:38:25 +0000 (19:38 -0500)]
Inline setup_inout(), test ftruncate() return value, move gettimeofday() before
seek so seek time is included in total.
Rob Landley [Thu, 4 Aug 2016 15:16:59 +0000 (10:16 -0500)]
Make xopen() skip stdin/stdout/stderr, add xopen_stdio() if you want stdout,
add xopenro() that takes one argument and understands "-" means stdin,
and switch over lots of users.
Elliott Hughes [Tue, 2 Aug 2016 18:12:15 +0000 (11:12 -0700)]
Fix warning: 'XATTR_NAME_SMACK' macro redefined.
Recent Linux uapi <linux/xattr.h> headers define XATTR_NAME_SMACK.
The <sys/xattr.h> include at the top of lib/lsm.h means that even
though the direct include of <linux/xattr.h> is guarded, it may
have already happened transitively anyway.
(The alternative fixes would be to hard-code the correct value for
XATTR_NAME_SMACK here instead, or #undef XATTR_NAME_SMACK.)
Elliott Hughes [Tue, 2 Aug 2016 17:32:27 +0000 (17:32 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
a1ce46baab
am:
da5a402a93
Change-Id: I55d8d9b1865cd0968db132bbebef55cd39985c8a
Elliott Hughes [Tue, 2 Aug 2016 17:29:58 +0000 (17:29 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
a1ce46baab
Change-Id: I29e191c065fa740cd1f89909c6d3ff9e7640fbb2
Elliott Hughes [Tue, 2 Aug 2016 16:08:31 +0000 (09:08 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ie0bea3ba0de34b8ef14ca4af97772530b6736dc2
Elliott Hughes [Fri, 29 Jul 2016 20:11:04 +0000 (13:11 -0700)]
Fix touch(1) date parsing on tzcode-derived systems.
The IANA tzcode implementation of mktime (used on Android and BSDs) sets
errno in some cases where it doesn't return -1 to indicate failure, so the
existing test always failed on those systems.
I don't think glibc ever sets errno (which is fine by ISO C, but not POSIX).
Other uses of mktime in toybox are already fine. This one would have been
caught by the existing tests if I was running them on the device :-(
Rob Landley [Sat, 30 Jul 2016 16:39:17 +0000 (11:39 -0500)]
Single builds skip commands with 0 in the install location so
"make test_scankey" didn't work.
Rob Landley [Fri, 29 Jul 2016 22:35:29 +0000 (17:35 -0500)]
Izabera reporeted that FLAG_v was never checked in timeout. (Oops.)
Rob Landley [Tue, 26 Jul 2016 18:35:56 +0000 (13:35 -0500)]
Move regexec0 into lib (regexec that takes length and matches after NUL).
Rob Landley [Sat, 23 Jul 2016 23:25:38 +0000 (18:25 -0500)]
Usischev Yury pointed out that id shouldn't use exit() directly.
Rob Landley [Sat, 23 Jul 2016 23:12:48 +0000 (18:12 -0500)]
Usischev Yury pointed out a use after free error.
Rob Landley [Sat, 23 Jul 2016 06:32:23 +0000 (01:32 -0500)]
Many failing tests I need to fix grep to pass while adding --color.
Rob Landley [Thu, 21 Jul 2016 21:37:03 +0000 (16:37 -0500)]
Common test infrastructure says command name, don't have sed.tests say 'sed sed'
Elliott Hughes [Sun, 17 Jul 2016 17:42:31 +0000 (10:42 -0700)]
Add getfattr(1) and setfattr(1).
Plus basic tests.
Elliott Hughes [Mon, 18 Jul 2016 04:02:42 +0000 (04:02 +0000)]
Merge remote-tracking branch \\'toybox/master\\' into HEAD am:
650711a6c9
am:
db30f8e690
Change-Id: I863637857d04ee4466b6e0adee655344b765695f
Rob Landley [Mon, 18 Jul 2016 03:59:44 +0000 (03:59 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
650711a6c9
Change-Id: I757625cd0ec82d482fe4afe474e4865ecf713548
Elliott Hughes [Mon, 18 Jul 2016 03:02:10 +0000 (20:02 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I7bc7dbd93d4227715c572e31025bb16d49356ab8
Rob Landley [Sun, 17 Jul 2016 07:14:35 +0000 (02:14 -0500)]
The recent option parsing changes broke the multiplexer, because the "toybox"
command was trying to parse their options and failing. (Commands
that aren't just disabled but have no option string even in the allyesconfig
case need an OPTSTR of 0.)
This is probably only a partial fix, there's some design work to think through
here.
Elliott Hughes [Fri, 15 Jul 2016 22:14:33 +0000 (15:14 -0700)]
Remove sendevent from the Android roadmap.
Also update the list of things Android builds from pending, which has
shrunk.
Elliott Hughes [Sat, 16 Jul 2016 00:36:51 +0000 (00:36 +0000)]
Add sha224sum, sha256sum, sha384sum, and sha512sum. am:
63ca146ceb
am:
21d4490d8e
Change-Id: I32abc67626f6a338306ccb6336e903a52cf828e3
Elliott Hughes [Sat, 16 Jul 2016 00:33:05 +0000 (00:33 +0000)]
Add sha224sum, sha256sum, sha384sum, and sha512sum.
am:
63ca146ceb
Change-Id: I55f89145ecca835981f426f7906840d4605d7bcc
Elliott Hughes [Fri, 15 Jul 2016 23:31:22 +0000 (16:31 -0700)]
Add sha224sum, sha256sum, sha384sum, and sha512sum.
All implemented by libcrypto.so, so basically free.
Change-Id: I02e5492d197631222106e1c17bc29fded1dd8f7a
Elliott Hughes [Fri, 15 Jul 2016 22:21:34 +0000 (22:21 +0000)]
Switch to toybox sendevent. am:
75681dca17
am:
3f0d2eda44
Change-Id: Ie9b626e489b6dc5bfd016470efedc9695742c03b
Elliott Hughes [Fri, 15 Jul 2016 22:19:27 +0000 (22:19 +0000)]
Switch to toybox sendevent.
am:
75681dca17
Change-Id: I0edab43119eb42b388cc5f07c9236180b5f26d1b
Elliott Hughes [Fri, 15 Jul 2016 21:19:07 +0000 (14:19 -0700)]
Switch to toybox sendevent.
Change-Id: I4dbe0f946fab36dc6054c98a9fcd92b96bf7385c
Elliott Hughes [Fri, 15 Jul 2016 18:30:41 +0000 (18:30 +0000)]
Merge remote-tracking branch \\'toybox/master\\' into HEAD am:
a126e5f9a2
am:
e51bec3b3b
Change-Id: I19233a9cd9e2e1d5a8b59961016f7ab0187c6750
Rob Landley [Fri, 15 Jul 2016 18:27:42 +0000 (18:27 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
a126e5f9a2
Change-Id: If2c5d67842d506a82754b3af71d46be62569384b
Elliott Hughes [Fri, 15 Jul 2016 17:14:33 +0000 (10:14 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I02968eafb038766a5190e0576bf810633e9c4d50
Rob Landley [Fri, 15 Jul 2016 09:51:56 +0000 (04:51 -0500)]
Fix non-library md5sum build. (Oops.)
Rob Landley [Fri, 15 Jul 2016 09:45:08 +0000 (04:45 -0500)]
Add optional openssl accelerated versions of hash functions, loosely based on
a patch from Elliott Hughes, who said:
[PATCH] Add support for libcrypto for MD5/SHA.
Orders of magnitude faster (for architectures where OpenSSL/BoringSSL
has optimized assembler).
Also adds sha224sum, sha256sum, sha384sum, and sha512sum for folks
building with libcrypto.
The fallback portable C implementations could easily be refactored
to be API-compatible, but I don't know whether they'd stay here or
move to lib/ so I've left that part alone for now.