OSDN Git Service
Elliott Hughes [Mon, 11 Jan 2016 17:57:02 +0000 (09:57 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sat, 9 Jan 2016 20:54:04 +0000 (12:54 -0800)]
Fix tail -f /does/not/exist.
Exit immediately if we don't actually have anything to -f --- it's -f's
big brother -F that retries by name rather than by fd.
Elliott Hughes [Sat, 9 Jan 2016 20:20:50 +0000 (12:20 -0800)]
Fix hwclock -u.
You can't pass a NULL value to setenv(3). The "put things back how they were"
intent of this code is best achieved by calling unsetenv(3) in the NULL case.
(This causes a crash with "hwclock -u" on Android. glibc silently corrupts the
environment instead.)
Elliott Hughes [Sat, 9 Jan 2016 19:47:35 +0000 (11:47 -0800)]
Fix perror_exit_raw.
Some things are worse when you remove the 'p'.
Rob Landley [Sun, 10 Jan 2016 21:59:09 +0000 (15:59 -0600)]
Make cursor left/right change sort type in iotop.
Elliott Hughes [Sat, 9 Jan 2016 19:23:51 +0000 (11:23 -0800)]
Regenerate generated files.
Change-Id: Ibc6ab2c6a89bcbe4ffd7ca883f6635d725735c08
Elliott Hughes [Sat, 9 Jan 2016 19:09:47 +0000 (11:09 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sat, 9 Jan 2016 01:13:38 +0000 (19:13 -0600)]
Fix cat -.
Commit
4b4ab6a50998 broke loopfiles' handling of "-".
This broke the existing cat tests, so no new test is necessary here.
Elliott Hughes [Sat, 9 Jan 2016 00:43:17 +0000 (18:43 -0600)]
The sense of -L was flipped.
Josh Gao [Sat, 9 Jan 2016 00:05:41 +0000 (00:05 +0000)]
Merge "Revert "Don't add a symlink for killall --- it's broken.""
Rob Landley [Thu, 7 Jan 2016 20:34:47 +0000 (14:34 -0600)]
Make scan_key() specify timeout in miliseconds, split out terminal_probesize(),
add function key definitions and shift/ctrl/alt cursor keys.
Rob Landley [Wed, 6 Jan 2016 04:26:58 +0000 (22:26 -0600)]
Add error_msg_raw() and friends, replace error_msg("%s", s) uses, enable format
checking, and fix up format checking complaints.
Added out(type, value) function to stat to avoid a zillion printf typecasts.
Rob Landley [Wed, 6 Jan 2016 00:17:02 +0000 (18:17 -0600)]
Some utf8/unicode stress test files.
Rob Landley [Tue, 5 Jan 2016 18:14:24 +0000 (12:14 -0600)]
Work towards making "find . -execdir echo {} + -execdir ls {} +" work,
(not finished yet) plus some error message improvements.
Elliott Hughes [Mon, 4 Jan 2016 20:28:44 +0000 (12:28 -0800)]
Update generated files after toybox sync.
Change-Id: I61a6e7b160133ecf271aa28bf5d5de63191b3bcb
Elliott Hughes [Mon, 4 Jan 2016 18:46:55 +0000 (10:46 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Sat, 2 Jan 2016 20:34:53 +0000 (14:34 -0600)]
Fix find --prune.
Rob Landley [Sat, 2 Jan 2016 20:24:56 +0000 (14:24 -0600)]
Fix "find . -exec echo {}" segfault, and stop measuring environment space,
The segfault was spotted/fixed by Daniel K. Levy back in September, and again by
Isabella Parakiss yesterday. While we're there, remove the environment
size measurement code (the 128k limit was lifted by linux commit
b6a2fea39318,
which went into 2.6.22 released July 2007).
Rob Landley [Fri, 1 Jan 2016 21:24:46 +0000 (15:24 -0600)]
First pass at iotop.
Lotsa TODOs: Currently exit it with ctrl-c, not q.
Doesn't show totals, PID instead ofTID, PR instead of PRIO (type/pri),
human_readable can't display fixed point, IO isn't a percentage,
COMM instead of COMMAND (so no [kernelthread] brackets), and no
cursor left/right to change sort field...
Rob Landley [Thu, 31 Dec 2015 20:09:54 +0000 (14:09 -0600)]
Tweak error message.
Rob Landley [Thu, 31 Dec 2015 02:54:19 +0000 (20:54 -0600)]
Don't let mktemp -q /path/to/file delete arbitrary files, and don't have
"mktemp -u > /dev/full" leave file around.
Kylie McClain [Thu, 24 Dec 2015 05:20:24 +0000 (00:20 -0500)]
lsb/mktemp: Add -u flag
The -u flag creates a file, and unlinks it before exiting.
This is usually known as "unsafe mode", or "dry-run" mode.
GNU mktemp has it, as does Busybox's mktemp and likely many others.
Rob Landley [Thu, 31 Dec 2015 02:18:18 +0000 (20:18 -0600)]
First half of iotop. Add READ, WRITE, IO, DREAD, DWRITE, SWAP, DIO, and
corresponding percentile fields to ps. Move FLAG_ macro usage to ps-specific
code (top/iotop have their own flag contexts). Split init and match code
into shared and ps-specific parts. Fix bug in COMMAND for privileged processes.
Rob Landley [Thu, 31 Dec 2015 02:15:34 +0000 (20:15 -0600)]
Add more keys to scan_key() and fix hang in scan_key_getsize().
Rob Landley [Wed, 30 Dec 2015 18:01:42 +0000 (12:01 -0600)]
make "ls -m | cat" assume 80 columns.
Rob Landley [Wed, 30 Dec 2015 17:49:13 +0000 (11:49 -0600)]
I didn't add comma_args() to lib.c, I added it with the other comma functions.
(Oops. Missed a file checkin, build break, my bad.)
Rob Landley [Tue, 29 Dec 2015 17:52:12 +0000 (11:52 -0600)]
Add strafter() to lib.
Rob Landley [Tue, 29 Dec 2015 17:19:02 +0000 (11:19 -0600)]
Make pidof use comma_scan()
Rob Landley [Tue, 29 Dec 2015 16:16:45 +0000 (10:16 -0600)]
Move comma_args() from ps.c to lib.
(Moved header a while ago, forgot to check in function move.)
Rob Landley [Sun, 27 Dec 2015 20:41:30 +0000 (14:41 -0600)]
Add scan_key_getsize() doing the ANSI probe, switch scan_key() to TAGGED_ARRAY,
and add test_scankey.
Rob Landley [Thu, 24 Dec 2015 18:18:10 +0000 (12:18 -0600)]
Move get_line() header to pending.h because posix has FILE * versions.
Rob Landley [Thu, 24 Dec 2015 00:16:23 +0000 (18:16 -0600)]
Factor out draw_str() and friends.
Rob Landley [Tue, 22 Dec 2015 19:36:15 +0000 (13:36 -0600)]
First guess at cp xattr support, ala --preserve=context,xattr
Josh Gao [Tue, 22 Dec 2015 19:34:57 +0000 (11:34 -0800)]
Revert "Don't add a symlink for killall --- it's broken."
Looks like the previous revert of this commit (
707204e) got dropped by
an `-s ours` merge.
This reverts commit
c96e42498c99b179444e6812dd8b0583f0624fcd.
Rob Landley [Tue, 22 Dec 2015 18:02:20 +0000 (12:02 -0600)]
Convert cp from magic constants to TAGGED_ARRAY()
Rob Landley [Mon, 21 Dec 2015 20:34:36 +0000 (14:34 -0600)]
Cleanup tail -f.
Rob Landley [Mon, 21 Dec 2015 17:28:30 +0000 (11:28 -0600)]
Rich Felker's reading of posix is that fchown() and fchmod() must be allowed
on files opened read-only, so revert last commit (force writeable logic).
Elliott Hughes [Sun, 20 Dec 2015 18:49:13 +0000 (10:49 -0800)]
Add ps -o psr,rtprio,sched.
These three are currently available in Android's ps but not in toybox ps.
Josh Gao [Fri, 4 Dec 2015 21:30:02 +0000 (13:30 -0800)]
Implement tail -f.
Rob Landley [Sun, 20 Dec 2015 03:49:14 +0000 (21:49 -0600)]
Redo linestack to handle embedded NULs.
Rob Landley [Sat, 19 Dec 2015 19:29:04 +0000 (13:29 -0600)]
Start of vi.
Rob Landley [Fri, 18 Dec 2015 22:39:59 +0000 (16:39 -0600)]
Next giant chunk of ps work: add _NAME_TAG bitmask values to tags.h
(leading underscore version is 1<<NAME_TAG version, with 1LL for >31 shift),
suck lots of magic constants out of ps and use tag macros instead,
redo command line display so there's now 6 variants (CMD COMM ARGS from posix,
NAME CMDLINE from android, and COMMAND for completeness). Document more
cases where posix is nuts or widely ignored.
Rob Landley [Thu, 17 Dec 2015 01:22:40 +0000 (19:22 -0600)]
Don't discard previous block when mkstatus finds another span tag with same id.
Rob Landley [Sun, 13 Dec 2015 22:52:26 +0000 (16:52 -0600)]
Start of TAGGED_ARRAY() infrastructure.
This lets you have struct arrays with a string as the first member, ala:
struct {char *name; int x, y} blah thingy[] = TAGGED_ARRAY(BLAH,
{"one", 1, 2}, {"two", 3, 4}, {"three", 5, 6}
);
And it produces #defines for the array index of each, ala:
#define BLAH_one 0
#define BLAH_two 1
#define BLAH_three 2
So you can use thingy[BLAH_two].x and still reorder the elements at will.
Note: if you screw up the array initializers, temporarily replace
TAGGED_ARRAY(BLAH, with { and the ); with }; and the compiler will give you
better error messages. (With the macro the compiler reports errors on the
TAGGED_ARRAY line, not where the comma is missing in its contents.)
Currently the TAGGED_ARRAY( and ); must be on their own lines, and the
{ and start of each attached string must be on the same line.
Rob Landley [Sun, 13 Dec 2015 03:18:40 +0000 (21:18 -0600)]
Make "ps -o TIME+ -k TIME+" work. Factor out -o field names, field lengths,
and slot numers into a structure. (Keeping multiple arrays in sync may have
been efficient but it was ugly.) Fix duplicate command name copying that
corrupted the name of kernel threads. Tighten up slot[] docs.
Rob Landley [Sat, 12 Dec 2015 08:14:39 +0000 (02:14 -0600)]
Add a useless memset (under CFG_TOYBOX_DEBUG) to shut up valgrind.
Valgrind complains that we add uninitalized memory to totals[] fields we never
read from. (If we didn't set it in entrylen() we don't use it during display,
they're testing the same flags), but valgrind doesn't understand that.
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