OSDN Git Service
Elliott Hughes [Sat, 12 Dec 2015 01:31:26 +0000 (17:31 -0800)]
Regenerate generated toybox files.
Change-Id: I7315c525b57f02b481e5bbd24f9887e1b8dd166f
Elliott Hughes [Fri, 11 Dec 2015 23:09:45 +0000 (15:09 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Thu, 10 Dec 2015 21:57:08 +0000 (15:57 -0600)]
Expand toys.optargs to 64 bits so people adding more options to ls don't run out.
Keep the low 32 bits of FLAG_x constants as 32 bit numbers so that at least
on little endian platforms it's still normal 32 bit math outside of lib/args.c.
Josh Gao [Fri, 4 Dec 2015 23:12:15 +0000 (15:12 -0800)]
tail: use off_t instead of ssize_t for file offset.
Rob Landley [Mon, 7 Dec 2015 02:36:59 +0000 (20:36 -0600)]
Rename dirtree->data to dirfd, and don't store symlink length in it.
Rob Landley [Mon, 7 Dec 2015 01:33:47 +0000 (19:33 -0600)]
Attempt at making cpio chown() mode 000 files sanely.
Rob Landley [Sun, 6 Dec 2015 20:57:38 +0000 (14:57 -0600)]
Remove trailing whitespace and wrap lines to 80 chars.
Mike Moreton [Wed, 2 Dec 2015 13:24:40 +0000 (13:24 +0000)]
CPIO: Add --no-preserve-owner option.
Mike Moreton [Wed, 2 Dec 2015 09:41:58 +0000 (09:41 +0000)]
Correct setting of guid and uid when extracting from a cpio archive.
Gilad Arnold [Fri, 13 Nov 2015 21:16:14 +0000 (13:16 -0800)]
Enable matching any perm bits.
Includes tests for the new feature, and a failure case for the minimal
perms test as well.
Also some typo fixing / massaging the help text so it fits in 80
columns.
Rob Landley [Sun, 6 Dec 2015 19:39:07 +0000 (13:39 -0600)]
Add free -h, based on a patch from Isabella Parakiss.
Rob Landley [Sat, 5 Dec 2015 22:01:34 +0000 (16:01 -0600)]
Add start of top infrastructure to ps, null terminate some stridx() searches,
move slot[] documentation into C code, add PR %VSZ VIRT RES SHR
Rob Landley [Fri, 4 Dec 2015 22:17:03 +0000 (16:17 -0600)]
Tom Marshall reported that blkid was handling ext2 wrong.
Even though ext2 has a comment that it has to be at the start, I added swap
to the start of the array (oops). The test suite was also wrong (it was
matching the _incorrect_ output).
Rob Landley [Fri, 4 Dec 2015 21:18:15 +0000 (15:18 -0600)]
Replace duplicate sed test with case we hadn't covered yet.
Rob Landley [Tue, 1 Dec 2015 17:13:08 +0000 (11:13 -0600)]
Twitter's page seems reasonably simple and straightforward, use that.
Rob Landley [Mon, 30 Nov 2015 05:42:07 +0000 (23:42 -0600)]
Implement ps --sort.
Rob Landley [Sun, 29 Nov 2015 06:23:07 +0000 (00:23 -0600)]
Add basic sort logic.
Rob Landley [Sat, 28 Nov 2015 21:03:22 +0000 (15:03 -0600)]
Split out string_field() from show_ps().
Rob Landley [Sat, 28 Nov 2015 20:39:29 +0000 (14:39 -0600)]
Save string offsets rather than recalculating them each time, and use struct
instead of carving up toybuf by hand. This makes breaking out the field
conversion logic into its own function less expensive.
Rob Landley [Fri, 27 Nov 2015 03:16:12 +0000 (21:16 -0600)]
Split do_ps() into get_ps() and show_ps() as a start on implementing --sort.
Change readfileat() to pass back length of read.
Elliott Hughes [Thu, 19 Nov 2015 16:34:28 +0000 (08:34 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 13 Nov 2015 21:29:58 +0000 (13:29 -0800)]
Fix find -perm.
1) It read st_dev instead of st_mode.
2) It reversed the semantics of absolute vs minimal ('-' prefixed) tests.
Add tests for these, and move the "unterminated -exec" test into the "Still
fails" section because it's still dumping core for me.
Rob Landley [Mon, 16 Nov 2015 09:15:47 +0000 (03:15 -0600)]
Typo
Rob Landley [Mon, 16 Nov 2015 09:13:22 +0000 (03:13 -0600)]
Rewrite of the about page, re-triage of sbase, and other documentation updates.
Rob Landley [Sun, 15 Nov 2015 03:47:35 +0000 (21:47 -0600)]
Documentation tweaks.
Elliott Hughes [Fri, 13 Nov 2015 04:22:57 +0000 (20:22 -0800)]
Regenerate generated files after upstream sync.
Change-Id: Ib322e0ee3c629eff5ed1bf5415f2f0c633792e9d
Elliott Hughes [Fri, 13 Nov 2015 03:37:07 +0000 (19:37 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 11 Nov 2015 02:34:38 +0000 (18:34 -0800)]
Document %s in date(1).
Elliott Hughes [Wed, 11 Nov 2015 02:21:51 +0000 (18:21 -0800)]
Fix year parsing in date(1).
Four-digit years were being mangled by the code for two-digit years.
Move all the two-digit year code into the "we only saw two digits" case.
Add some new tests and fix existing tests.
Rob Landley [Tue, 10 Nov 2015 00:22:33 +0000 (18:22 -0600)]
Cleanup pass: inline find_tty_name(), bounds check fscanf(), use libc
functions to read major()/minor(), fix printf format warnings in error msg.
Elliott Hughes [Sat, 7 Nov 2015 19:29:36 +0000 (11:29 -0800)]
Make ps try harder to find a name for a tty.
Elliott Hughes [Sat, 7 Nov 2015 18:32:13 +0000 (10:32 -0800)]
On Android, ps' default output should match toolbox.
Elliott Hughes [Sat, 7 Nov 2015 18:18:32 +0000 (10:18 -0800)]
Add ps -n.
Both Android and GNU interpret -n to mean "show numeric users and groups",
despite what POSIX says.
Elliott Hughes [Sat, 7 Nov 2015 17:44:10 +0000 (09:44 -0800)]
Add ps -o CMDLINE.
This is equivalent to Android's historical "NAME" column, showing the
first element of /proc/pid/cmdline.
Rob Landley [Sun, 8 Nov 2015 22:47:52 +0000 (16:47 -0600)]
NOEXIT(thingy()) wrapper to turn xwrap() functions into warning versions.
Also WOULD_EXIT(x, thingy()) to set a variable to 1 or 0 showing whether or
not thingy() tried to exit. I'd love to be able to do "x = NOEXIT(thingy());"
but haven't figured out a syntax to make that work yet...
Rob Landley [Sun, 8 Nov 2015 08:44:59 +0000 (02:44 -0600)]
Route cleanup: whitespace and curly bracket changes.
Rob Landley [Sun, 8 Nov 2015 06:32:30 +0000 (00:32 -0600)]
Bugfix for route flags.
Rob Landley [Sun, 8 Nov 2015 06:20:42 +0000 (00:20 -0600)]
Remove TEST_ARGV() and logic to adjust irtt by "clock ticks/100" when clock ticks _is_ 100...
Rob Landley [Sun, 8 Nov 2015 04:19:37 +0000 (22:19 -0600)]
More route cleanup.
Rob Landley [Sat, 7 Nov 2015 07:06:55 +0000 (01:06 -0600)]
Let's start the route cleanup.
Collate some repeated increments, remove some useless coments.
Rob Landley [Thu, 5 Nov 2015 06:13:27 +0000 (00:13 -0600)]
Fix sed bug where any ] right after [ was skipped, not just first one in range.
Elliott Hughes [Wed, 4 Nov 2015 17:27:42 +0000 (17:27 +0000)]
Merge "Fix the ps -o CMD vs COMM distinction."
Elliott Hughes [Wed, 4 Nov 2015 17:27:26 +0000 (17:27 +0000)]
Merge "Make ps -o error reporting intelligible."
Elliott Hughes [Wed, 4 Nov 2015 17:27:09 +0000 (17:27 +0000)]
Merge "If chomp() needs to test it found \n, should also test it's at end of string."
Elliott Hughes [Wed, 4 Nov 2015 17:26:55 +0000 (17:26 +0000)]
Merge "Add ps -Z."
Elliott Hughes [Wed, 4 Nov 2015 17:26:42 +0000 (17:26 +0000)]
Merge "Add ps --ppid."
Elliott Hughes [Wed, 4 Nov 2015 17:26:21 +0000 (17:26 +0000)]
Merge "Last patch broke creating new file as a patch, fix it. (Matches beginning and EOF at once.)"
Elliott Hughes [Wed, 4 Nov 2015 17:26:01 +0000 (17:26 +0000)]
Merge "Fix applying patch hunks with trailing context to the start of the file."
Elliott Hughes [Wed, 4 Nov 2015 17:25:47 +0000 (17:25 +0000)]
Merge "Change grep -w to checking matches after the fact rather than modifing regex. This lets '(x)\1' match, as reported by Isabella Parakiss."
Elliott Hughes [Wed, 4 Nov 2015 17:25:31 +0000 (17:25 +0000)]
Merge "Now that toybox is chmod -w, mv needs -f to overwrite it."
Elliott Hughes [Wed, 4 Nov 2015 17:25:11 +0000 (17:25 +0000)]
Merge "Tweak permissions of toybox binary."
Elliott Hughes [Wed, 4 Nov 2015 17:24:43 +0000 (17:24 +0000)]
Merge "Update Android section of roadmap."
Elliott Hughes [Wed, 4 Nov 2015 17:24:26 +0000 (17:24 +0000)]
Merge "Note Debian abandoning LSB and our own decision not to worry about LSB 5.0 yet."
Elliott Hughes [Wed, 4 Nov 2015 17:22:33 +0000 (09:22 -0800)]
Regenerate generated files after upstream sync.
Change-Id: I87a045b64e9f10ceb5e0121c90377e6ca57427c6
Rob Landley [Wed, 4 Nov 2015 02:39:56 +0000 (20:39 -0600)]
dhcp leanup: remove flag_get() and flag_chk()
Rob Landley [Wed, 4 Nov 2015 01:33:22 +0000 (19:33 -0600)]
New dhcp6 command from Sameer Pradhan.
Rob Landley [Tue, 3 Nov 2015 11:30:08 +0000 (05:30 -0600)]
Version 0.6.1
Rob Landley [Tue, 3 Nov 2015 11:17:14 +0000 (05:17 -0600)]
Whitespace and parentheses.
Rob Landley [Mon, 2 Nov 2015 15:07:49 +0000 (09:07 -0600)]
Explain signals in oneit help text.
Rob Landley [Mon, 2 Nov 2015 14:32:21 +0000 (08:32 -0600)]
Don't pass target $CFLAGS to host builds (telling x86 compiler to be big-endian
seldom ends well). Instead add -DBUILD_FOR_HOST to $HOSTCC and wrap #ifdefs
around problematic (smack) includes from toys.h.
Rob Landley [Mon, 2 Nov 2015 13:56:13 +0000 (07:56 -0600)]
Add -P as short option for --ppid.
(The help infrastructure can collate and alphebetize short options,
long options haven't got a standardized help text format. Not a hard
requirement to have a short opt, but it's nice.)
Elliott Hughes [Sat, 31 Oct 2015 20:42:34 +0000 (13:42 -0700)]
Fix the ps -o CMD vs COMM distinction.
"comm" is the command name without arguments, and "cmd" the command
line including arguments. Confusingly, "command" is a synonym for
the *latter*, not the former.
This implementation of "comm" matches the GNU ps behavior where the
names are truncated, but Android historically used the full name
from /proc/pid/cmdline instead, so this patch isn't sufficient to
let us match the Android behavior.
Elliott Hughes [Sat, 31 Oct 2015 20:01:37 +0000 (13:01 -0700)]
Make ps -o error reporting intelligible.
I actually thought ps was segfaulting, and it wasn't until I was in gdb
that I even noticed there was an error message at all, and even then I
had to read the source to work out what it was trying to tell me.
Before:
$ ps -o user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd
ps: -o 'user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd'@41
USER PID PPID VSZ RSS NI WCHAN ADDR$
After:
$ ps -o user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd
ps: bad -o field 'user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd'
^
Rob Landley [Mon, 2 Nov 2015 07:34:58 +0000 (01:34 -0600)]
If chomp() needs to test it found \n, should also test it's at end of string.
Elliott Hughes [Sat, 31 Oct 2015 19:15:25 +0000 (12:15 -0700)]
Add ps -Z.
As with ls, it doesn't seem like -Z should be guarded behind LSM
availability. On a non-SELinux system, the label is always "unconfined".
Elliott Hughes [Sat, 31 Oct 2015 18:37:34 +0000 (11:37 -0700)]
Add ps --ppid.
Used by Android.
Rob Landley [Sun, 1 Nov 2015 11:43:03 +0000 (05:43 -0600)]
Last patch broke creating new file as a patch, fix it.
(Matches beginning and EOF at once.)
Rob Landley [Sun, 1 Nov 2015 09:06:17 +0000 (03:06 -0600)]
Fix applying patch hunks with trailing context to the start of the file.
Rob Landley [Sun, 1 Nov 2015 08:33:51 +0000 (02:33 -0600)]
Change grep -w to checking matches after the fact rather than modifing regex.
This lets '(x)\1' match, as reported by Isabella Parakiss.
Rob Landley [Sat, 31 Oct 2015 00:43:55 +0000 (19:43 -0500)]
Now that toybox is chmod -w, mv needs -f to overwrite it.
Elliott Hughes [Fri, 30 Oct 2015 21:27:48 +0000 (21:27 +0000)]
Start building toybox ps.
am:
b131803047
* commit '
b131803047c2a5601b9dc7ea6b09934540b51cc0':
Start building toybox ps.
Elliott Hughes [Fri, 30 Oct 2015 20:24:56 +0000 (13:24 -0700)]
Start building toybox ps.
This lets you use "toybox ps" if you want, but "ps" is still a symbolic link
to the toolbox ps.
Change-Id: I82e4b94d68009640a3e69e0d349dc81aa84c50fd
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.
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.
Elliott Hughes [Fri, 30 Oct 2015 20:18:37 +0000 (13:18 -0700)]
Regenerate generated files after upstream sync.
Change-Id: I346f837de546bdf56249ee39f70e02265c5d44a6
Elliott Hughes [Fri, 30 Oct 2015 20:10:53 +0000 (13:10 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Thu, 29 Oct 2015 12:34:08 +0000 (07:34 -0500)]
Tweak permissions of toybox binary.
Elliott Hughes [Wed, 28 Oct 2015 21:58:17 +0000 (14:58 -0700)]
Update Android section of roadmap.
Change-Id: I5a0f49b17bc5866689608e73af94b31744fd3dc9
Rob Landley [Thu, 29 Oct 2015 08:11:10 +0000 (03:11 -0500)]
Note Debian abandoning LSB and our own decision not to worry about LSB 5.0 yet.
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.
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.
Rob Landley [Thu, 29 Oct 2015 04:30:36 +0000 (23:30 -0500)]
Promote ps to posix.
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.
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().
Rob Landley [Thu, 29 Oct 2015 02:41:45 +0000 (21:41 -0500)]
Tweak build instructions in README/code.html.
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.
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
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
Elliott Hughes [Wed, 28 Oct 2015 21:41:16 +0000 (14:41 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
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
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.
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"
Rob Landley [Tue, 27 Oct 2015 10:58:19 +0000 (05:58 -0500)]
Replace xcount_cpus() with a call to sysconf(_SC_NPROCESSORS_CONF)
Rob Landley [Sun, 25 Oct 2015 21:50:03 +0000 (16:50 -0500)]
Add xcount_cpus()
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.
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.
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.
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
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.
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.