OSDN Git Service

android-x86/external-toybox.git
7 years agodu: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32...
Rob Landley [Tue, 25 Oct 2016 22:50:32 +0000 (22:50 +0000)]
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: a801c5019b

Change-Id: Ie9ce288d59fe5280c87586907cafdbcc32e5f47d

7 years agodu: 32 bit systems were maxing out at 2GB when they should max out at 2TB
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).

(cherry picked from commit 8d0f0b6ba864155914f88e39076213b4486efee4)

Bug: http://b/32331571
Test: du -sh /data/local/tmp after filling that directory
Change-Id: I8c8ad146f4c1c1daa6c2cf276ec01aa6e390cc91

8 years agoMerge remote-tracking branch 'goog/master' into merge
Elliott Hughes [Sat, 27 Feb 2016 18:14:34 +0000 (10:14 -0800)]
Merge remote-tracking branch 'goog/master' into merge

8 years agoRegenerate generated files.
Elliott Hughes [Sat, 20 Feb 2016 05:48:20 +0000 (05:48 +0000)]
Regenerate generated files.
am: bae185a8e0

* commit 'bae185a8e0bcc981a170f338edf44900ba7888fa':
  Regenerate generated files.

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Sat, 20 Feb 2016 05:43:54 +0000 (05:43 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 19ef8b8a7d

* commit '19ef8b8a7d596e032eb5b2449120d6d3d3031f0e':
  Implement "insmod -".
  Add test_COMMAND for each command, update "make help" to describe TEST_HOST and VERBOSE=fail, and fix a quote mismatch.
  Help text update from Isaac Dunham, tweaked slightly.
  Add xxd -p and -r.
  RLIMIT_RTTIME was added to the kernel in 2008, you can't expect uClibc to have noticed yet.
  The perl build's attempt to escape spaces and such in LD_LIBRARY_PATH is _SAD_. It uses a sed expression that assumes you can escape - to use it as a literal (you can't, it has to be first or last char of the range), and assumes you have to escape delimiters in sed [] context (you don't), and/or that non-printf escapes become the literal character (they don't, the backslash is preserved as a literal), meaning it winds up doing "s/[\-\]//" which is a length 1 range, which is officially undefined behavior according to posix, and regcomp errors out.
  Add support for getprop -Z
  Fix remounting /system on Android.
  Testfile with the 3 different types of "not utf8 output" escaped chars in it.
  Add dynamic/static checking to file (printing dynamic linker if found).
  Add the sed invocations to convert tabs/spaces and back, plus some tweaks.
  Cleanup pass on file.c, and add detection of different ELF architectures.
  Add "make list", rename make working->list_working and pending->list_pending, and filter out commands that aren't nofork but aren't installed either (toyflags 0, I.E. recognized aliases like "-sh" called from login).
  Implement file(1).
  Fix wc -c optimization.
  removed unread assignment in sed.c

8 years agoRegenerate generated files.
Elliott Hughes [Sat, 20 Feb 2016 05:37:17 +0000 (21:37 -0800)]
Regenerate generated files.

Change-Id: I7c353a8c75fc6de1210e78b5729491e6dbfbe778

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sat, 20 Feb 2016 04:31:44 +0000 (20:31 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoImplement "insmod -".
Elliott Hughes [Fri, 19 Feb 2016 00:24:02 +0000 (16:24 -0800)]
Implement "insmod -".

Also use finit_module if available. Given that "insmod -" requires
init_module, maybe this isn't a worthwhile optimization. Given that
"insmod /actual/file.ko" is the common use case, maybe it is.

Fix a bug in readfileat where *plen would be corrupted if you didn't supply
your own buffer (because ibuf is 0 in that case, not a pointer to the start
of the allocated space).

8 years agoAdd test_COMMAND for each command, update "make help" to describe TEST_HOST
Rob Landley [Fri, 19 Feb 2016 23:56:01 +0000 (17:56 -0600)]
Add test_COMMAND for each command, update "make help" to describe TEST_HOST
and VERBOSE=fail, and fix a quote mismatch.

8 years agoHelp text update from Isaac Dunham, tweaked slightly.
Rob Landley [Fri, 19 Feb 2016 17:58:17 +0000 (11:58 -0600)]
Help text update from Isaac Dunham, tweaked slightly.

8 years agoAdd xxd -p and -r.
Elliott Hughes [Fri, 19 Feb 2016 05:11:07 +0000 (21:11 -0800)]
Add xxd -p and -r.

SELinux denials include hex-encoded paths in the log messages; xxd -r -p is
a convenient way to decode them.

The heuristics are a little weird to my mind, but match the documentation
and observed behavior.

8 years agoRLIMIT_RTTIME was added to the kernel in 2008, you can't expect uClibc to have notice...
Rob Landley [Fri, 19 Feb 2016 02:31:22 +0000 (20:31 -0600)]
RLIMIT_RTTIME was added to the kernel in 2008, you can't expect uClibc to have noticed yet.

8 years agoThe perl build's attempt to escape spaces and such in LD_LIBRARY_PATH is _SAD_.
Rob Landley [Thu, 18 Feb 2016 01:21:44 +0000 (19:21 -0600)]
The perl build's attempt to escape spaces and such in LD_LIBRARY_PATH is _SAD_.
It uses a sed expression that assumes you can escape - to use it as a literal
(you can't, it has to be first or last char of the range), and assumes
you have to escape delimiters in sed [] context (you don't), and/or that
non-printf escapes become the literal character (they don't, the backslash
is preserved as a literal), meaning it winds up doing "s/[\-\]//" which is
a length 1 range, which is officially undefined behavior according to posix,
and regcomp errors out.

But if we don't accept it (like other implementations do) the perl build
breaks. So collapse [A-A] into just [A].

Testcae taken from perl 5.22.0 file Makefile.SH line 8.

(While we're at it, remove an unused argument from a function.)

8 years agoAdd support for getprop -Z
Tom Cherry [Thu, 18 Feb 2016 00:27:08 +0000 (16:27 -0800)]
Add support for getprop -Z

Add support for a -Z option to getprop that will either print the
SELabel of a given property if one is provided or print all properties
that have been set along with their SELabel.

Also, correct a memory leak when freeing TT.nv.

8 years agoFix remounting /system on Android.
Elliott Hughes [Thu, 18 Feb 2016 00:40:17 +0000 (16:40 -0800)]
Fix remounting /system on Android.

This adds the missing "relatime" option, fixes error handling logic (mount
returns 0/-1, not an errno value, and I at least get EACCES rather than
EROFS in the case where the underlying block device is read-only; we should
also probably only try again if the ioctl actually succeeded), and adds the
missing newline in case where we go around and try again read-only.

The test case was "mount -o rw,remount /system" on Android.

8 years agoTestfile with the 3 different types of "not utf8 output" escaped chars in it.
Rob Landley [Wed, 17 Feb 2016 23:35:42 +0000 (17:35 -0600)]
Testfile with the 3 different types of "not utf8 output" escaped chars in it.

8 years agoAdd dynamic/static checking to file (printing dynamic linker if found).
Rob Landley [Wed, 17 Feb 2016 20:01:19 +0000 (14:01 -0600)]
Add dynamic/static checking to file (printing dynamic linker if found).

8 years agoAdd the sed invocations to convert tabs/spaces and back, plus some tweaks.
Rob Landley [Wed, 17 Feb 2016 18:30:31 +0000 (12:30 -0600)]
Add the sed invocations to convert tabs/spaces and back, plus some tweaks.

8 years agoCleanup pass on file.c, and add detection of different ELF architectures.
Rob Landley [Mon, 15 Feb 2016 22:41:14 +0000 (16:41 -0600)]
Cleanup pass on file.c, and add detection of different ELF architectures.

8 years agoAdd "make list", rename make working->list_working and pending->list_pending,
Rob Landley [Sun, 14 Feb 2016 20:04:21 +0000 (14:04 -0600)]
Add "make list", rename make working->list_working and pending->list_pending,
and filter out commands that aren't nofork but aren't installed either
(toyflags 0, I.E. recognized aliases like "-sh" called from login).

8 years agoImplement file(1).
Elliott Hughes [Sat, 13 Feb 2016 17:50:20 +0000 (09:50 -0800)]
Implement file(1).

Unlike the POSIX file(1), there's no magic file here, just hard-coded
common (non-obsolete) file formats. Personally most of my use of file(1)
is as a one-line readelf(1) summarizer, so although I assume a full POSIX
file(1) is out of scope (because just the database would likely be larger
than all the rest of toybox), a subset that only supports in-use file types
actually covers most of the use cases I encounter personally.

Also fix peek_be/peek_le.

8 years agoFix wc -c optimization.
Elliott Hughes [Fri, 12 Feb 2016 16:13:06 +0000 (08:13 -0800)]
Fix wc -c optimization.

Check the fstat(2) return value rather than read uninitialized memory if
it failed, and add a special case for files that claim to be zero-length
but aren't (as is common in /proc on Linux).

8 years agoAdd ulimit.
Elliott Hughes [Fri, 12 Feb 2016 16:04:51 +0000 (16:04 +0000)]
Add ulimit.
am: 59224354ca

* commit '59224354ca99b704cec9c2280689949cf2f6b3c8':
  Add ulimit.

8 years agoAdd ulimit.
Elliott Hughes [Fri, 12 Feb 2016 03:37:05 +0000 (19:37 -0800)]
Add ulimit.

Change-Id: I3f8bfcd76811a7719d24cb3a753452f9bc7ab99a

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 12 Feb 2016 03:30:15 +0000 (03:30 +0000)]
Regenerate generated files.
am: 59a36104fb

* commit '59a36104fbd8d0053240767de5db7ee0dcb3129d':
  Regenerate generated files.

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Fri, 12 Feb 2016 03:30:10 +0000 (03:30 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 545322e487

* commit '545322e487d010f921adc23f64da1a188728fd36':
  Ignore .singlemake.
  Wean scripts/install.c off toys.h so cross compiling less brittle.
  Don't include toys.h from config2help.c (so cross-compiling from systems we don't run on is easier), and use HELP_ instead of help_ for macro prefixes to avoid name collisions (such as help_exit() the function).
  toybox: tar: Fix support for long names
  toybox: tar: Fix tar tests
  main.c: fix non-root usage when installed suid root
  Add seq -w, suggested by izabera.
  Factor out strnstr() since posix hasn't got it, and add a config option for the deeply sad passwd heuristics that don't even check numbers and punctuation.
  make wc -c faster
  use unsigned long with factor
  Although printf("%.*s", INT_MAX, s) works fine on ubuntu 12.04, it broke since.
  implement env -u
  Add ulimit.
  Fix xpipe. (thinko.)
  Add xpipe() to lib.
  Dependencies for "make COMMAND"
  Add "make ls" and friends targets, with "make working" and "make pending" lists.
  Add a warning when building commands out of pending.
  Debian unstable is even more pedantic than previous debian.

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 12 Feb 2016 03:18:13 +0000 (19:18 -0800)]
Regenerate generated files.

Change-Id: I3ce89d325c40621d33f5be3af4bb696d53ed5c44

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 12 Feb 2016 03:17:08 +0000 (19:17 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I8a0d8e892ca8aa9ec84c33ead812701ccf67f7bc

8 years agoremoved unread assignment in sed.c
lovelycuppatea [Thu, 11 Feb 2016 21:42:28 +0000 (21:42 +0000)]
removed unread assignment in sed.c

clang scan-build flags up this line as being unread, so clearing from code.

8 years agoInclude the upstream toybox version in "toybox --version".
Elliott Hughes [Thu, 11 Feb 2016 23:09:30 +0000 (23:09 +0000)]
Include the upstream toybox version in "toybox --version".
am: 85c1ed4679

* commit '85c1ed467938771bf9fd236566b30f9cf776a6c6':
  Include the upstream toybox version in "toybox --version".

8 years agoInclude the upstream toybox version in "toybox --version".
Elliott Hughes [Thu, 11 Feb 2016 04:00:09 +0000 (20:00 -0800)]
Include the upstream toybox version in "toybox --version".

SHAs have their uses, but upstream version numbers are better for getting
a quick ballpark figure for the version.

Before:
  afc66714a4e3-android

After:
  0.7.0-afc66714a4e3-android

(cherry picked from commit 35c9c63120a40f4cfe119f5670d914ac5e69c0f6)

Change-Id: I631b220135560023aa114d2fd6c324633afb8dcc

8 years agoIgnore .singlemake.
Rob Landley [Thu, 11 Feb 2016 05:30:45 +0000 (23:30 -0600)]
Ignore .singlemake.

8 years agoWean scripts/install.c off toys.h so cross compiling less brittle.
Rob Landley [Thu, 11 Feb 2016 05:27:55 +0000 (23:27 -0600)]
Wean scripts/install.c off toys.h so cross compiling less brittle.

8 years agoDon't include toys.h from config2help.c (so cross-compiling from systems we
Rob Landley [Thu, 11 Feb 2016 05:06:12 +0000 (23:06 -0600)]
Don't include toys.h from config2help.c (so cross-compiling from systems we
don't run on is easier), and use HELP_ instead of help_ for macro prefixes
to avoid name collisions (such as help_exit() the function).

8 years agotoybox: tar: Fix support for long names
Tom Marshall [Wed, 10 Feb 2016 05:01:41 +0000 (00:01 -0500)]
toybox: tar: Fix support for long names

Pathnames may be longer than the name field in the header, so use
strncpy() instead of xstrncpy() to avoid bailing out.

Also add unit tests to ensure proper handling of short and long
pathnames.

Change-Id: Id025891993746889564b479e5185cf9721b54a55

8 years agotoybox: tar: Fix tar tests
Tom Marshall [Tue, 9 Feb 2016 23:32:40 +0000 (18:32 -0500)]
toybox: tar: Fix tar tests

Don't rely on ordering of readdir for tests.

Change-Id: Ice24bb64ce453acb0006e3746677d619db933ab1

8 years agomain.c: fix non-root usage when installed suid root
Patrick Ohly [Tue, 9 Feb 2016 15:43:35 +0000 (16:43 +0100)]
main.c: fix non-root usage when installed suid root

When toybox is installed suid root and invoked by a non-root user for
commands which do not require root privileges, it drops the root
privileges during initialization.

However, since commit afba5b8efd the result check of setuid() was
inverted such that it aborted on success, making toybox unusuable for
non-root users.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
8 years agoAdd seq -w, suggested by izabera.
Rob Landley [Thu, 11 Feb 2016 04:31:59 +0000 (22:31 -0600)]
Add seq -w, suggested by izabera.

8 years agoInclude the upstream toybox version in "toybox --version".
Elliott Hughes [Thu, 11 Feb 2016 04:00:09 +0000 (20:00 -0800)]
Include the upstream toybox version in "toybox --version".

SHAs have their uses, but upstream version numbers are better for getting
a quick ballpark figure for the version.

Before:
  afc66714a4e3-android

After:
  0.7.0-afc66714a4e3-android

Change-Id: Id546ddd003bed995043719bd6e8c7b6c42cb498f

8 years agoFactor out strnstr() since posix hasn't got it, and add a config option for
Rob Landley [Thu, 11 Feb 2016 03:05:22 +0000 (21:05 -0600)]
Factor out strnstr() since posix hasn't got it, and add a config option for
the deeply sad passwd heuristics that don't even check numbers and punctuation.

8 years agomake wc -c faster
izabera [Sat, 6 Feb 2016 14:41:59 +0000 (15:41 +0100)]
make wc -c faster

8 years agouse unsigned long with factor
izabera [Sat, 6 Feb 2016 14:25:35 +0000 (15:25 +0100)]
use unsigned long with factor

8 years agoAlthough printf("%.*s", INT_MAX, s) works fine on ubuntu 12.04, it broke since.
Rob Landley [Wed, 10 Feb 2016 22:23:31 +0000 (16:23 -0600)]
Although printf("%.*s", INT_MAX, s) works fine on ubuntu 12.04, it broke since.

8 years agoimplement env -u
izabera [Wed, 10 Feb 2016 00:26:01 +0000 (01:26 +0100)]
implement env -u

8 years agoAdd ulimit.
Rob Landley [Tue, 9 Feb 2016 23:23:31 +0000 (17:23 -0600)]
Add ulimit.

This isn't a shell builtin, it uses prlimit to target any pid (without -P
it defaults to $PPID, so acts like historical ulimit by default).

8 years agoFix xpipe. (thinko.)
Rob Landley [Tue, 9 Feb 2016 23:06:12 +0000 (17:06 -0600)]
Fix xpipe. (thinko.)

8 years agoAdd xpipe() to lib.
Rob Landley [Mon, 8 Feb 2016 21:24:33 +0000 (15:24 -0600)]
Add xpipe() to lib.

8 years agoDependencies for "make COMMAND"
Rob Landley [Mon, 8 Feb 2016 01:09:39 +0000 (19:09 -0600)]
Dependencies for "make COMMAND"

8 years agoAdd "make ls" and friends targets, with "make working" and "make pending" lists.
Rob Landley [Mon, 8 Feb 2016 00:15:53 +0000 (18:15 -0600)]
Add "make ls" and friends targets, with "make working" and "make pending" lists.

8 years agoAdd a warning when building commands out of pending.
Rob Landley [Sun, 7 Feb 2016 18:27:40 +0000 (12:27 -0600)]
Add a warning when building commands out of pending.

8 years agoRegenerate generated files.
Elliott Hughes [Sat, 6 Feb 2016 06:03:49 +0000 (22:03 -0800)]
Regenerate generated files.

Change-Id: I16b793656a57d6f5bba43bc3cf9d9bcc7a5707f8

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sat, 6 Feb 2016 04:52:49 +0000 (20:52 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoDebian unstable is even more pedantic than previous debian.
Rob Landley [Fri, 5 Feb 2016 21:13:24 +0000 (15:13 -0600)]
Debian unstable is even more pedantic than previous debian.

8 years agoAnother fix from Josh Gao to avoid a null pointer dereference, and
Rob Landley [Fri, 5 Feb 2016 18:37:50 +0000 (12:37 -0600)]
Another fix from Josh Gao to avoid a null pointer dereference, and
minor cleanup of previous commit.

8 years agoFix segfault when `find -iname` gets no argument.
Josh Gao [Thu, 4 Feb 2016 18:49:52 +0000 (10:49 -0800)]
Fix segfault when `find -iname` gets no argument.

8 years agoFix -H and -n with -ABC, and add tests.
Rob Landley [Thu, 4 Feb 2016 20:10:36 +0000 (14:10 -0600)]
Fix -H and -n with -ABC, and add tests.

8 years agoMerge branch 'master' of ssh://github.com/landley/toybox
Rob Landley [Thu, 4 Feb 2016 20:10:30 +0000 (14:10 -0600)]
Merge branch 'master' of ssh://github.com/landley/toybox

8 years agoCommit d20b9ff3ee0f fixed most of yocto building, but there was a leftover
Rob Landley [Thu, 4 Feb 2016 04:33:04 +0000 (22:33 -0600)]
Commit d20b9ff3ee0f fixed most of yocto building, but there was a leftover
(redundant) file built from the makefile (which _should_ just be a wrapper
for scripts/make.sh and scripts/install.sh).

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 3 Feb 2016 01:15:43 +0000 (17:15 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoUpdate to status.html and some test suite cosmetic tweaks.
Rob Landley [Tue, 2 Feb 2016 20:56:27 +0000 (14:56 -0600)]
Update to status.html and some test suite cosmetic tweaks.

8 years agoEditorial comment.
Rob Landley [Tue, 2 Feb 2016 20:23:37 +0000 (14:23 -0600)]
Editorial comment.

8 years agoFluffier release notes.
Rob Landley [Tue, 2 Feb 2016 20:20:16 +0000 (14:20 -0600)]
Fluffier release notes.

8 years agoRelease notes.
Rob Landley [Tue, 2 Feb 2016 17:18:50 +0000 (11:18 -0600)]
Release notes.

8 years agoRelease time.
Rob Landley [Tue, 2 Feb 2016 17:12:05 +0000 (11:12 -0600)]
Release time.

Calling it 0.7.0 because the fullscreen (cursor/utf8) infrasructure is in now.

8 years agoRegenerate generated files.
Elliott Hughes [Tue, 2 Feb 2016 16:08:46 +0000 (08:08 -0800)]
Regenerate generated files.

Change-Id: I9fe5ea516113304cf8b3aae4379e1f9c8cacd186

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 2 Feb 2016 15:45:25 +0000 (07:45 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoFix directory test in cp.
Elliott Hughes [Wed, 6 Jan 2016 16:38:46 +0000 (08:38 -0800)]
Fix directory test in cp.

Commit 3d33dd80f8cb931e293d7f64c44bc357fec11120 fixed a use of S_ISDIR
on st_dev rather than st_mode in find, but there was another instance
of the same error in cp.

8 years agoAdd find -delete
Rob Landley [Mon, 1 Feb 2016 18:46:15 +0000 (12:46 -0600)]
Add find -delete

8 years agoMore testsuite tweaks.
Rob Landley [Sun, 31 Jan 2016 22:28:43 +0000 (16:28 -0600)]
More testsuite tweaks.

8 years agochmod.test had umask assumptions which broke, so set explicit umask.
Rob Landley [Sun, 31 Jan 2016 21:37:51 +0000 (15:37 -0600)]
chmod.test had umask assumptions which broke, so set explicit umask.

8 years agoFix broken test in cat.test.
Rob Landley [Sun, 31 Jan 2016 21:30:48 +0000 (15:30 -0600)]
Fix broken test in cat.test.

"cat /proc/self/exe && cmp /proc/self/exe" won't see the same file if cat
and cmp aren't both in a toybox multiplexer binary, so snapshot and pick one.

8 years agoFix blkid typo (label wasn't detected in murderfs).
Rob Landley [Sun, 31 Jan 2016 20:33:20 +0000 (14:33 -0600)]
Fix blkid typo (label wasn't detected in murderfs).

8 years agoTweak to "find" tests.
Rob Landley [Sun, 31 Jan 2016 18:42:16 +0000 (12:42 -0600)]
Tweak to "find" tests.

8 years agoAdd grep -B -C
Rob Landley [Sun, 31 Jan 2016 04:07:58 +0000 (22:07 -0600)]
Add grep -B -C

8 years agoAdd grep -A
Rob Landley [Sun, 31 Jan 2016 00:28:39 +0000 (18:28 -0600)]
Add grep -A

8 years agoFix two CFG_TOYBOX_SUID corner cases:
Rob Landley [Sat, 30 Jan 2016 22:28:13 +0000 (16:28 -0600)]
Fix two CFG_TOYBOX_SUID corner cases:

1) Don't try to force re-exec unless we actually dropped permissions.
   (Fixes "./toybox mount" when no suid bit on toybox binary, which
   previously exited.)
2) Set temporary toys.which value for error reporting.
   (Fixes "ln -s toybox mount && ./mount" with CFG_TOYBOX_DEBUG and
   no suid bit, which previously segfaulted.)

8 years agoAdd SIGWINCH support to top, and implement -o and -n in pgrep/pkill.
Rob Landley [Fri, 29 Jan 2016 04:10:06 +0000 (22:10 -0600)]
Add SIGWINCH support to top, and implement -o and -n in pgrep/pkill.

8 years agoAdding -M broke ps -k header printing without -M.
Rob Landley [Thu, 28 Jan 2016 20:22:46 +0000 (14:22 -0600)]
Adding -M broke ps -k header printing without -M.

8 years agoBugfix I forgot to checkin, plus a wrapper function.
Rob Landley [Thu, 28 Jan 2016 19:36:12 +0000 (13:36 -0600)]
Bugfix I forgot to checkin, plus a wrapper function.

8 years agoDon't resort or recalculate headers for cursor up/down, do PGUP PGDN, and
Rob Landley [Thu, 28 Jan 2016 03:19:12 +0000 (21:19 -0600)]
Don't resort or recalculate headers for cursor up/down, do PGUP PGDN, and
down move way down past end of list.

8 years agoAdd cpu line to top, and fix a bug initializing upticks slot.
Rob Landley [Thu, 28 Jan 2016 02:27:33 +0000 (20:27 -0600)]
Add cpu line to top, and fix a bug initializing upticks slot.

8 years agolong opts and -f for unshare
izabera [Wed, 27 Jan 2016 18:31:58 +0000 (19:31 +0100)]
long opts and -f for unshare

8 years agoDon't try to be fancy with top headers, just hardwired the standardish ones.
Rob Landley [Wed, 27 Jan 2016 06:46:56 +0000 (00:46 -0600)]
Don't try to be fancy with top headers, just hardwired the standardish ones.

Still need to do the cpu(s) line in top.

8 years agoAdd ps -M to measure/expand field widths if they don't fit.
Rob Landley [Tue, 26 Jan 2016 20:33:50 +0000 (14:33 -0600)]
Add ps -M to measure/expand field widths if they don't fit.

(Still truncates at the right edge to fit terminal width, but last commit
made -w the default when no terminal width detected.)

8 years agoAdd ps -O (inserts extra args before last field), and make -w the default
Rob Landley [Tue, 26 Jan 2016 19:41:51 +0000 (13:41 -0600)]
Add ps -O (inserts extra args before last field), and make -w the default
when we haven't got a terminal width. Replace top CMDLINE with ARGS.

More ps infrastructure genericization: parse reverse unconditionally.
Break out get_headers() with global references moved to caller.
change quick_ko() to default_ko() (dlist_terminate is now caller's job).

8 years agoRegenerate generated files.
Elliott Hughes [Tue, 26 Jan 2016 18:49:48 +0000 (10:49 -0800)]
Regenerate generated files.

Change-Id: Ib5c0f4288bec7dcdcfb7c7b23128a15b06608772

8 years agoFix comma_args error reporting.
Elliott Hughes [Sun, 24 Jan 2016 18:51:17 +0000 (10:51 -0800)]
Fix comma_args error reporting.

None of the current callers' callbacks set errno, so this was resulting in
bogus errors like "No device or address" when ps tried to complain about a
misspelled field.

8 years agoFix compiler warnings in traceroute.
Elliott Hughes [Fri, 22 Jan 2016 19:05:04 +0000 (11:05 -0800)]
Fix compiler warnings in traceroute.

If we're fixing warnings in pending...

8 years agoNext lump of top work. Add -o DISPLAY_FIELDS -k FALLBACK_SORTS -s SORT_BY plus
Rob Landley [Mon, 25 Jan 2016 17:43:17 +0000 (11:43 -0600)]
Next lump of top work. Add -o DISPLAY_FIELDS -k FALLBACK_SORTS -s SORT_BY plus
the start of -h HEADER (mostly parses text, but doesn't display %ESCAPES yet).

Added UP, DOWN, and R keys.
Made only iotop STAYROOT (not top), added comment explaining why.
Bumped iotop's historical -O and -K to capital letters.
Added quick_ko() to add argument list from string instead of arg_list.

8 years agoFactor out insanitize() from seq.c to next_printf() in lib.
Rob Landley [Sat, 23 Jan 2016 03:35:48 +0000 (21:35 -0600)]
Factor out insanitize() from seq.c to next_printf() in lib.

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 22 Jan 2016 18:39:49 +0000 (10:39 -0800)]
Regenerate generated files.

Change-Id: I1c57337148fb9865e950a5aba2be38352646cd84

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 22 Jan 2016 18:32:45 +0000 (10:32 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoReplace slot[] constants with SLOT_blah, fix some that weren't displaying right.
Rob Landley [Fri, 22 Jan 2016 01:05:25 +0000 (19:05 -0600)]
Replace slot[] constants with SLOT_blah, fix some that weren't displaying right.

Make fallback sort do string sort after numeric tie, retain absolute uptime
even though relative is needed for %CPU (hence utime2).

8 years agoI cleaned up the code in 'netstat.c' as belows.
Lipi Lee [Thu, 21 Jan 2016 20:03:10 +0000 (14:03 -0600)]
I cleaned up the code in 'netstat.c' as belows.

 - Adjust to 80 columns
 - remove a useless function(strchr_nul), variable, type casting and
   compile warnings(fgets)
 - clean up netstat command option condition
 - change useless double pointer to single point and dynamic memory
   allocation to static one
 - fix a ambiguous return type and typo

8 years agoAdd a sed test from the posix mailing list.
Rob Landley [Thu, 21 Jan 2016 19:04:51 +0000 (13:04 -0600)]
Add a sed test from the posix mailing list.

8 years agoDisable CFG_TOYBOX_DEBUG for now.
Elliott Hughes [Thu, 21 Jan 2016 06:23:26 +0000 (22:23 -0800)]
Disable CFG_TOYBOX_DEBUG for now.

We turned on CFG_TOYBOX_DEBUG so ls would be asan-clean, but that turns out
to have broken mount for non-root users. So let's turn CFG_TOYBOX_DEBUG off
for now, but let's also say that ls should always be asan-clean on Android.

Bug: http://b/26647560
Change-Id: I5392aedd168c1e765e3319e3c76e996040b7e8ab

8 years agoRegenerate generated files.
Elliott Hughes [Thu, 21 Jan 2016 04:41:02 +0000 (20:41 -0800)]
Regenerate generated files.

Also stop using the NORECURSE workaround now runcon has been fixed to
explicitly not recurse.

Change-Id: Ide0e09b9b28adca2f9d4d1e8db98022e9342addd

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Thu, 21 Jan 2016 04:29:28 +0000 (20:29 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoCorrect units of %MEM and %VSZ.
Rob Landley [Wed, 20 Jan 2016 23:33:31 +0000 (17:33 -0600)]
Correct units of %MEM and %VSZ.

8 years agoAdd basic top support to ps.c, delete toys/pending/top.c.
Rob Landley [Wed, 20 Jan 2016 22:51:17 +0000 (16:51 -0600)]
Add basic top support to ps.c, delete toys/pending/top.c.

While I'm there, pack the ps help text, break out TOP_COMMON (todo: update
config2help to collate that properly), add -o CPU showing which processor
this pid is running on, implement -o C (it's %cpu without the fractional
part), add -o %MEM, fix header padding.