OSDN Git Service
Treehugger Robot [Tue, 4 Apr 2017 19:47:22 +0000 (19:47 +0000)]
Merge changes I85f365f5,I2b3c82fb,I4f196054,I9343237c,I53e4444f, ...
* changes:
Merge remote-tracking branch 'toybox/master' into HEAD
Implement dmesg -T.
Don't try to implement %s, we have @seconds, strptime() in libc tends not to have it, and implementing our own means a pattern like "Time %%%s%%" is expensive to handle the corner cases of.
New date range tests are simple, won't catch Feb 29 in non-leap-year (or April 31 in any year). Some normalization allowed, exclusions are just what http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/time.h.html says.
Replace chkmktime() (which produces false positive normalization failures) with range checks for seconds, minutes, hours, day of month, and month.
ps: don't query for terminal size if not a tty.
Fix the type of the callback in getprop.
We grew a few more commands that weren't on the roadmap (mostly from android) so throw them in the "requests" category so they show up in status.html.
Elliott Hughes [Tue, 4 Apr 2017 17:47:54 +0000 (10:47 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I85f365f5bc991ebefb12500ee1f53b3d250f814a
Elliott Hughes [Sat, 25 Mar 2017 20:08:20 +0000 (13:08 -0700)]
Implement dmesg -T.
Also refactor so that legacy mode gets all the new functionality too, and
add -S to make it easier to test legacy mode on 3.5 or newer kernels (at least
on the host; on Android the syslog(2) system call is no longer allowed).
Bug: http://b/
36090178
Elliott Hughes [Mon, 3 Apr 2017 14:56:14 +0000 (14:56 +0000)]
Build toybox diff.
am:
98aae74f4a
Change-Id: Ib6b754428ce1f0836729fedaeab077aa539acb5d
Elliott Hughes [Sat, 1 Apr 2017 16:18:14 +0000 (09:18 -0700)]
Build toybox diff.
Necessary to run toybox tests on the device (and presumably any other
command-line testing that wants to compare actual to expected results).
Bug: N/A
Test: ran toybox tests on-device (script coming soon)
Change-Id: Ib7a6044d6d6af4fc34996e66cba0a023b3e8dce4
Rob Landley [Wed, 29 Mar 2017 01:39:31 +0000 (20:39 -0500)]
Don't try to implement %s, we have @seconds, strptime() in libc tends
not to have it, and implementing our own means a pattern like
"Time %%%s%%" is expensive to handle the corner cases of.
Rob Landley [Wed, 29 Mar 2017 01:19:28 +0000 (20:19 -0500)]
New date range tests are simple, won't catch Feb 29 in non-leap-year
(or April 31 in any year). Some normalization allowed, exclusions are just
what http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/time.h.html says.
Rob Landley [Wed, 29 Mar 2017 01:16:41 +0000 (20:16 -0500)]
Replace chkmktime() (which produces false positive normalization failures)
with range checks for seconds, minutes, hours, day of month, and month.
Elliott Hughes [Wed, 29 Mar 2017 00:36:33 +0000 (00:36 +0000)]
Use external/bzip2 for bunzip2 and bzcat.
am:
7602ee6309
Change-Id: I04637694adfadc341d8239cc63742c8fd4880f91
Josh Gao [Mon, 27 Mar 2017 22:53:03 +0000 (15:53 -0700)]
ps: don't query for terminal size if not a tty.
`ps -A | cat` shouldn't have different output depending on the size of
your terminal window.
Elliott Hughes [Tue, 28 Mar 2017 06:02:40 +0000 (23:02 -0700)]
Use external/bzip2 for bunzip2 and bzcat.
external/bzip2 also gives us bzip2.
Bug: http://b/
36653808
Test: builds
Change-Id: Ib73563face4e0d2677e06652cd3fb7b36c7e6e17
Elliott Hughes [Wed, 22 Mar 2017 17:35:14 +0000 (10:35 -0700)]
Fix the type of the callback in getprop.
Fixes:
toys/android/getprop.c:56:39: warning: incompatible pointer types
passing 'void (void *, const char *, const char *)' to parameter of
type 'void (*)(void *, const char *, const char *, uint32_t)'
(aka 'void (*)(void *, const char *, const char *, unsigned int)')
[-Wincompatible-pointer-types]
__system_property_read_callback(pi, read_callback, NULL);
^~~~~~~~~~~~~
Rob Landley [Fri, 24 Mar 2017 16:59:26 +0000 (11:59 -0500)]
We grew a few more commands that weren't on the roadmap (mostly from android)
so throw them in the "requests" category so they show up in status.html.
Elliott Hughes [Fri, 24 Mar 2017 16:57:43 +0000 (16:57 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
f6e803dd5c
Change-Id: I77b0ed43d8309eadd39cf63ea4b4e5e23cb37fe0
Elliott Hughes [Fri, 24 Mar 2017 06:19:37 +0000 (23:19 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Thu, 23 Mar 2017 16:35:09 +0000 (11:35 -0500)]
Now that just about everything has --help, don't output help for argument errors
Jaesoo Lee [Thu, 23 Mar 2017 00:23:12 +0000 (00:23 +0000)]
Merge "removed toybox_static (and modprobe) from normal mode"
am:
78605fcb21
Change-Id: Idbf35653565bbbcbaa6b3679ceae5f63171a32ff
Jaesoo Lee [Thu, 23 Mar 2017 00:04:52 +0000 (00:04 +0000)]
Merge "removed toybox_static (and modprobe) from normal mode"
Elliott Hughes [Wed, 22 Mar 2017 19:48:54 +0000 (19:48 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
10d4b07439
Change-Id: I710d2f32c2ed213fdc6a9a64bdab2f8daf66c734
Elliott Hughes [Wed, 22 Mar 2017 17:39:36 +0000 (10:39 -0700)]
Fix a typo and explain a mystery in news.html.
Elliott Hughes [Wed, 22 Mar 2017 17:07:35 +0000 (10:07 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Icec8c3a977acd7e8123d1a7f0a2adf61cc6f59bb
Elliott Hughes [Tue, 21 Mar 2017 19:11:29 +0000 (12:11 -0700)]
Implement uptime -s.
Also add trivial tests.
Jaesoo Lee [Wed, 22 Mar 2017 07:16:51 +0000 (16:16 +0900)]
removed toybox_static (and modprobe) from normal mode
toybox_static (and modprobe) was installed for both normal/charger mode
and recovery mode. This change makes it to be installed in the rootfs
for the recovery mode only.
Bug:
35633646
Test: Built and tested on sailfish
Change-Id: Ie99abc4b6ad49262e1be4fd9b58256010bb888c0
Rob Landley [Wed, 22 Mar 2017 00:25:33 +0000 (19:25 -0500)]
dirtree_flagread() returns DIRTREE_ABORTVAL when the initial node doesn't
exist, which can hit ps when /proc isn't there or /proc/$PID/task isn't
there (because process exited between the time we checked its contents
and the time we looked for its threads).
Rob Landley [Mon, 20 Mar 2017 18:14:14 +0000 (13:14 -0500)]
Paste bugfix, more tests.
Rob Landley [Mon, 20 Mar 2017 17:41:22 +0000 (12:41 -0500)]
Add TOYBOX_PEDANTIC_ARGS to check arguments when there are no arguments,
and make uptime use it.
Rob Landley [Mon, 20 Mar 2017 16:11:34 +0000 (11:11 -0500)]
Rewrite paste so it actually works.
Jaesoo Lee [Thu, 16 Mar 2017 01:27:43 +0000 (01:27 +0000)]
added a new build module for statically linked toybox (toybox_static)
am:
95a47feaf3
Change-Id: I8b9ca8d6edb36a20a731a78d2bfcc501b4972855
Jaesoo Lee [Fri, 3 Mar 2017 04:07:39 +0000 (13:07 +0900)]
added a new build module for statically linked toybox (toybox_static)
In order to enable modprobe in recovery mode (for Treble), this change
add a target for building statically linked toybox (toybox_static). The
binary is installed in /sbin of root file system along with symbolic
link to it for 'modprobe'.
Bug:
35633646
Test: Build and tested it works in recovery
Change-Id: I589c4a248e135c6c0e25aadd063717c87369ef40
Rob Landley [Sun, 5 Mar 2017 02:42:06 +0000 (20:42 -0600)]
Another FAQ entry.
Rob Landley [Sat, 4 Mar 2017 03:21:26 +0000 (21:21 -0600)]
FAQ tweak: one more link on toybox history.
Rob Landley [Sat, 4 Mar 2017 03:13:57 +0000 (21:13 -0600)]
Check in web page announcement for 0.7.3.
Elliott Hughes [Mon, 27 Feb 2017 16:20:19 +0000 (16:20 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
180f3c7f4b
Change-Id: If5cb854b6027d42c7b05b8adc341479f04dce310
Elliott Hughes [Sun, 26 Feb 2017 19:21:39 +0000 (11:21 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 21 Feb 2017 19:29:48 +0000 (19:29 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
4ab83f6960
Change-Id: I605c6cc8493cbfd4ff97a0c725a43ae1e01b8571
Elliott Hughes [Tue, 21 Feb 2017 17:51:19 +0000 (17:51 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
7c3d7b1386
Change-Id: I111760a61b029d81b24eeaa332a951558173d002
Elliott Hughes [Tue, 21 Feb 2017 17:40:41 +0000 (09:40 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Tue, 21 Feb 2017 17:27:25 +0000 (11:27 -0600)]
It's past time for 0.7.3.
Elliott Hughes [Tue, 21 Feb 2017 04:29:13 +0000 (20:29 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I6222914d43f03b8cf07b13bee7735db71a663212
Rob Landley [Tue, 21 Feb 2017 04:40:10 +0000 (22:40 -0600)]
If the last ps field is left justified, it extends to the width of the screen.
(Recent "show + for last char when truncated" change broke that, putting it
back.)
Elliott Hughes [Sun, 19 Feb 2017 17:22:45 +0000 (09:22 -0800)]
4a4b3d65644ce403b0f22887fc0d38b0202ec8c7 upset clang.
Recent-ish clang doesn't like self-assignment. Google/Android code always
uses the [template-based moral equivalent of] __attribute__((__unused__))
to keep both compilers happy.
Rob Landley [Tue, 21 Feb 2017 03:42:58 +0000 (21:42 -0600)]
Declaring todo bankruptcy, dmesg goes back into pending until I get a chance
to unify the two codepaths in Elliott's rewrite.
Elliott Hughes [Wed, 4 Jan 2017 18:45:55 +0000 (10:45 -0800)]
Fix dmesg -c and -C.
I never use these, so I didn't notice I'd broken them until someone who
does bringup complained.
The "one weird trick" with SEEK_DATA is documented at the URL we already
point to. SEEK_DATA was added in Linux 3.1 (2011) and isn't available in
glibc 2.19 (2014), so I've added that to "portability.h" for the benefit
of Ubuntu 14.04.
Also make -c and -C mutually exclusive.
Also fix some of the formatting I introduced earlier. (A clang-format file
would help prevent these mistakes...)
Rob Landley [Sat, 18 Feb 2017 18:51:35 +0000 (12:51 -0600)]
Ascii only showed 15 rows instead of 16 and spacing was wrong for 96-100.
Elliott Hughes [Fri, 17 Feb 2017 22:43:56 +0000 (14:43 -0800)]
Fix the comment about the Android SIGPIPE behavior.
Elliott Hughes [Thu, 16 Feb 2017 01:23:19 +0000 (17:23 -0800)]
Teach file(1) about bzip2 files.
If we can read and write bzip2 files, we should be able to identify them
too...
Elliott Hughes [Thu, 16 Feb 2017 07:24:13 +0000 (07:24 +0000)]
Sort .config. am:
913e37db63 am:
e8583a8848
am:
2d4bf152e3
Change-Id: I0b85ff68e611ef014df32ef53c3ab1d9de98d96b
Elliott Hughes [Thu, 16 Feb 2017 07:20:13 +0000 (07:20 +0000)]
Sort .config. am:
913e37db63
am:
e8583a8848
Change-Id: I54fb5fd87c2dd0ba70280e6ed40023c14abd5acf
Elliott Hughes [Thu, 16 Feb 2017 07:16:13 +0000 (07:16 +0000)]
Sort .config.
am:
913e37db63
Change-Id: Ib6099889addbc0679dcb829e8d1368270525d521
Elliott Hughes [Thu, 16 Feb 2017 05:23:34 +0000 (21:23 -0800)]
Sort .config.
Since I'm just maintaining this by hand anyway, the groupings aren't helpful.
Bug: N/A
Test: builds
Change-Id: I735bfc4be30c0f8fe8a1a4618db0fd379becf5b7
Rob Landley [Thu, 16 Feb 2017 03:08:56 +0000 (03:08 +0000)]
Merge "Add back bionic SIGPIPE handler workaround accidentally removed in
3b51a07e478d" am:
5fb9bd50fb am:
9242133fd0
am:
9aa552faa2
Change-Id: I51f4badb23a73e826334e98e7b3e38d01df7d6c5
Rob Landley [Thu, 16 Feb 2017 03:05:24 +0000 (03:05 +0000)]
Merge "Add back bionic SIGPIPE handler workaround accidentally removed in
3b51a07e478d" am:
5fb9bd50fb
am:
9242133fd0
Change-Id: Ifcb87ec1bc9e94cd6f447427fc0f062cd42df372
Rob Landley [Thu, 16 Feb 2017 03:01:26 +0000 (03:01 +0000)]
Merge "Add back bionic SIGPIPE handler workaround accidentally removed in
3b51a07e478d"
am:
5fb9bd50fb
Change-Id: I99ba254641c48900c47c836f446709647ea25eb1
Treehugger Robot [Thu, 16 Feb 2017 02:52:52 +0000 (02:52 +0000)]
Merge "Add back bionic SIGPIPE handler workaround accidentally removed in
3b51a07e478d"
Rob Landley [Thu, 16 Feb 2017 02:38:54 +0000 (02:38 +0000)]
Merge changes I76c426ae,I204f2f6c,I7f4cfc18 am:
d4ea1b3b84 am:
c4249580f5
am:
50f7b20615
Change-Id: Ia730c0a29f202dbee9269a2329eaf257a322ef8f
Rob Landley [Thu, 16 Feb 2017 02:35:22 +0000 (02:35 +0000)]
Merge changes I76c426ae,I204f2f6c,I7f4cfc18 am:
d4ea1b3b84
am:
c4249580f5
Change-Id: I07a05d01c9eda01e31d9dcdc8c9d22cdb36ffd20
Rob Landley [Thu, 16 Feb 2017 02:32:03 +0000 (02:32 +0000)]
Merge changes I76c426ae,I204f2f6c,I7f4cfc18
am:
d4ea1b3b84
Change-Id: Ic3d3d90f3cc997904083e881fd03fbba3ae57d22
Treehugger Robot [Thu, 16 Feb 2017 02:27:32 +0000 (02:27 +0000)]
Merge changes I76c426ae,I204f2f6c,I7f4cfc18
* changes:
Document df -a
Add ascii: display ascii table.
ps -l has 4 chars left for "cmd", switch "ADDR" to "BIT" to save space.
Rob Landley [Fri, 10 Feb 2017 22:37:42 +0000 (16:37 -0600)]
Add back bionic SIGPIPE handler workaround accidentally removed in
3b51a07e478d
Rob Landley [Thu, 9 Feb 2017 19:58:03 +0000 (13:58 -0600)]
Document df -a
Rob Landley [Tue, 7 Feb 2017 22:27:37 +0000 (16:27 -0600)]
Add ascii: display ascii table.
Elliott Hughes [Tue, 7 Feb 2017 17:03:51 +0000 (17:03 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
37852b74a7 am:
6e78ae7824
am:
b07116cee1
Change-Id: I9eaa38d5f984093d8fc90c6bd6e9241fb5b1ba8f
Elliott Hughes [Tue, 7 Feb 2017 17:01:51 +0000 (17:01 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
37852b74a7
am:
6e78ae7824
Change-Id: I784367b02ebe929fa150a7da88facaa1ee7d013e
Elliott Hughes [Tue, 7 Feb 2017 16:59:52 +0000 (16:59 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
37852b74a7
Change-Id: Ia138161fc582f0097c6ecd543ef1d0783bec7dd5
Rob Landley [Tue, 7 Feb 2017 02:46:56 +0000 (20:46 -0600)]
ps -l has 4 chars left for "cmd", switch "ADDR" to "BIT" to save space.
Elliott Hughes [Tue, 7 Feb 2017 00:11:46 +0000 (16:11 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ie9451588f4f8301e51db730255713b00a12ac6b0
Rob Landley [Mon, 6 Feb 2017 22:07:57 +0000 (16:07 -0600)]
Make tty size failure to enable -w (Elliott prefers that), and fix last field
to be left justified again.
Rob Landley [Mon, 6 Feb 2017 02:02:47 +0000 (20:02 -0600)]
Don't set SIGWINCH when reading ANSI size probe data, it causes a loop.
Rob Landley [Mon, 6 Feb 2017 01:39:31 +0000 (19:39 -0600)]
Bugfix: last field was padding to width with trailing spaces (oops), and
when we can't query terminal size pad to 80 but add -w.
Rob Landley [Sun, 5 Feb 2017 06:53:13 +0000 (00:53 -0600)]
Patch from Elliott to silence a "const" warning in android/getprop.c.
(Broken out of a larger patch, fixed the other part a different way.)
Rob Landley [Sun, 5 Feb 2017 06:51:18 +0000 (00:51 -0600)]
Silence a warning.
Once upon a time you could call fchown() and let it fail. Then gcc decided
not using its return code was inconcievable, but you could typecast it to (void)
to shut it up. Then gcc noticed people doing that and clutched its pearls and
took it away, so I added an if() statement that does nothing with the result
because we _expect_ this to fail when we're not root. Then clang started
complaining about an if (); statement with the semicolon on the same line,
but decided it's ok if the ; is on the next line (I.E. significant whitespace
in C), so I'm adding an "assignemnt to self" that gets optimized away so
it does a more _explicit_ nothing (the same way you suppress gcc's broken
"this isn't used uninitialized" warnings).
If the compilers weren't going to so much trouble to force the issue I might
add code to only call fchown when we're UID 0, but I refuse to be coerced
into it. (And if getpid() is still a system call instead of a vdso member
then it doesn't actually _save_ us anything, the dentry should be hot and
the permission check was just "if (!uid)" before selinux entered into it and
we're operating on an fd so the security's the same.)
Rob Landley [Sun, 5 Feb 2017 06:44:29 +0000 (00:44 -0600)]
Default to width 80 when tty size probe fails (ala serial console).
(It was defaulting to 99999 but not FLAG_w, so it tried to _pad_ to 99999.)
Rob Landley [Sat, 4 Feb 2017 20:55:36 +0000 (14:55 -0600)]
Posix says stdio.h should define 'stdout' as a macro, and bionic turns it into
an array index, which doesn't work as a local variable name. So rename it.
Rob Landley [Sat, 4 Feb 2017 06:34:31 +0000 (00:34 -0600)]
Switch oneit to use xopen_stdio() for -c (oops) and switch XVFORK() to use
__attribute__((returns_twice)) instead of noinline.
Yes LLVM supports it: https://llvm.org/bugs/show_bug.cgi?id=6287
Elliott Hughes [Thu, 2 Feb 2017 22:51:32 +0000 (14:51 -0800)]
Fix typo in pgrep help.
Elliott Hughes [Fri, 3 Feb 2017 00:50:46 +0000 (16:50 -0800)]
Fix operator precedence error in df.
Rob Landley [Wed, 1 Feb 2017 22:13:01 +0000 (16:13 -0600)]
Build dependency tweak.
Rob Landley [Wed, 1 Feb 2017 21:57:52 +0000 (15:57 -0600)]
Extend default USER length to 12 and output "+" as last character of truncated
(left-justified) fields.
Elliott Hughes [Tue, 31 Jan 2017 23:03:23 +0000 (23:03 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
22656c7f1a am:
45003a1ef8
am:
195e7bf026
Change-Id: Ibbd07e2a8c3956a89490441af1cda4fe5ecc32fc
Elliott Hughes [Tue, 31 Jan 2017 23:00:54 +0000 (23:00 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
22656c7f1a
am:
45003a1ef8
Change-Id: I13cdaefcf3723508b4f0f8a09ff5e7cac287ceed
Elliott Hughes [Tue, 31 Jan 2017 22:58:26 +0000 (22:58 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
22656c7f1a
Change-Id: Id08a743096f735747109a2a7631debdd85e72d21
Elliott Hughes [Tue, 31 Jan 2017 21:06:48 +0000 (13:06 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Tue, 31 Jan 2017 07:46:34 +0000 (01:46 -0600)]
ps bugfix: len of TTY field doesn't include null terminator, so memmove should
subtract one _less_ than /dev prefix length or string isn't terminated.
Rob Landley [Tue, 31 Jan 2017 03:42:35 +0000 (21:42 -0600)]
Cleanup leftover debris.
Elliott Hughes [Sun, 29 Jan 2017 20:35:54 +0000 (12:35 -0800)]
Improve file's ELF parsing.
An ELF file with no program headers is valid, and binutils leaves e_phentsize
zero in that case. Fix the corruption check to cope.
Also, since notes are in both the program and section headers (and I'm not
aware of the possibility of having no sections but still having notes ---
where would they be?), look for them in the section headers instead.
Also extend the parsing of the .android.note.ident ELF note to include the
NDK version information if present. (This won't be present for platform
binaries, but will be present for NDK-built binaries such as app libraries.)
Elliott Hughes [Sun, 29 Jan 2017 21:05:45 +0000 (21:05 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
7cfb1c6aab am:
b8ab605cff
am:
95049d0f73
Change-Id: I47fd0774c077c12ec30126f081c142bf5e40aabb
Elliott Hughes [Sun, 29 Jan 2017 21:03:14 +0000 (21:03 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
7cfb1c6aab
am:
b8ab605cff
Change-Id: Ief9a95c69136af126a2ba0393dc6e42898f23979
Elliott Hughes [Sun, 29 Jan 2017 21:00:45 +0000 (21:00 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
7cfb1c6aab
Change-Id: I33c2a4b80d457413246625b7a0dc70aee9116285
Elliott Hughes [Sun, 29 Jan 2017 20:50:42 +0000 (12:50 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I848c074d07970800eb264858087b159e1680fd56
Rob Landley [Sun, 29 Jan 2017 07:50:09 +0000 (01:50 -0600)]
Izabera suggested seq should multiply to avoid accumulating rounding errors
from incrementing by a double.
Rob Landley [Sun, 29 Jan 2017 00:51:11 +0000 (18:51 -0600)]
Tweak -w help text to clarify that it prevents truncating _any_ fields, not
just for terminal width.
Rob Landley [Sun, 29 Jan 2017 00:36:43 +0000 (18:36 -0600)]
Fix padto in draw_trim_esc() so it behaves like printf %*.*s and matches the
comment (I.E. negative first value _left_ justifies). This makes ps display
the same truncated values with and without a tty.
Also add a few comments to the rest of the file.
Elliott Hughes [Fri, 27 Jan 2017 23:55:28 +0000 (15:55 -0800)]
Add missing `static`s and remove an unused function.
Rob Landley [Sat, 28 Jan 2017 23:40:55 +0000 (17:40 -0600)]
Whitespace.
Rob Landley [Sat, 28 Jan 2017 23:35:20 +0000 (17:35 -0600)]
modprobe: Small cleanup pass, described on the list.
Steve Muckle [Thu, 26 Jan 2017 01:51:40 +0000 (17:51 -0800)]
modprobe: use finit_module when possible
The finit_module() system call, introduced in Linux 3.8, reads the
module from a supplied file descriptor. This allows the kernel to do
security checks based on the file's location.
Steve Muckle [Mon, 9 Jan 2017 19:54:20 +0000 (11:54 -0800)]
modprobe: add -d option to specify module directory path(s)
While most systems have their kernel modules, modules.dep etc located at
/lib/modules/`uname -r` this is not always the case.
The -d option may be used to specify a nonstandard path for these files.
It may be used more than once to specify multiple directories where
these files may be found.
Elliott Hughes [Fri, 27 Jan 2017 20:54:25 +0000 (12:54 -0800)]
top -H is more useful if it shows thread names.
I knew that just showing the process name was a divergence from
traditional Android behavior, but I was curious to see whether anyone
cared. Bug reports show that they do. I've not made this conditional on
CFG_TOYBOX_ON_ANDROID on the assumption that this is more useful for
everyone else too. (Why are you asking for per-thread information if
you don't actually want to be able to identify individual threads?)
Why not _just_ show the thread name? Because on Android at least, every
process has lots of identically-named threads; everyone has GC threads,
everyone has JIT threads, and so knowing _just_ the thread name is
rarely useful.
Why show thread name first? Because the kernel limits thread names to 15
bytes plus a NUL, so any left-over space should go to the process name,
so that should come last.
Why call the thread name THREAD? Because "CMD" isn't obviously "thread
name" to folks who don't know how this is implemented behind the scenes.
This change also removes an incorrect "usage:" comment. None of the
other commands in this file duplicated their "usage:" lines, and this
copy wasn't even close to being correct.
Bug: http://b/
34610082
Elliott Hughes [Fri, 27 Jan 2017 18:54:11 +0000 (10:54 -0800)]
Minor Android roadmap update.
Rob Landley [Sat, 28 Jan 2017 22:33:13 +0000 (16:33 -0600)]
Remove s6 from roadmap. (It wasn't in status.html anyway, haven't updated
our comparison in years, and email with the maintainer convinced me it's
not a good yardstick for "what a traditional linux system expects to have".)