OSDN Git Service

android-x86/external-toybox.git
7 years agoFix a bug (octal digits are 0-7, not 0-8) and deal with a case where posix
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).

7 years agoPromote file.
Rob Landley [Mon, 4 Jul 2016 03:14:40 +0000 (22:14 -0500)]
Promote file.

7 years agoImprove file(1)'s ELF support.
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).)

7 years agoPromote netsat, and move ifconfig, netcat, and rfkill to new toys/net directory.
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.

7 years agoMore netstat cleanup (inline display_data)
Rob Landley [Sun, 3 Jul 2016 20:51:00 +0000 (15:51 -0500)]
More netstat cleanup (inline display_data)

7 years agoNext round of netstat cleanup.
Rob Landley [Sat, 2 Jul 2016 16:42:36 +0000 (11:42 -0500)]
Next round of netstat cleanup.

7 years agoAdd patch -d and --dry-run
Rob Landley [Fri, 1 Jul 2016 01:48:22 +0000 (20:48 -0500)]
Add patch -d and --dry-run

7 years agoFix option parsing infrastructure bug.
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.

7 years agoTeach wc to do -cm together. Fix testsuite so TEST_HOST passes too.
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.

7 years agoAdd NOSPACE=1 to allow tests to pass with diff -b
Rob Landley [Thu, 30 Jun 2016 15:39:23 +0000 (10:39 -0500)]
Add NOSPACE=1 to allow tests to pass with diff -b

7 years agoUse libbuf instead of stack buffer.
Rob Landley [Thu, 30 Jun 2016 15:37:35 +0000 (10:37 -0500)]
Use libbuf instead of stack buffer.

7 years agoRemove unused argument from do_lines()
Rob Landley [Wed, 29 Jun 2016 22:51:03 +0000 (17:51 -0500)]
Remove unused argument from do_lines()

7 years agoRemove 'start' and 'stop' from the Android roadmap.
Elliott Hughes [Wed, 29 Jun 2016 20:57:30 +0000 (13:57 -0700)]
Remove 'start' and 'stop' from the Android roadmap.

7 years agoUpdate Android section of roadmap.
Elliott Hughes [Fri, 24 Jun 2016 16:37:59 +0000 (09:37 -0700)]
Update Android section of roadmap.

nandread was MTD-only, and we don't support MTD any more.

7 years agoSwitch to toybox start/stop.
Elliott Hughes [Wed, 29 Jun 2016 19:07:15 +0000 (19:07 +0000)]
Switch to toybox start/stop.
am: ba38a4371a

Change-Id: I15e2811fd922fee8e8df755fc7f87c625ecf5532

7 years agoSwitch to toybox start/stop.
Elliott Hughes [Wed, 29 Jun 2016 18:45:39 +0000 (11:45 -0700)]
Switch to toybox start/stop.

Change-Id: I0c89f73d66d3df80e289a7c6447b76f7d578ab8a

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Tue, 28 Jun 2016 22:46:03 +0000 (22:46 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 06b90e3d57

Change-Id: Ie78a98ea6c99a1262dad73eb6795d8c6c20ae9f5

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 28 Jun 2016 21:20:54 +0000 (14:20 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ia675ae28c2ce58dfbe0293394f091747b4d7f11c

7 years agoFix iteration for start/stop without arguments.
Elliott Hughes [Mon, 27 Jun 2016 21:51:18 +0000 (14:51 -0700)]
Fix iteration for start/stop without arguments.

7 years agoFix a "may be used uninitialized".
Rob Landley [Tue, 28 Jun 2016 06:54:01 +0000 (01:54 -0500)]
Fix a "may be used uninitialized".

7 years agoFix start.c build and add error reporting.
Elliott Hughes [Mon, 27 Jun 2016 15:26:03 +0000 (08:26 -0700)]
Fix start.c build and add error reporting.

7 years agoCode style pass.
Rob Landley [Sat, 25 Jun 2016 19:57:39 +0000 (14:57 -0500)]
Code style pass.

7 years agonew Android toys: start/stop
Elliott Hughes [Sat, 25 Jun 2016 19:21:35 +0000 (14:21 -0500)]
new Android toys: start/stop

7 years agoUpdate Android section of roadmap.
Elliott Hughes [Wed, 22 Jun 2016 22:55:35 +0000 (15:55 -0700)]
Update Android section of roadmap.

top switched over a week or two back, and log switched today.

7 years agoRemove android/log's "default" priority.
Elliott Hughes [Wed, 22 Jun 2016 22:50:51 +0000 (15:50 -0700)]
Remove android/log's "default" priority.

It turns out that "default" goes nowhere. Whereas "silent" actually shows
up in the log. So document "silent" (which we already supported) but
remove support for "default".

Also make the spacing between levels in the help more regular; it looks
weird being in columns when there's only one row!

7 years agoSwitch to toybox log. am: f74df030dd
Elliott Hughes [Wed, 22 Jun 2016 21:43:31 +0000 (21:43 +0000)]
Switch to toybox log. am: f74df030dd
am: 20c5ae0259

Change-Id: I022041a7c399e54c0763f06f8f315c1ded24d7d5

7 years agoSwitch to toybox log.
Elliott Hughes [Wed, 22 Jun 2016 21:41:04 +0000 (21:41 +0000)]
Switch to toybox log.
am: f74df030dd

Change-Id: I6956af1cee8e8035e1bba29a37b2150f13cf5be5

7 years agoSwitch to toybox log.
Elliott Hughes [Wed, 22 Jun 2016 19:25:11 +0000 (12:25 -0700)]
Switch to toybox log.

Change-Id: I093ee85ca4fc862f45f6166f1a63cada9e5a4eb7

7 years agoMerge remote-tracking branch \\'toybox/master\\' into HEAD am: 0803f535c0
Elliott Hughes [Wed, 22 Jun 2016 18:28:39 +0000 (18:28 +0000)]
Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 0803f535c0
am: 092461d02d

Change-Id: I248376888406a9beef0266bbc19a16c34c12a934

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Rob Landley [Wed, 22 Jun 2016 18:26:09 +0000 (18:26 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 0803f535c0

Change-Id: Ib0d8d4f3a27cf8c04e77ea0cadfaacee1f02c7ed

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 22 Jun 2016 17:26:11 +0000 (10:26 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ifa85ce6790aef1838c29d521b3fdd23d7e8728d7

7 years agoAttempt at cleanup of log.c, but I don't have a build environment for it so...
Rob Landley [Tue, 21 Jun 2016 21:10:49 +0000 (16:10 -0500)]
Attempt at cleanup of log.c, but I don't have a build environment for it so...

7 years agonew Android toy: log
Elliott Hughes [Tue, 21 Jun 2016 20:32:42 +0000 (15:32 -0500)]
new Android toy: log

7 years agoLast commit depends on new lib code I forgot to check in. (Oops.)
Rob Landley [Sun, 19 Jun 2016 12:07:44 +0000 (07:07 -0500)]
Last commit depends on new lib code I forgot to check in. (Oops.)

7 years agoNext round of diffstat cleanup.
Rob Landley [Sun, 19 Jun 2016 12:07:15 +0000 (07:07 -0500)]
Next round of diffstat cleanup.

7 years agoMake it clearer that CMD is the thread name.
Elliott Hughes [Fri, 17 Jun 2016 22:51:25 +0000 (15:51 -0700)]
Make it clearer that CMD is the thread name.

It should come as no surprise to those who followed the development of
this that it's not well known which of the various names is actually the
thread name. Adding "thread" to the ps --help output seems like a good
idea.

I'm also assuming that "stat2" was meant to read "stat[2]", since that's
how it mostly appeared on the list while discussing this. Still fits in
80 columns.

7 years agoAdd readlink0() and readlinkat0() which null terminate the data.
Rob Landley [Wed, 15 Jun 2016 20:47:01 +0000 (15:47 -0500)]
Add readlink0() and readlinkat0() which null terminate the data.

7 years agoThe glibc bug at https://sourceware.org/bugzilla/show_bug.cgi?id=17829
Rob Landley [Wed, 15 Jun 2016 16:43:48 +0000 (11:43 -0500)]
The glibc bug at https://sourceware.org/bugzilla/show_bug.cgi?id=17829
continues to get worse, and now can't handle INT_MAX/2 either. So our
first workaround _also_ broke.

But posix says "A negative precision is taken as if the precision were
omitted." and that _doesn't_ trigger the glibc bug, so use that instead.

7 years agoSwitch to toybox top. am: f6453fed89
Elliott Hughes [Tue, 14 Jun 2016 16:03:55 +0000 (16:03 +0000)]
Switch to toybox top. am: f6453fed89
am: 04a205cd99

Change-Id: I35027e7193fce72821888e3bf19b43070b2abab0

7 years agoSwitch to toybox top.
Elliott Hughes [Tue, 14 Jun 2016 15:59:19 +0000 (15:59 +0000)]
Switch to toybox top.
am: f6453fed89

Change-Id: I4809d4e1305f8b56bb04ec2a3c58f953e2aa3a31

7 years agoSwitch to toybox top.
Elliott Hughes [Tue, 14 Jun 2016 01:52:28 +0000 (18:52 -0700)]
Switch to toybox top.

Change-Id: Ia282db6ff58ae22e01d60623bf316823c230e003

7 years agoMerge remote-tracking branch \\'toybox/master\\' into HEAD am: c615678676
Elliott Hughes [Mon, 13 Jun 2016 21:46:44 +0000 (21:46 +0000)]
Merge remote-tracking branch \\'toybox/master\\' into HEAD am: c615678676
am: 017e8d53d7

Change-Id: Idce2d426e3b07090e3bf4302e897c174ab3613a0

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Rob Landley [Mon, 13 Jun 2016 21:42:52 +0000 (21:42 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: c615678676

Change-Id: I9e2998e71daa88eddf99889016fe899be695ce15

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Mon, 13 Jun 2016 21:23:15 +0000 (14:23 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ib0a2f504182aa42c934bd5fb99d6ed0afe8a2b8a

7 years agoLots of netstat cleanup, including a rewrite of the unix domain socket output.
Rob Landley [Sun, 12 Jun 2016 08:35:57 +0000 (03:35 -0500)]
Lots of netstat cleanup, including a rewrite of the unix domain socket output.
(Ubuntu's netstat is left justifying the inode field, and they're wrong.)

7 years agoFinish switching to dev_major/dev_minor.
Elliott Hughes [Sun, 12 Jun 2016 05:00:54 +0000 (22:00 -0700)]
Finish switching to dev_major/dev_minor.

7ca5dc4232b9ac5ee5cd25c8b5b33a58904cd251 didn't switch all callers over
to the new functions.

7 years agoMissing parentheses. (Oops.)
Rob Landley [Sat, 11 Jun 2016 00:00:25 +0000 (19:00 -0500)]
Missing parentheses. (Oops.)

7 years agoFix trailing whitespace bug in netstat.
Elliott Hughes [Fri, 10 Jun 2016 16:08:33 +0000 (09:08 -0700)]
Fix trailing whitespace bug in netstat.

Spotted while trying to diff netstat -nt against toybox netstat -nt.

7 years agoxreadlink() only exits for memory allocation, it returns 0 if file not found.
Rob Landley [Fri, 10 Jun 2016 23:54:10 +0000 (18:54 -0500)]
xreadlink() only exits for memory allocation, it returns 0 if file not found.

(I forget who reported this bug, wasn't me.)

7 years agoUpdate Android roadmap section.
Elliott Hughes [Mon, 6 Jun 2016 22:41:39 +0000 (15:41 -0700)]
Update Android roadmap section.

We killed toolbox ioctl and wouldn't build a toybox one anyway.

Also admit that -- although toybox has a grep -- we're not actually using
it yet (and why we're not).

7 years agoShuffle arguments around (TNAME->NAME->COMM->CMD), working around posix
Rob Landley [Fri, 10 Jun 2016 23:37:41 +0000 (18:37 -0500)]
Shuffle arguments around (TNAME->NAME->COMM->CMD), working around posix
constraints while still trying to get sane behavior. Discard the old CMD,
move COMM to CMD, move the old NAME to COMM, and move TNAME to NAME.

Posix assumes argv[] is the only source of process name data, but Linux has
three sources (/proc/$PID/cmdline, /proc/$PID/exe, /proc/$PID/stat field 2)
and android uses multiple sources simultaneously to identify its processes
and threads.

Toybox ps also assumes that the field names displayed in the headers
can be fed to -o to get that output, which is an assumption posix's
ps spec clearly does not have. Before we were erring on the side of posix,
now we're erring on the side of sanity.

CMD now shows stat[2], all the time. The posix -f behavior change is now
just an ARGS=CMD alias in the -f default command line, which -o overrides.
(Before -f changed the behavior of -o CMD, which is closer to what
posix says but is _insane_ and we've stopped doing it.)

COMM now shows /proc/$PID/exe minus the path. (I'm aware posix says argv[0]
here, but it says argv everywhere.)

NAME is now argv[0] of $PID.

TNAME went away.

Both $COMM and $NAME show the data for $PID, which is a thread's parent
process when $TID != $PID.

7 years agoRevert commit e02e41373ea3, we're always initializing the TNAME string
Rob Landley [Fri, 10 Jun 2016 22:58:56 +0000 (17:58 -0500)]
Revert commit e02e41373ea3, we're always initializing the TNAME string
field (that's the ptb/tb switching in get_ps) so it's never blank, so
this doesn't trigger. (Conditionally initializing it would save runtime
memory, but at the expense of more complex code.)

7 years agoMerge remote-tracking branch \\'toybox/master\\' into HEAD am: c0fec89dcf
Elliott Hughes [Fri, 10 Jun 2016 16:55:40 +0000 (16:55 +0000)]
Merge remote-tracking branch \\'toybox/master\\' into HEAD am: c0fec89dcf
am: e389dc2bc4

Change-Id: I10b66f2ef5eaa4d3383e8a82d41d1f1ff10ac67a

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Fri, 10 Jun 2016 16:52:50 +0000 (16:52 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: c0fec89dcf

Change-Id: I03a3edda576fe6d2852fe21a54ff9ed35c57d54a

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 10 Jun 2016 16:42:10 +0000 (09:42 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

7 years agoHACK: restore Android ps behavior.
Elliott Hughes [Thu, 9 Jun 2016 00:03:26 +0000 (17:03 -0700)]
HACK: restore Android ps behavior.

"NAME" is no longer doing what we want; "TNAME" is what "NAME" used to be,
except that "TNAME" implies -T. This patch switches us over to "TNAME",
disables the implicit -T.

Change-Id: I5553703d3939b24eaf39976162d2f75a591e1ce8

7 years agoFix dangling link after cp command
Kyungsik Lee [Thu, 9 Jun 2016 09:36:34 +0000 (18:36 +0900)]
Fix dangling link after cp command

"toybuf" should be initialized before calling symlinkat() or
dangling link could occur.

7 years agoMerge remote-tracking branch \\'toybox/master\\' into HEAD am: 73f8634ae0
Elliott Hughes [Thu, 9 Jun 2016 15:51:23 +0000 (15:51 +0000)]
Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 73f8634ae0
am: ad9f9e14e4

Change-Id: I4fc9986a6e1d54e2d3828c78557835e69d9b3db5

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Rob Landley [Thu, 9 Jun 2016 15:46:01 +0000 (15:46 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 73f8634ae0

Change-Id: I6865c79f91ddf25add64638c57e10e68129885eb

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Thu, 9 Jun 2016 15:21:00 +0000 (08:21 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I703e4ec03f0eb2a5a215ac07407e094a92f0d161

7 years agoFix ps bug, last field wasn't expanding to width.
Rob Landley [Thu, 9 Jun 2016 03:53:51 +0000 (22:53 -0500)]
Fix ps bug, last field wasn't expanding to width.

(Still fixing the fallout from that "Don't truncate number fields" logic rewrite.)

7 years agoChange the TNAME behavior to "Show parent argv[0]. If that's blank, showour argv...
Rob Landley [Thu, 9 Jun 2016 01:30:08 +0000 (20:30 -0500)]
Change the TNAME behavior to "Show parent argv[0]. If that's blank, showour argv[0]. If that's blank, show [stat2]."

That way threads show their parents, parents show themselves, and
kernel threads show the [stat2] name.

7 years agoIzabera pointed out that cmp -ls are contradictory.
Rob Landley [Tue, 7 Jun 2016 23:16:25 +0000 (18:16 -0500)]
Izabera pointed out that cmp -ls are contradictory.

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: e0f2d3d3e0
Elliott Hughes [Mon, 6 Jun 2016 20:33:26 +0000 (20:33 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: e0f2d3d3e0
am: 1b6a32c79c

* commit '1b6a32c79ce23995fc87de172af1ea145d5e4853':
  Fix TOYBOX_VERSION
  Basic success/failure return from pgrep/pkill.
  ps: Show [stat2] for any otherwise blank process name field, expand TNAME to 27, use generated constant for stat field parsing loop.
  In cp -a, don't complain if non-root user can't chown, failure is expected.
  Add output path to cp error message filenames.

Change-Id: Iab69722a3107f3475835283d61a50c2b2a700111

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Paul Barker [Mon, 6 Jun 2016 20:28:44 +0000 (20:28 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: e0f2d3d3e0

* commit 'e0f2d3d3e0f5815582a2d9a328cf2f94cf8172ec':
  Fix TOYBOX_VERSION
  Basic success/failure return from pgrep/pkill.
  ps: Show [stat2] for any otherwise blank process name field, expand TNAME to 27, use generated constant for stat field parsing loop.
  In cp -a, don't complain if non-root user can't chown, failure is expected.
  Add output path to cp error message filenames.

Change-Id: I440d122c015b3e390064085f638063139b3936d1

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Mon, 6 Jun 2016 18:09:21 +0000 (11:09 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I0e66b038cc5e409bb5c47dd851d37efc98e4a356

7 years agoFix TOYBOX_VERSION
Paul Barker [Sat, 4 Jun 2016 14:05:49 +0000 (15:05 +0100)]
Fix TOYBOX_VERSION

The latest tagged version is 0.7.1.

7 years agoBasic success/failure return from pgrep/pkill.
Elliott Hughes [Sat, 4 Jun 2016 16:26:14 +0000 (09:26 -0700)]
Basic success/failure return from pgrep/pkill.

The man page says they also return 2 for syntax errors and 3 for "fatal
error: out of memory etc", but I don't know how to implement that and
don't need it (or have any reason to believe anyone needs it).

Bug: 29092208

7 years agops: Show [stat2] for any otherwise blank process name field, expand TNAME to 27,
Rob Landley [Sat, 4 Jun 2016 19:36:39 +0000 (14:36 -0500)]
ps: Show [stat2] for any otherwise blank process name field, expand TNAME to 27,
use generated constant for stat field parsing loop.

7 years agoIn cp -a, don't complain if non-root user can't chown, failure is expected.
Rob Landley [Tue, 31 May 2016 22:33:23 +0000 (17:33 -0500)]
In cp -a, don't complain if non-root user can't chown, failure is expected.

7 years agoAdd output path to cp error message filenames.
Rob Landley [Mon, 30 May 2016 18:43:17 +0000 (13:43 -0500)]
Add output path to cp error message filenames.

7 years agoRegenerate generated files. am: a439588aab
Elliott Hughes [Fri, 27 May 2016 22:26:47 +0000 (22:26 +0000)]
Regenerate generated files. am: a439588aab
am: f644bebdd9

* commit 'f644bebdd96d78accb597f080adad4e34ae98a62':
  Regenerate generated files.

Change-Id: Ic547341baeed2bb1cffa2355226f55518e447caa

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a
Elliott Hughes [Fri, 27 May 2016 22:26:47 +0000 (22:26 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a
am: 0a2465b7db

* commit '0a2465b7dbd911e4745af51f691b7618ff43b1e8':
  Add -o TNAME for android, fix display of last field (retain left justifification when trimmed for screen width), make ARGS path trimming logic work with spaces in path.
  Stabilize another sort.
  Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.

Change-Id: Ic0675d535dc0717aef51a9c2a59ce2cd61175146

7 years agoRegenerate generated files.
Elliott Hughes [Fri, 27 May 2016 22:24:12 +0000 (22:24 +0000)]
Regenerate generated files.
am: a439588aab

* commit 'a439588aabe25c09e56b91da4ce288d730e99295':
  Regenerate generated files.

Change-Id: I941bc3927b1674ca6b723056419945a48502a152

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Rob Landley [Fri, 27 May 2016 22:24:09 +0000 (22:24 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 1c046ba85a

* commit '1c046ba85afc8af804e9c9529517eef9d55273b6':
  Add -o TNAME for android, fix display of last field (retain left justifification when trimmed for screen width), make ARGS path trimming logic work with spaces in path.
  Stabilize another sort.
  Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.

Change-Id: Icc43b91509855c97e31c790476252c56f62708a3

7 years agoRegenerate generated files.
Elliott Hughes [Fri, 27 May 2016 22:15:29 +0000 (15:15 -0700)]
Regenerate generated files.

Change-Id: I475d806d0d4c7a403a1b42aee4d5077bd4fe38df

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 27 May 2016 20:57:40 +0000 (13:57 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

7 years agoAdd -o TNAME for android, fix display of last field (retain left justifification
Rob Landley [Fri, 27 May 2016 19:54:27 +0000 (14:54 -0500)]
Add -o TNAME for android, fix display of last field (retain left justifification
when trimmed for screen width), make ARGS path trimming logic work with
spaces in path.

7 years agoStabilize another sort.
Elliott Hughes [Wed, 25 May 2016 21:43:56 +0000 (14:43 -0700)]
Stabilize another sort.

Unstable sorting means confusing diffs if you're checking in the generated
files. (Which I shouldn't be doing, but getting this bundle of random scripts
into Android's build system isn't going to be easy...)

7 years agoStop building toybox route. am: 48e1f81151
Elliott Hughes [Wed, 25 May 2016 23:36:32 +0000 (23:36 +0000)]
Stop building toybox route. am: 48e1f81151
am: 127fdfaa41

* commit '127fdfaa4146bf81e0d6f4503f6dcfafad7037a1':
  Stop building toybox route.

Change-Id: Ide8827adc6239ea2c92db663c1ee2f68e81d0388

7 years agoStop building toybox route.
Elliott Hughes [Wed, 25 May 2016 23:26:46 +0000 (23:26 +0000)]
Stop building toybox route.
am: 48e1f81151

* commit '48e1f81151f6f73d6bbd9c69c1224e60863609fb':
  Stop building toybox route.

Change-Id: Ic661b343c374faedeec63aeef3f07bfb2c3e862f

7 years agoStop building toybox route.
Elliott Hughes [Wed, 25 May 2016 21:47:37 +0000 (14:47 -0700)]
Stop building toybox route.

From the commit that stopped creating the symlink:

    We should remove the "route" command because its output is irrelevant and
    misleading. This is because it only looks at the "main" routing table,
    which is a last resort routing table that is a) trumped by all other
    networks, b) empty except for directly-connected routes c) cannot even be
    used by non-root users.

    The proper way to understand device routing is to look at the output of
    "ip rule" and "ip route", both of which are already available.

    Example of how this is confusing:

      $ adb shell route
      Kernel IP routing table
      Destination     Gateway         Genmask         Flags Metric Ref    Use Iface
      160.249.218.72  *               255.255.255.248 U     0      0        0 rmnet_data0
      192.168.144.0   *               255.255.240.0   U     0      0        0 wlan0

    These aren't guaranteed to be used. For example, according to the output
    above 160.249.218.73 should go through rmnet_data0, but it doesn't:

      $ adb shell ip route get 160.249.218.73
      160.249.218.73 via 192.168.159.254 dev wlan0  src 192.168.159.164  uid 0
          cache

    Also, there is no default route. But the device has networking just fine:

      $ adb shell ip route get 8.8.8.8
      8.8.8.8 via 192.168.159.254 dev wlan0  src 192.168.159.164  uid 0
          cache

Bug: http://b/27603033
Change-Id: I40be0a7e2841144797a67f9aeb82b9097cec5400

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac
Elliott Hughes [Wed, 25 May 2016 21:26:06 +0000 (21:26 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac
am: afd5761e89

* commit 'afd5761e898130744d19e3d2960f72295478d70f':
  The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)

Change-Id: Icff8308b066d65d51ec9c915f8fe226334d3ae68

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Rob Landley [Wed, 25 May 2016 21:20:00 +0000 (21:20 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: b5b37acaac

* commit 'b5b37acaac3661ee9fabbf3cc4ab5026cd534f41':
  The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)

Change-Id: Ib0a3a91d79f05175bac63ef1ff423f5e1df86c6d

7 years agoStand alone builds of OLDTOY should show help text for corresponding NEWTOY.
Rob Landley [Wed, 25 May 2016 17:56:56 +0000 (12:56 -0500)]
Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 24 May 2016 22:27:49 +0000 (15:27 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

7 years agoThe "show parent command path" commit changed the criteria for active nodes,
Rob Landley [Tue, 24 May 2016 21:17:55 +0000 (16:17 -0500)]
The "show parent command path" commit changed the criteria for active nodes,
and the collate logic wasn't updated. (Oops.)

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 87bfced0f8
Elliott Hughes [Tue, 24 May 2016 16:33:03 +0000 (16:33 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 87bfced0f8
am: 046214fe5a

* commit '046214fe5a2d4ebcdfe64f14ae69b156e357c437':
  Fix remaining pkill tests.
  Fix pkill -9.
  Don't truncate number fields for anything but right edge of screen, instead let them overflow and try to reclaim extra space from later short fields.
  Make -o COMMAND show parent command path for threads, and use saved length calculations instead of doing strlen() on strings again to store lengths.
  Comment and help text tweaks.
  Add bufgetgrgid()
  Make build dependencies more granular. This should fix the problem where "make top; make ps" produces a ps that can't do -A because generated/obj/ps.o didn't get rebuilt.
  Add bufgetpwuid. (Repeated calls to getpwuid() are really expensive.)
  Add top -O
  Add stat -tL and -c %m%t%T.

Change-Id: Ibe9fba9fd4678e6a57edebd8cfbaad0d8b3eb28a

7 years agoRegenerate generated files. am: a2ba247f52
Elliott Hughes [Tue, 24 May 2016 16:33:02 +0000 (16:33 +0000)]
Regenerate generated files. am: a2ba247f52
am: 263dcfefc1

* commit '263dcfefc10ea5930445b521db34a51b2742537c':
  Regenerate generated files.

Change-Id: Ieb3008c2166e992f8eea44038bd79bd4dee25371

7 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Tue, 24 May 2016 16:28:19 +0000 (16:28 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 87bfced0f8

* commit '87bfced0f861312fd9ee9895aef9ac77aa72f6be':
  Fix remaining pkill tests.
  Fix pkill -9.
  Don't truncate number fields for anything but right edge of screen, instead let them overflow and try to reclaim extra space from later short fields.
  Make -o COMMAND show parent command path for threads, and use saved length calculations instead of doing strlen() on strings again to store lengths.
  Comment and help text tweaks.
  Add bufgetgrgid()
  Make build dependencies more granular. This should fix the problem where "make top; make ps" produces a ps that can't do -A because generated/obj/ps.o didn't get rebuilt.
  Add bufgetpwuid. (Repeated calls to getpwuid() are really expensive.)
  Add top -O
  Add stat -tL and -c %m%t%T.

Change-Id: If176e7107857657fd8289e72240236256c1cb0db

7 years agoRegenerate generated files.
Elliott Hughes [Tue, 24 May 2016 16:28:17 +0000 (16:28 +0000)]
Regenerate generated files.
am: a2ba247f52

* commit 'a2ba247f528b551fe8fcdbad911aa912d4eb6696':
  Regenerate generated files.

Change-Id: I1e97789bf9988b5eb7fd8368204881445748b7a8

7 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 24 May 2016 16:13:35 +0000 (09:13 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

7 years agoRegenerate generated files.
Elliott Hughes [Tue, 24 May 2016 16:12:04 +0000 (09:12 -0700)]
Regenerate generated files.

Change-Id: I2014135856d6316a53c22cace2cc935cf65434f6

7 years agoFix remaining pkill tests.
Elliott Hughes [Mon, 23 May 2016 17:46:47 +0000 (10:46 -0700)]
Fix remaining pkill tests.

I don't know that anyone cares, but these failures made me think I'd
broken something while testing the -SIGNAL patch.

The -s parsing wasn't taking into account that -s 0 is a special case,
and the -o test was assuming that pkill can tell the difference between
two processes started at roughly the same time. Hopefully there's
higher-resolution data available that can avoid the need for yet another
sleep in the tests.

7 years agoFix pkill -9.
Elliott Hughes [Mon, 23 May 2016 17:34:01 +0000 (10:34 -0700)]
Fix pkill -9.

This fixes the existing test. Internal Android bug 28877702.

I've left -l as-is, even though the desktop doesn't support that.

7 years agoDon't truncate number fields for anything but right edge of screen, instead
Rob Landley [Mon, 23 May 2016 00:44:10 +0000 (19:44 -0500)]
Don't truncate number fields for anything but right edge of screen, instead
let them overflow and try to reclaim extra space from later short fields.

7 years agotoybox: Fix netstat crash android-x86-6.0-r1 android-x86-6.0-r2
Steve Kondik [Mon, 23 May 2016 00:09:57 +0000 (17:09 -0700)]
toybox: Fix netstat crash

 * Avoid crash if link was null, seen when launching Radish

Change-Id: I18a845557caaaa5d725c00978c90fb5b836a7876

7 years agoMerge branch 'master' of https://android.googlesource.com/platform/external/toybox...
Steve Kondik [Mon, 23 May 2016 00:01:32 +0000 (17:01 -0700)]
Merge branch 'master' of https://android.googlesource.com/platform/external/toybox into cm-13.0

Change-Id: I231131679eb5a94753c472e8ea6e26583d46b5f6

7 years agoRevert "toybox: Fix build of static executable"
Steve Kondik [Sun, 22 May 2016 23:59:57 +0000 (16:59 -0700)]
Revert "toybox: Fix build of static executable"

 * Fixed upstream.

This reverts commit 7d5136d998baaad4a27e45f9fb99b45bac2c9bb8.

Change-Id: Iadef67dd23c6e100b2d9b6b44b485772bafb0cd2

7 years agoRevert "toybox: find: Fix segfault when using -iname/-ipath with -exec"
Steve Kondik [Sun, 22 May 2016 23:59:11 +0000 (16:59 -0700)]
Revert "toybox: find: Fix segfault when using -iname/-ipath with -exec"

 * Tom's patch was upstreamed.

This reverts commit d5de71798489bf4cc2c1e89c0b0f2768a3b2ae47.

Change-Id: I920566d757cf9748fbb472ab5cd44318876a2f8c