OSDN Git Service

android-x86/external-toybox.git
8 years agoRegenerate generated files after upstream sync.
Elliott Hughes [Fri, 30 Oct 2015 20:22:47 +0000 (20:22 +0000)]
Regenerate generated files after upstream sync.
am: 941d74d9c0

* commit '941d74d9c07a4d53368aaafb8e749ec4ffbca246':
  Regenerate generated files after upstream sync.

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Fri, 30 Oct 2015 20:22:44 +0000 (20:22 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 61acb4487d

* commit '61acb4487d20b626ae6fb62f3404ecffb47f7e30':
  Fix sed bug reported by Isabella Parakiss, where sed -e "/x/c\" -e "y" added an extra newline because the test for whether we have an existing string to append a newline to was checking if struct step had data appended to it, and the /x/ regex is data appended to it. Change test to check for null terminator at ->arg1 offset.
  Oops, forgot to check in the header file change for ps.c.
  Promote ps to posix.
  Free more stuff in debug cleanup.
  Implement -suUgG and -o majfl,minfl, move uid/ruid/gid/rgid into slots[31-34] and vmlck into slot[18], pass error message to comma_args(), collate -stuUgG callbacks into parse_rest().
  Tweak build instructions in README/code.html.

8 years agoRegenerate generated files after upstream sync.
Elliott Hughes [Fri, 30 Oct 2015 20:18:37 +0000 (13:18 -0700)]
Regenerate generated files after upstream sync.

Change-Id: I346f837de546bdf56249ee39f70e02265c5d44a6

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 30 Oct 2015 20:10:53 +0000 (13:10 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoFix sed bug reported by Isabella Parakiss, where sed -e "/x/c\" -e "y" added
Rob Landley [Thu, 29 Oct 2015 06:30:58 +0000 (01:30 -0500)]
Fix sed bug reported by Isabella Parakiss, where sed -e "/x/c\" -e "y" added
an extra newline because the test for whether we have an existing string to
append a newline to was checking if struct step had data appended to it,
and the /x/ regex is data appended to it. Change test to check for null
terminator at ->arg1 offset.

8 years agoOops, forgot to check in the header file change for ps.c.
Rob Landley [Thu, 29 Oct 2015 04:31:30 +0000 (23:31 -0500)]
Oops, forgot to check in the header file change for ps.c.

8 years agoPromote ps to posix.
Rob Landley [Thu, 29 Oct 2015 04:30:36 +0000 (23:30 -0500)]
Promote ps to posix.

8 years agoFree more stuff in debug cleanup.
Rob Landley [Thu, 29 Oct 2015 04:27:37 +0000 (23:27 -0500)]
Free more stuff in debug cleanup.

Tempted to convert the struct arg_list and ptr_len stuff to arrays and
make the parsing table driven, but there's enough direct usages of each
field it's not a net win.

8 years agoImplement -suUgG and -o majfl,minfl, move uid/ruid/gid/rgid into slots[31-34]
Rob Landley [Thu, 29 Oct 2015 03:52:11 +0000 (22:52 -0500)]
Implement -suUgG and -o majfl,minfl, move uid/ruid/gid/rgid into slots[31-34]
and vmlck into slot[18], pass error message to comma_args(), collate -stuUgG
callbacks into parse_rest().

8 years agoTweak build instructions in README/code.html.
Rob Landley [Thu, 29 Oct 2015 02:41:45 +0000 (21:41 -0500)]
Tweak build instructions in README/code.html.

8 years agoRegenerate generated files after upstream sync.
Elliott Hughes [Wed, 28 Oct 2015 22:01:29 +0000 (22:01 +0000)]
Regenerate generated files after upstream sync.
am: 103f0fa6bc

* commit '103f0fa6bc41bb627f45675a5a8f4d2bd4e8c631':
  Regenerate generated files after upstream sync.

8 years agoRegenerate generated files after upstream sync.
Elliott Hughes [Wed, 28 Oct 2015 21:54:13 +0000 (14:54 -0700)]
Regenerate generated files after upstream sync.

(Also fix sort order in Android.mk.)

Change-Id: I64d171fe9dc090ee7f17c489483147cd96e2e26c

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Wed, 28 Oct 2015 21:52:59 +0000 (21:52 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: c5d47d26b7

* commit 'c5d47d26b71a1468245e1cff372361c48928fc63':
  Use the /proc/self/fd/%d workaround for O_PATH not letting you read xattrs, inspired by: https://android-review.googlesource.com/#/c/152663/4/libc/bionic/fgetxattr.cpp
  Fix ls error message for chmod -r directories.
  Install without a mode should use 0755, and check FLAG_preserve instead of the global so "install -g 0" doesn't alias to "cp --preserve 0" and error out. through to --preserve 0"
  Replace xcount_cpus() with a call to sysconf(_SC_NPROCESSORS_CONF)
  Add xcount_cpus()
  Add comma_args() and factor out parse_o(), parse_t(), and parse_p() to use it. Fix FLAG_w.
  Factor out parse_o() and make -l -f and default output work on strings rather than bitfields.
  More ps work, and fill out remaining help text. Fix more l/r justification, implement uname vsz vsize and stat.
  Fix netstat build warnings.
  More ps work: move l/r justification to widths[], add RUID/RGID, implement PGID, plus tty detection fix from Elliott Hughes.
  fix dhcpd warning

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 28 Oct 2015 21:41:16 +0000 (14:41 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoUse the /proc/self/fd/%d workaround for O_PATH not letting you read xattrs,
Rob Landley [Wed, 28 Oct 2015 04:57:08 +0000 (23:57 -0500)]
Use the /proc/self/fd/%d workaround for O_PATH not letting you read xattrs,
inspired by:
https://android-review.googlesource.com/#/c/152663/4/libc/bionic/fgetxattr.cpp

8 years agoFix ls error message for chmod -r directories.
Rob Landley [Wed, 28 Oct 2015 04:12:48 +0000 (23:12 -0500)]
Fix ls error message for chmod -r directories.

Also, if you mkdir "$(echo -e "one\ntwo"); chmod -r one*; ls -q one*
it honors -q.

8 years agoInstall without a mode should use 0755, and check FLAG_preserve instead of
Rob Landley [Wed, 28 Oct 2015 02:47:24 +0000 (21:47 -0500)]
Install without a mode should use 0755, and check FLAG_preserve instead of
the global so "install -g 0" doesn't alias to "cp --preserve 0" and error out.
through to --preserve 0"

8 years agoReplace xcount_cpus() with a call to sysconf(_SC_NPROCESSORS_CONF)
Rob Landley [Tue, 27 Oct 2015 10:58:19 +0000 (05:58 -0500)]
Replace xcount_cpus() with a call to sysconf(_SC_NPROCESSORS_CONF)

8 years agoAdd xcount_cpus()
Rob Landley [Sun, 25 Oct 2015 21:50:03 +0000 (16:50 -0500)]
Add xcount_cpus()

8 years agoAdd comma_args() and factor out parse_o(), parse_t(), and parse_p() to use it.
Rob Landley [Sun, 25 Oct 2015 12:48:24 +0000 (07:48 -0500)]
Add comma_args() and factor out parse_o(), parse_t(), and parse_p() to use it.
Fix FLAG_w.

8 years agoFactor out parse_o() and make -l -f and default output work on strings
Rob Landley [Sun, 25 Oct 2015 11:33:21 +0000 (06:33 -0500)]
Factor out parse_o() and make -l -f and default output work on strings
rather than bitfields.

8 years agoMore ps work, and fill out remaining help text.
Rob Landley [Sun, 25 Oct 2015 10:39:04 +0000 (05:39 -0500)]
More ps work, and fill out remaining help text.
Fix more l/r justification, implement uname vsz vsize and stat.

8 years agoFix netstat build warnings.
Elliott Hughes [Fri, 23 Oct 2015 17:54:07 +0000 (10:54 -0700)]
Fix netstat build warnings.

Fixes two instances of "warning: use of logical '&&' with constant operand".

Change-Id: I2bb1ba4e389f8a9e54af8ee3ab23d8849fc329f0

8 years agoMore ps work: move l/r justification to widths[], add RUID/RGID, implement PGID,
Rob Landley [Fri, 23 Oct 2015 20:12:14 +0000 (15:12 -0500)]
More ps work: move l/r justification to widths[], add RUID/RGID, implement PGID,
plus tty detection fix from Elliott Hughes.

8 years agoSwitch to toybox df.
Elliott Hughes [Fri, 23 Oct 2015 19:22:47 +0000 (19:22 +0000)]
Switch to toybox df.
am: 578e62806a

* commit '578e62806af81c858150d5fa45842781e1b35911':
  Switch to toybox df.

8 years agoSwitch to toybox df.
Elliott Hughes [Fri, 23 Oct 2015 18:10:39 +0000 (11:10 -0700)]
Switch to toybox df.

Change-Id: Idbaa672685d548dc642b10af5ff3027d9eb48103

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 23 Oct 2015 17:50:49 +0000 (17:50 +0000)]
Regenerate generated files.
am: 064520b010

* commit '064520b0106bb988174c2f38e6b185317486fff0':
  Regenerate generated files.

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Fri, 23 Oct 2015 17:50:45 +0000 (17:50 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am: e80ddaeff1

* commit 'e80ddaeff17525b5a4d874ac0ca92dc44e5f3523':
  Auto-size df columns.
  Make ps.c whitespace consistent. (Assignment has spaces around operator, comparison doesn't.)
  ps: implement -t, remove leading 0 from ETIME days, implement -o GROUP,GID,PCPU
  Move d/h units from %d %D output to default format string.
  More ps work, tested up through etime now.
  Fix ps display padding (truncation) and adjust -o pri by one.
  More ps work, implement -p, correct several -o fields and general alignment.
  make.sh: missing cflags for config2help
  Cleanup pass on pgrep: remove flag_twiddle macros, use 0 constants, unify some TT.signame tests checking constant value variable initialized to.
  "stat -c %T" support (filesystem type names) based on patch from Hyejin Kim.

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 23 Oct 2015 17:44:33 +0000 (10:44 -0700)]
Regenerate generated files.

Change-Id: Ib50794cf0fd5df93f903c66e9e4bd3b52458e1b1

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 23 Oct 2015 17:41:33 +0000 (10:41 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agofix dhcpd warning
Yeongdeok Suh [Fri, 23 Oct 2015 08:03:57 +0000 (17:03 +0900)]
fix dhcpd warning

8 years agoAuto-size df columns.
Elliott Hughes [Thu, 22 Oct 2015 23:35:33 +0000 (18:35 -0500)]
Auto-size df columns.

On Android, the filesystem column is pretty wide. Actually measure the widths.

8 years agoMake ps.c whitespace consistent.
Rob Landley [Wed, 21 Oct 2015 18:16:55 +0000 (13:16 -0500)]
Make ps.c whitespace consistent.
(Assignment has spaces around operator, comparison doesn't.)

8 years agops: implement -t, remove leading 0 from ETIME days, implement -o GROUP,GID,PCPU
Rob Landley [Wed, 21 Oct 2015 18:00:59 +0000 (13:00 -0500)]
ps: implement -t, remove leading 0 from ETIME days, implement -o GROUP,GID,PCPU

8 years agoMove d/h units from %d %D output to default format string.
Rob Landley [Wed, 21 Oct 2015 04:35:06 +0000 (23:35 -0500)]
Move d/h units from %d %D output to default format string.

8 years agoMore ps work, tested up through etime now.
Rob Landley [Sun, 18 Oct 2015 00:53:02 +0000 (19:53 -0500)]
More ps work, tested up through etime now.

8 years agoFix ps display padding (truncation) and adjust -o pri by one.
Rob Landley [Sat, 17 Oct 2015 03:55:11 +0000 (22:55 -0500)]
Fix ps display padding (truncation) and adjust -o pri by one.

8 years agoMore ps work, implement -p, correct several -o fields and general alignment.
Rob Landley [Thu, 15 Oct 2015 15:51:01 +0000 (10:51 -0500)]
More ps work, implement -p, correct several -o fields and general alignment.

8 years agomake.sh: missing cflags for config2help
Alejandro Joya [Wed, 14 Oct 2015 22:50:54 +0000 (17:50 -0500)]
make.sh: missing cflags for config2help

config2help might require extra parameters to be passed to the compiler.
For example it might need an additional header path.

8 years agoCleanup pass on pgrep: remove flag_twiddle macros, use 0 constants,
Rob Landley [Mon, 12 Oct 2015 00:04:39 +0000 (19:04 -0500)]
Cleanup pass on pgrep: remove flag_twiddle macros, use 0 constants,
unify some TT.signame tests checking constant value variable initialized to.

8 years ago"stat -c %T" support (filesystem type names) based on patch from Hyejin Kim.
Rob Landley [Sat, 10 Oct 2015 06:13:35 +0000 (01:13 -0500)]
"stat -c %T" support (filesystem type names) based on patch from Hyejin Kim.

8 years agoam fa01b4ca: Merge changes Ie1705960,I8b94351f,I661540a9,Id2dbdcab,I1223578c, ...
Elliott Hughes [Tue, 6 Oct 2015 22:00:26 +0000 (22:00 +0000)]
am fa01b4ca: Merge changes Ie1705960,I8b94351f,I661540a9,Id2dbdcab,I1223578c, ...

* commit 'fa01b4ca5a3aac08e2a81279375e32b6a8c71183':
  Decode netlink sockets in lsof.
  New command: flock.
  Fix bug in od that screwed up position indicator on arm and mips.
  Fix allnoconfig. (Exporting HOSTCC before HOSTCC?=cc caused a problem.)
  Export makefile variables so you can say "make CROSS_COMPILE=blah-" as well as "CROSS_COMPILE=blah- make".
  Minor cleanup and add "MODALIAS" handler (suggested by Isaac Dunham).
  Back to chipping away at ps...
  Add uClinux analysis to roadmap, and a few other pending changes.
  help_exit() tweak.
  xvfork went away.
  Make defconfig build for nommu.
  Another chunk of nommu support, replacing toys.recursion with toys.stacktop.
  xexec() is noreturn.
  Add xvfork() as a static inline and use it from various places.
  The -o /dev/null trick in probing isn't compatible with elf2flt, so use tempfile.
  Fix a couple things gcc is too dumb to figure out on its own.
  Add find tests.

8 years agoam 0cad3b1b: Regenerate generated files (and build flock).
Elliott Hughes [Tue, 6 Oct 2015 21:56:32 +0000 (21:56 +0000)]
am 0cad3b1b: Regenerate generated files (and build flock).

* commit '0cad3b1b0742168cc6d6c342b566e660d009e5b8':
  Regenerate generated files (and build flock).

8 years agoMerge changes Ie1705960,I8b94351f,I661540a9,Id2dbdcab,I1223578c, ...
Elliott Hughes [Tue, 6 Oct 2015 21:46:27 +0000 (21:46 +0000)]
Merge changes Ie1705960,I8b94351f,I661540a9,Id2dbdcab,I1223578c, ...

* changes:
  Merge remote-tracking branch 'toybox/master' into HEAD
  Decode netlink sockets in lsof.
  New command: flock.
  Fix bug in od that screwed up position indicator on arm and mips.
  Fix allnoconfig. (Exporting HOSTCC before HOSTCC?=cc caused a problem.)
  Export makefile variables so you can say "make CROSS_COMPILE=blah-" as well as "CROSS_COMPILE=blah- make".
  Minor cleanup and add "MODALIAS" handler (suggested by Isaac Dunham).
  Back to chipping away at ps...
  Add uClinux analysis to roadmap, and a few other pending changes.
  help_exit() tweak.
  xvfork went away.
  Make defconfig build for nommu.
  Another chunk of nommu support, replacing toys.recursion with toys.stacktop.
  xexec() is noreturn.
  Add xvfork() as a static inline and use it from various places.
  The -o /dev/null trick in probing isn't compatible with elf2flt, so use tempfile.
  Fix a couple things gcc is too dumb to figure out on its own.
  Add find tests.

8 years agoRegenerate generated files (and build flock).
Elliott Hughes [Tue, 6 Oct 2015 21:31:35 +0000 (14:31 -0700)]
Regenerate generated files (and build flock).

Change-Id: Ia7a11e6a130f4b043842d54d86c9bb02f7ee6270

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 6 Oct 2015 21:22:30 +0000 (14:22 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoDecode netlink sockets in lsof.
Elliott Hughes [Tue, 6 Oct 2015 12:34:58 +0000 (07:34 -0500)]
Decode netlink sockets in lsof.

Refactor the /proc/net parsing so this only adds 7 lines overall.

Also clear the DEVICE field for sockets and fix alignment for long
usernames (until someone implements the two-pass output that measures
columns).

8 years agoNew command: flock.
Elliott Hughes [Tue, 6 Oct 2015 12:19:28 +0000 (07:19 -0500)]
New command: flock.

The brillo folks wanted this in a shell script they're porting over
(so I've only implemented the fd style they wanted, not the named file
style).

8 years agoFix bug in od that screwed up position indicator on arm and mips.
Rob Landley [Tue, 6 Oct 2015 03:52:11 +0000 (22:52 -0500)]
Fix bug in od that screwed up position indicator on arm and mips.

8 years agoFix allnoconfig. (Exporting HOSTCC before HOSTCC?=cc caused a problem.)
Rob Landley [Tue, 6 Oct 2015 01:47:49 +0000 (20:47 -0500)]
Fix allnoconfig. (Exporting HOSTCC before HOSTCC?=cc caused a problem.)

8 years agoExport makefile variables so you can say "make CROSS_COMPILE=blah-" as well as "CROSS...
Rob Landley [Sun, 4 Oct 2015 13:44:17 +0000 (08:44 -0500)]
Export makefile variables so you can say "make CROSS_COMPILE=blah-" as well as "CROSS_COMPILE=blah- make".

8 years agoMinor cleanup and add "MODALIAS" handler (suggested by Isaac Dunham).
Rob Landley [Sun, 4 Oct 2015 11:45:08 +0000 (06:45 -0500)]
Minor cleanup and add "MODALIAS" handler (suggested by Isaac Dunham).

8 years agoBack to chipping away at ps...
Rob Landley [Sat, 3 Oct 2015 17:15:39 +0000 (12:15 -0500)]
Back to chipping away at ps...

8 years agoAdd uClinux analysis to roadmap, and a few other pending changes.
Rob Landley [Fri, 2 Oct 2015 12:50:57 +0000 (07:50 -0500)]
Add uClinux analysis to roadmap, and a few other pending changes.

8 years agohelp_exit() tweak.
Rob Landley [Tue, 29 Sep 2015 10:32:57 +0000 (05:32 -0500)]
help_exit() tweak.

8 years agoxvfork went away.
Rob Landley [Tue, 29 Sep 2015 10:31:02 +0000 (05:31 -0500)]
xvfork went away.

8 years agoMake defconfig build for nommu.
Rob Landley [Tue, 29 Sep 2015 10:09:46 +0000 (05:09 -0500)]
Make defconfig build for nommu.

Adds XVFORK() macro, teaches xpopen_both() to call /proc/self/exe with NULL
argv (and converts cpio -p to use that), adds TOYBOX_FORK guards to some
unconverted commands.

8 years agoAnother chunk of nommu support, replacing toys.recursion with toys.stacktop.
Rob Landley [Sun, 27 Sep 2015 14:03:41 +0000 (09:03 -0500)]
Another chunk of nommu support, replacing toys.recursion with toys.stacktop.

8 years agoxexec() is noreturn.
Rob Landley [Thu, 24 Sep 2015 03:45:06 +0000 (22:45 -0500)]
xexec() is noreturn.

8 years agoAdd xvfork() as a static inline and use it from various places.
Rob Landley [Thu, 24 Sep 2015 03:18:22 +0000 (22:18 -0500)]
Add xvfork() as a static inline and use it from various places.

Note: vfork(), like fork(), can return -1 if too many processes, and
we should notice and fail loudly.

8 years agoThe -o /dev/null trick in probing isn't compatible with elf2flt, so use tempfile.
Rob Landley [Thu, 24 Sep 2015 03:10:23 +0000 (22:10 -0500)]
The -o /dev/null trick in probing isn't compatible with elf2flt, so use tempfile.

8 years agoFix a couple things gcc is too dumb to figure out on its own.
Rob Landley [Thu, 17 Sep 2015 06:49:48 +0000 (01:49 -0500)]
Fix a couple things gcc is too dumb to figure out on its own.

8 years agoam d9e8ff9c: am 92179269: Add a new generated file to .gitignore.
Elliott Hughes [Mon, 14 Sep 2015 21:33:46 +0000 (21:33 +0000)]
am d9e8ff9c: am 92179269: Add a new generated file to .gitignore.

* commit 'd9e8ff9cc601510c17ba6f26dc31f6f3ec511909':
  Add a new generated file to .gitignore.

8 years agoam 92179269: Add a new generated file to .gitignore.
Elliott Hughes [Mon, 14 Sep 2015 21:27:05 +0000 (21:27 +0000)]
am 92179269: Add a new generated file to .gitignore.

* commit '92179269fe8bb96a78f42f69a98a728a98afa96a':
  Add a new generated file to .gitignore.

8 years agoAdd find tests.
Daniel K. Levy [Mon, 14 Sep 2015 21:16:36 +0000 (16:16 -0500)]
Add find tests.

8 years agoAdd a new generated file to .gitignore.
Elliott Hughes [Mon, 14 Sep 2015 18:48:01 +0000 (11:48 -0700)]
Add a new generated file to .gitignore.

Change-Id: If38d74ba591231f80e6857faf9f40eb50df0fbc3

8 years agoam b1a33391: am 0d7a388b: Merge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Mon, 14 Sep 2015 18:24:29 +0000 (18:24 +0000)]
am b1a33391: am 0d7a388b: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit 'b1a33391ce7de2a56d99ca00967e94c3d21af34e':
  Fix a find segfault.
  Replace toys.exithelp with help_exit() in lib.

8 years agoam 0d7a388b: Merge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Mon, 14 Sep 2015 18:18:53 +0000 (18:18 +0000)]
am 0d7a388b: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit '0d7a388b293a18f8b38d74dbcadcdc9b2abcc5fa':
  Fix a find segfault.
  Replace toys.exithelp with help_exit() in lib.

8 years agoam 74df579d: am 4dc6296a: Switch to toybox du.
Elliott Hughes [Mon, 14 Sep 2015 18:03:11 +0000 (18:03 +0000)]
am 74df579d: am 4dc6296a: Switch to toybox du.

* commit '74df579d144d765ed929cbe38e24ed1ebfde3b8f':
  Switch to toybox du.

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Mon, 14 Sep 2015 18:00:20 +0000 (11:00 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoam 4dc6296a: Switch to toybox du.
Elliott Hughes [Mon, 14 Sep 2015 17:59:12 +0000 (17:59 +0000)]
am 4dc6296a: Switch to toybox du.

* commit '4dc6296a022d2d100233806a0586a03d6fde1a8d':
  Switch to toybox du.

8 years agoSwitch to toybox du.
Elliott Hughes [Mon, 14 Sep 2015 17:39:33 +0000 (10:39 -0700)]
Switch to toybox du.

Change-Id: I4aa70f46389b1c0edd7623c6348d82f47d9fe042

8 years agoFix a find segfault.
Rob Landley [Sat, 12 Sep 2015 20:46:46 +0000 (15:46 -0500)]
Fix a find segfault.

Elliott Hughes found a bug https://android-review.googlesource.com/#/c/170020/
and Daniel K. Levy worked out the problem: the user/group/newer arguments
to find weren't consuming their arguments when not checking the results of
their comparison (because an earlier test had already caused their
parenthetical group to fail). This confused the argument parsing logic
and could lead to segfaults.

I applied a different fix that reorganized the existing tests instead of
adding a new test. (Looks like a big commit but it's mostly whitespace
due to extra curly brackets changing indendentation levels.)

8 years agoam c4681d05: am c7bfbbe7: Just use "repo upload".
Elliott Hughes [Fri, 11 Sep 2015 23:13:59 +0000 (23:13 +0000)]
am c4681d05: am c7bfbbe7: Just use "repo upload".

* commit 'c4681d0578f81c8203c60f106629ea6dcf5a837f':
  Just use "repo upload".

8 years agoam 153b3f40: am 77538439: Switch to toybox lsof.
Elliott Hughes [Fri, 11 Sep 2015 23:05:18 +0000 (23:05 +0000)]
am 153b3f40: am 77538439: Switch to toybox lsof.

* commit '153b3f401340aae8d6aece990b7c47fc7adeb387':
  Switch to toybox lsof.

8 years agoam 09063db7: am ecd3df97: Fix generated files after upstream sync.
Elliott Hughes [Fri, 11 Sep 2015 23:05:17 +0000 (23:05 +0000)]
am 09063db7: am ecd3df97: Fix generated files after upstream sync.

* commit '09063db71ac681ba7d087d14242977e51ad0e6d0':
  Fix generated files after upstream sync.

8 years agoam 540923b2: am 2738b318: Merge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Fri, 11 Sep 2015 23:05:17 +0000 (23:05 +0000)]
am 540923b2: am 2738b318: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit '540923b2edc5e6a7f62b65cc3ecaf96dd8bfdbee':
  Squish more warnings in pending.
  Squish a warning in pending.
  Fix netstat -e.
  i already did -l and -t, the positive side of -p, plus name filtering...
  Fix netstat -p.
  increase the size of progname to avoid buffer overflow
  Remove prompt argument from yesno(), caller can fprintf(stderr, "blah") itself.
  Switch HR_SI to HR_1000, make binary the default, make HR_B only affect bytes, and update the tests.
  Two large thinkos in oneit: -3 was always enabled and signal numbers were overwritten before we set up signal handlers.
  Add seq -f tests, tweak help text, and catch one more error case.
  ls -h support.
  df -h and -H.
  Implement lsof.
  Make human_readable() handle base 1024 units without floating point.

8 years agoam c7bfbbe7: Just use "repo upload".
Elliott Hughes [Fri, 11 Sep 2015 22:42:36 +0000 (22:42 +0000)]
am c7bfbbe7: Just use "repo upload".

* commit 'c7bfbbe771178d205ac446d22dcc87cf1421cb1a':
  Just use "repo upload".

8 years agoJust use "repo upload".
Elliott Hughes [Fri, 11 Sep 2015 22:08:29 +0000 (15:08 -0700)]
Just use "repo upload".

Put the dangerous command that you want to run second, second.

Change-Id: I0d47f2a81cc2967573d80cbf1ac61d36936c3d06

8 years agoam 77538439: Switch to toybox lsof.
Elliott Hughes [Fri, 11 Sep 2015 22:14:28 +0000 (22:14 +0000)]
am 77538439: Switch to toybox lsof.

* commit '77538439679e8592f5cba6ba3c1dffd3e470255b':
  Switch to toybox lsof.

8 years agoam ecd3df97: Fix generated files after upstream sync.
Elliott Hughes [Fri, 11 Sep 2015 22:14:11 +0000 (22:14 +0000)]
am ecd3df97: Fix generated files after upstream sync.

* commit 'ecd3df97a36c0381ec63fca3d0762658e2efa17d':
  Fix generated files after upstream sync.

8 years agoam 2738b318: Merge remote-tracking branch \'toybox/master\' into HEAD
Elliott Hughes [Fri, 11 Sep 2015 22:14:09 +0000 (22:14 +0000)]
am 2738b318: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit '2738b3182300dabdbbef291175752733ec3f05d5':
  Squish more warnings in pending.
  Squish a warning in pending.
  Fix netstat -e.
  i already did -l and -t, the positive side of -p, plus name filtering...
  Fix netstat -p.
  increase the size of progname to avoid buffer overflow
  Remove prompt argument from yesno(), caller can fprintf(stderr, "blah") itself.
  Switch HR_SI to HR_1000, make binary the default, make HR_B only affect bytes, and update the tests.
  Two large thinkos in oneit: -3 was always enabled and signal numbers were overwritten before we set up signal handlers.
  Add seq -f tests, tweak help text, and catch one more error case.
  ls -h support.
  df -h and -H.
  Implement lsof.
  Make human_readable() handle base 1024 units without floating point.

8 years agoReplace toys.exithelp with help_exit() in lib.
Rob Landley [Fri, 11 Sep 2015 21:35:14 +0000 (16:35 -0500)]
Replace toys.exithelp with help_exit() in lib.

8 years agoSwitch to toybox lsof.
Elliott Hughes [Fri, 11 Sep 2015 17:57:33 +0000 (10:57 -0700)]
Switch to toybox lsof.

Change-Id: I3f0d7603de00ef340d97060907dc20aa0288dd77

8 years agoFix generated files after upstream sync.
Elliott Hughes [Fri, 11 Sep 2015 17:50:35 +0000 (10:50 -0700)]
Fix generated files after upstream sync.

Change-Id: Ic4b801cf500ac17c4f7ddbff896edf318e373fcd

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 11 Sep 2015 17:30:13 +0000 (10:30 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoSquish more warnings in pending.
Rob Landley [Wed, 9 Sep 2015 04:17:24 +0000 (23:17 -0500)]
Squish more warnings in pending.

8 years agoSquish a warning in pending.
Rob Landley [Wed, 9 Sep 2015 04:03:48 +0000 (23:03 -0500)]
Squish a warning in pending.

8 years agoFix netstat -e.
Elliott Hughes [Wed, 9 Sep 2015 03:52:21 +0000 (22:52 -0500)]
Fix netstat -e.

The -e flag should add "user" and "inode" columns to the TCP output.

Also truncate IP addresses in non-wide (no -W) mode.

This also removes a bit more of the duplication, though there's still
plenty left in this file!

8 years agoi already did -l and -t, the positive side of -p, plus name filtering...
Elliott Hughes [Wed, 9 Sep 2015 03:38:14 +0000 (22:38 -0500)]
i already did -l and -t, the positive side of -p, plus name filtering...

8 years agoFix netstat -p.
Elliott Hughes [Tue, 8 Sep 2015 15:39:07 +0000 (10:39 -0500)]
Fix netstat -p.

netstat -p was failing for any cmdline longer than 21 characters. (A
typical Chrome render process has about half a kilobyte of cmdline.)

There's still a lot of cleanup to be done later, but this is enough to
fix -p and remove a fair amount of unnecessary custom code into the
bargain.

8 years agoincrease the size of progname to avoid buffer overflow
Lipi Lee [Tue, 8 Sep 2015 10:37:00 +0000 (05:37 -0500)]
increase the size of progname to avoid buffer overflow

8 years agoRemove prompt argument from yesno(), caller can fprintf(stderr, "blah") itself.
Rob Landley [Mon, 7 Sep 2015 22:12:57 +0000 (17:12 -0500)]
Remove prompt argument from yesno(), caller can fprintf(stderr, "blah") itself.

This fixes the build break, the change to yesno() prototype accidentally got
checked in last commit. (Oops, sorry.)

8 years agoSwitch HR_SI to HR_1000, make binary the default, make HR_B only affect bytes,
Rob Landley [Mon, 7 Sep 2015 01:10:04 +0000 (20:10 -0500)]
Switch HR_SI to HR_1000, make binary the default, make HR_B only affect bytes,
and update the tests.

8 years agoTwo large thinkos in oneit: -3 was always enabled and signal numbers were
Rob Landley [Sat, 5 Sep 2015 19:18:38 +0000 (14:18 -0500)]
Two large thinkos in oneit: -3 was always enabled and signal numbers were
overwritten before we set up signal handlers.

8 years agoAdd seq -f tests, tweak help text, and catch one more error case.
Rob Landley [Sat, 5 Sep 2015 10:46:35 +0000 (05:46 -0500)]
Add seq -f tests, tweak help text, and catch one more error case.

8 years agols -h support.
Elliott Hughes [Sat, 5 Sep 2015 10:09:22 +0000 (05:09 -0500)]
ls -h support.

It turns out that people are anticipating the switch to toybox ls from
toolbox ls on the assumption that this will finally bring -h support.
Let's not disappoint.

I've merged two existing buffers in listfiles whose uses didn't
overlap into one. It may be possible to cram this into toybuf with the
other stuff, but it didn't seem worth the extra complexity for 64B of
stack, especially since we were already living with that for time
formatting anyway.

8 years agodf -h and -H.
Elliott Hughes [Sat, 5 Sep 2015 10:00:49 +0000 (05:00 -0500)]
df -h and -H.

This doesn't address the lack of support for a variable-width
"Filesystems" column, but it doesn't make the current situation any
worse either.

This is the last of the missing -h options. The other commands with -h
also have --si, but only for df did it get a corresponding short
option (and I've never personally used --si on du or ls, so let's wait
until someone actually cares).

8 years agoImplement lsof.
Elliott Hughes [Fri, 4 Sep 2015 01:54:53 +0000 (20:54 -0500)]
Implement lsof.

This is a superset of the current AOSP lsof (which is itself a
superset of the lsof in Android M). It fixes several bugs/misfeatures
and adds support for decoding IPv4/IPv6 tcp/udp/raw sockets and Unix
domain sockets.

8 years agoMake human_readable() handle base 1024 units without floating point.
Rob Landley [Fri, 4 Sep 2015 01:36:44 +0000 (20:36 -0500)]
Make human_readable() handle base 1024 units without floating point.

Rounds correctly via brute force, displayed digits are decimal even when
working with powers of 2, shows at most 3 significant (decimal) digits.
(So no "1023M" nonsense, that's 1.0G.)