OSDN Git Service
Steve Kondik [Mon, 26 Sep 2016 12:28:18 +0000 (05:28 -0700)]
Merge branch 'master' of https://android.googlesource.com/platform/external/toybox into cm-14.0
Change-Id: I30f7024dc0b625c2a0b34907a640052592c3f8c1
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 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 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...
Steve Kondik [Tue, 6 Sep 2016 08:22:13 +0000 (01:22 -0700)]
toybox: Add link for ls
* Toolbox is not used for ls on N
Change-Id: Iddc350a237e19bd52c8f37dd8ab323aa2435ea21
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 16:07:38 +0000 (09:07 -0700)]
Add symlink for chrt.
Bug: http://b/
30955717
Change-Id: Ia7e30a77ecd3c925817a9b4d9f57c289edd4e372
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.)
Adrian DC [Fri, 26 Aug 2016 01:12:46 +0000 (03:12 +0200)]
toybox_static: Remove ELF package relocations
* ERROR: ELF file is not a shared object
ERROR: Failed to load as ELF
ERROR: .../toybox: failed to pack/unpack file
Change-Id: Ifa75747bc78b62c8761ab41184e0b2adb190dc00
Adrian DC [Thu, 25 Aug 2016 21:24:53 +0000 (23:24 +0200)]
toybox: Add missing libselinux static references
Change-Id: I4fba06fdc386b877dcf8de32e21687b0a4ffec6b
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.
Saleem Rashid [Sun, 1 May 2016 06:41:20 +0000 (07:41 +0100)]
ninja-build: don't use $(shell) in other Make constructs [3/4]
Change-Id: I33782f7491ce3972f239a3cd953b34e5c45e44e5
Steve Kondik [Wed, 24 Aug 2016 21:06:08 +0000 (14:06 -0700)]
Merge tag 'android-7.0.0_r1' of https://android.googlesource.com/platform/external/toybox into 114
Android 7.0.0 release 1
Rob Landley [Tue, 23 Aug 2016 04:03:18 +0000 (23:03 -0500)]
Add tunctl.
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: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.
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: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: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
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.
Rob Landley [Fri, 15 Jul 2016 09:39:35 +0000 (04:39 -0500)]
Don't close stdin when loopfiles reads "-".
Rob Landley [Fri, 15 Jul 2016 07:50:15 +0000 (02:50 -0500)]
Somebody asked a FAQ on irc, so answer it.
Elliott Hughes [Thu, 14 Jul 2016 00:00:58 +0000 (17:00 -0700)]
Add Android's "sendevent".
The lack of support for named constants is not a regression relative
to the toolbox implementation.
Rob Landley [Thu, 14 Jul 2016 21:53:33 +0000 (16:53 -0500)]
Add -c to md5sum and sha1sum.
Elliott Hughes [Wed, 13 Jul 2016 18:59:42 +0000 (11:59 -0700)]
Increase ps' default RSS and VSIZE widths.
This is enough for everything on Android and everything except Java
on my desktop. Even desktop Chrome fits!
Rob Landley [Wed, 13 Jul 2016 18:46:50 +0000 (13:46 -0500)]
Bugfix: suffixless string was feeding terminating NUL to strchr() and matching.
Rob Landley [Tue, 12 Jul 2016 20:48:25 +0000 (15:48 -0500)]
Implement NOP find -noleaf
Rob Landley [Tue, 12 Jul 2016 19:51:51 +0000 (14:51 -0500)]
Convert atolx() and friends to use long long internally. Update design.html
to use this (and tail) as examples of simplicity of implementation winning
and losing.
Elliott Hughes [Mon, 11 Jul 2016 20:46:56 +0000 (20:46 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
5bb7e2581e
Change-Id: Ic0c5750b789c9aedad09ef64fbd7e0da88903fd7
Elliott Hughes [Mon, 11 Jul 2016 18:44:51 +0000 (11:44 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I446cfc9f3afd6b76c2dc448119bfecd78f511ea8
Elliott Hughes [Fri, 8 Jul 2016 18:36:44 +0000 (18:36 +0000)]
Add file(1).
am:
f3304b364a
Change-Id: Iee009b26b2891a559718ad8df24d556fa906867f
Elliott Hughes [Fri, 8 Jul 2016 17:19:23 +0000 (10:19 -0700)]
Add file(1).
Shows bitness, arch, Android API level (based off crtbrand.o), the BuildID
note, and whether or not the ELF file is stripped.
/system/bin/ndc: ELF shared object, 64-bit LSB arm64, dynamic (/system/bin/linker64), for Android 23, BuildID=
b0dbcbd074276683f06dfe65740411dd, stripped
Change-Id: I7d3d0de8c78c646f07ae1054719dc40075ece498
Elliott Hughes [Fri, 8 Jul 2016 04:48:33 +0000 (21:48 -0700)]
dd improvements.
Support hex (requested by users).
Support status=noxfer and status=none (requested by users).
Fix status output.
Clarify large numbers in --help output.
Use O_TRUNC rather than ftruncate unless we're also seeking.
New tests.
Also partial cleanup (reuse of existing code, removal of non-GLOBALS globals,
and merge dd_main and do_dd).
Elliott Hughes [Fri, 8 Jul 2016 02:32:34 +0000 (19:32 -0700)]
Fix typo in chattr test.
Elliott Hughes [Fri, 8 Jul 2016 02:28:42 +0000 (02:28 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
e7b74ae6b0
Change-Id: I2ed097db74aaacb5e98a44cfb116c676d54be803
Elliott Hughes [Fri, 8 Jul 2016 00:02:37 +0000 (17:02 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I4ea9e215a47aa00990b4acf3af206e4a8bb03a28
Rob Landley [Wed, 6 Jul 2016 00:36:00 +0000 (19:36 -0500)]
Fix generated/make.sh. (Quotes in TOYBOX_VERSION need to wind up in
resulting macro.)
Elliott Hughes [Tue, 5 Jul 2016 22:05:09 +0000 (15:05 -0700)]
Implement xxd -s.
Elliott Hughes [Tue, 5 Jul 2016 20:39:42 +0000 (13:39 -0700)]
Don't try to guess the build id type in file(1).
They're really just arbitrary byte sequences of arbitrary length.
Sure, a 20-byte sequence is _probably_ a SHA-1, but there's no way
to know, so let's stop pretending...
Rob Landley [Tue, 5 Jul 2016 03:25:52 +0000 (22:25 -0500)]
Fix chattr and date tests.
Rob Landley [Mon, 4 Jul 2016 13:32:42 +0000 (08:32 -0500)]
Now that we're using the adjusted option string, need to skip placeholders in [groups].
Rob Landley [Mon, 4 Jul 2016 07:59:09 +0000 (02:59 -0500)]
Fix a bug (octal digits are 0-7, not 0-8) and deal with a case where posix
is explicitly outright insane (%b handles octal escapes differently for no
obvious reason).
Rob Landley [Mon, 4 Jul 2016 03:14:40 +0000 (22:14 -0500)]
Promote file.
Elliott Hughes [Sat, 2 Jul 2016 19:53:40 +0000 (12:53 -0700)]
Improve file(1)'s ELF support.
Read any PT_NOTE sections to look for NT_GNU_BUILD_ID or Android API
level notes. I deliberately didn't NT_GNU_ABI_TAG because it's noisy --
every Linux executable has one -- but not something most command-line
users will have any use for. (And you can ask readelf(1) anyway.)
Also read the section headers to implement "stripped"/"not stripped".
This patch removes "uses %d libs" because it was actually just counting
dynamic sections in the ELF file, and there are only 0 or 1 of those in
a valid ELF flie. (If you really want this functionality, you have to
*parse* the dynamic section looking for the DT_NEEDED entries. But that's
more of a job for readelf(1) than file(1).)
Rob Landley [Sun, 3 Jul 2016 21:05:12 +0000 (16:05 -0500)]
Promote netsat, and move ifconfig, netcat, and rfkill to new toys/net directory.
Rob Landley [Sun, 3 Jul 2016 20:51:00 +0000 (15:51 -0500)]
More netstat cleanup (inline display_data)
Rob Landley [Sat, 2 Jul 2016 16:42:36 +0000 (11:42 -0500)]
Next round of netstat cleanup.
Rob Landley [Fri, 1 Jul 2016 01:48:22 +0000 (20:48 -0500)]
Add patch -d and --dry-run
Rob Landley [Fri, 1 Jul 2016 01:41:07 +0000 (20:41 -0500)]
Fix option parsing infrastructure bug.
In main.c: used adjusted string with placeholers for removed options (so flag
values don't move based on config, allowing FORCE_FLAGS to work).
In scripts/mkflags.c: test was wrong, a bare longopt never matches a single
letter command, but it was treated as always matching when comparing
allyesconfig vs current config to determine which options were disabled, so
there was a corner case that got the flag values wrong.
Rob Landley [Thu, 30 Jun 2016 15:39:41 +0000 (10:39 -0500)]
Teach wc to do -cm together. Fix testsuite so TEST_HOST passes too.