OSDN Git Service
Rob Landley [Fri, 27 May 2016 22:24:09 +0000 (22:24 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
1c046ba85a
* commit '
1c046ba85afc8af804e9c9529517eef9d55273b6':
Add -o TNAME for android, fix display of last field (retain left justifification when trimmed for screen width), make ARGS path trimming logic work with spaces in path.
Stabilize another sort.
Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.
Change-Id: Icc43b91509855c97e31c790476252c56f62708a3
Elliott Hughes [Fri, 27 May 2016 20:57:40 +0000 (13:57 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Fri, 27 May 2016 19:54:27 +0000 (14:54 -0500)]
Add -o TNAME for android, fix display of last field (retain left justifification
when trimmed for screen width), make ARGS path trimming logic work with
spaces in path.
Elliott Hughes [Wed, 25 May 2016 21:43:56 +0000 (14:43 -0700)]
Stabilize another sort.
Unstable sorting means confusing diffs if you're checking in the generated
files. (Which I shouldn't be doing, but getting this bundle of random scripts
into Android's build system isn't going to be easy...)
Elliott Hughes [Wed, 25 May 2016 23:26:46 +0000 (23:26 +0000)]
Stop building toybox route.
am:
48e1f81151
* commit '
48e1f81151f6f73d6bbd9c69c1224e60863609fb':
Stop building toybox route.
Change-Id: Ic661b343c374faedeec63aeef3f07bfb2c3e862f
Elliott Hughes [Wed, 25 May 2016 21:47:37 +0000 (14:47 -0700)]
Stop building toybox route.
From the commit that stopped creating the symlink:
We should remove the "route" command because its output is irrelevant and
misleading. This is because it only looks at the "main" routing table,
which is a last resort routing table that is a) trumped by all other
networks, b) empty except for directly-connected routes c) cannot even be
used by non-root users.
The proper way to understand device routing is to look at the output of
"ip rule" and "ip route", both of which are already available.
Example of how this is confusing:
$ adb shell route
Kernel IP routing table
Destination Gateway Genmask Flags Metric Ref Use Iface
160.249.218.72 * 255.255.255.248 U 0 0 0 rmnet_data0
192.168.144.0 * 255.255.240.0 U 0 0 0 wlan0
These aren't guaranteed to be used. For example, according to the output
above 160.249.218.73 should go through rmnet_data0, but it doesn't:
$ adb shell ip route get 160.249.218.73
160.249.218.73 via 192.168.159.254 dev wlan0 src 192.168.159.164 uid 0
cache
Also, there is no default route. But the device has networking just fine:
$ adb shell ip route get 8.8.8.8
8.8.8.8 via 192.168.159.254 dev wlan0 src 192.168.159.164 uid 0
cache
Bug: http://b/
27603033
Change-Id: I40be0a7e2841144797a67f9aeb82b9097cec5400
Rob Landley [Wed, 25 May 2016 21:20:00 +0000 (21:20 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
b5b37acaac
* commit '
b5b37acaac3661ee9fabbf3cc4ab5026cd534f41':
The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)
Change-Id: Ib0a3a91d79f05175bac63ef1ff423f5e1df86c6d
Rob Landley [Wed, 25 May 2016 17:56:56 +0000 (12:56 -0500)]
Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.
Elliott Hughes [Tue, 24 May 2016 22:27:49 +0000 (15:27 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Tue, 24 May 2016 21:17:55 +0000 (16:17 -0500)]
The "show parent command path" commit changed the criteria for active nodes,
and the collate logic wasn't updated. (Oops.)
Elliott Hughes [Tue, 24 May 2016 16:28:19 +0000 (16:28 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
87bfced0f8
* commit '
87bfced0f861312fd9ee9895aef9ac77aa72f6be':
Fix remaining pkill tests.
Fix pkill -9.
Don't truncate number fields for anything but right edge of screen, instead let them overflow and try to reclaim extra space from later short fields.
Make -o COMMAND show parent command path for threads, and use saved length calculations instead of doing strlen() on strings again to store lengths.
Comment and help text tweaks.
Add bufgetgrgid()
Make build dependencies more granular. This should fix the problem where "make top; make ps" produces a ps that can't do -A because generated/obj/ps.o didn't get rebuilt.
Add bufgetpwuid. (Repeated calls to getpwuid() are really expensive.)
Add top -O
Add stat -tL and -c %m%t%T.
Change-Id: If176e7107857657fd8289e72240236256c1cb0db
Elliott Hughes [Tue, 24 May 2016 16:28:17 +0000 (16:28 +0000)]
Regenerate generated files.
am:
a2ba247f52
* commit '
a2ba247f528b551fe8fcdbad911aa912d4eb6696':
Regenerate generated files.
Change-Id: I1e97789bf9988b5eb7fd8368204881445748b7a8
Elliott Hughes [Tue, 24 May 2016 16:13:35 +0000 (09:13 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 24 May 2016 16:12:04 +0000 (09:12 -0700)]
Regenerate generated files.
Change-Id: I2014135856d6316a53c22cace2cc935cf65434f6
Elliott Hughes [Mon, 23 May 2016 17:46:47 +0000 (10:46 -0700)]
Fix remaining pkill tests.
I don't know that anyone cares, but these failures made me think I'd
broken something while testing the -SIGNAL patch.
The -s parsing wasn't taking into account that -s 0 is a special case,
and the -o test was assuming that pkill can tell the difference between
two processes started at roughly the same time. Hopefully there's
higher-resolution data available that can avoid the need for yet another
sleep in the tests.
Elliott Hughes [Mon, 23 May 2016 17:34:01 +0000 (10:34 -0700)]
Fix pkill -9.
This fixes the existing test. Internal Android bug
28877702.
I've left -l as-is, even though the desktop doesn't support that.
Rob Landley [Mon, 23 May 2016 00:44:10 +0000 (19:44 -0500)]
Don't truncate number fields for anything but right edge of screen, instead
let them overflow and try to reclaim extra space from later short fields.
Rob Landley [Sun, 22 May 2016 17:16:06 +0000 (12:16 -0500)]
Make -o COMMAND show parent command path for threads, and use saved length
calculations instead of doing strlen() on strings again to store lengths.
Rob Landley [Sun, 22 May 2016 17:00:16 +0000 (12:00 -0500)]
Comment and help text tweaks.
Rob Landley [Fri, 20 May 2016 19:28:13 +0000 (14:28 -0500)]
Add bufgetgrgid()
Rob Landley [Fri, 20 May 2016 12:32:51 +0000 (07:32 -0500)]
Make build dependencies more granular. This should fix the problem where
"make top; make ps" produces a ps that can't do -A because generated/obj/ps.o
didn't get rebuilt.
Rob Landley [Tue, 17 May 2016 17:10:07 +0000 (12:10 -0500)]
Add bufgetpwuid. (Repeated calls to getpwuid() are really expensive.)
Rob Landley [Mon, 16 May 2016 19:51:37 +0000 (14:51 -0500)]
Add top -O
Rob Landley [Mon, 16 May 2016 17:24:42 +0000 (12:24 -0500)]
Add stat -tL and -c %m%t%T.
Suggested by Sameer Pradhan, or possibly Bilal Qureshi.
Rob Landley [Tue, 10 May 2016 22:21:59 +0000 (22:21 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
498e61d5a4
* commit '
498e61d5a4361d4a225947386ac8150292dcc466':
Use CFG_TOYBOX_NORECURSE to avoid <strike>all that tedious mucking about with hyperspace</strike> stack measuring in ways that confuse security stuff.
Work around increasingly insane compiler developers wanting to make everything undefined behavior so the optimizer can silently eliminate your entire program.
Change-Id: I77b6cdd91936a6a7c887c74a056e57b171543882
Elliott Hughes [Tue, 10 May 2016 22:03:41 +0000 (15:03 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Tue, 10 May 2016 08:26:02 +0000 (03:26 -0500)]
Use CFG_TOYBOX_NORECURSE to avoid
<strike>all that tedious mucking about with hyperspace</strike>
stack measuring in ways that confuse security stuff.
Elliott Hughes [Mon, 9 May 2016 21:27:37 +0000 (21:27 +0000)]
Turn on CONFIG_TOYBOX_NORECURSE for SafeStack.
am:
d9417c0630
* commit '
d9417c06308cf9dd34941ca338ac31a9df54b42a':
Turn on CONFIG_TOYBOX_NORECURSE for SafeStack.
Change-Id: I606f936cca7fb3cffe77bb8d19ace3658e7224a0
Elliott Hughes [Sat, 7 May 2016 18:09:44 +0000 (11:09 -0700)]
Turn on CONFIG_TOYBOX_NORECURSE for SafeStack.
Bug: http://b/
27729263
Change-Id: Ibe1f530198045e4133960af61800b40d4348c59a
Rob Landley [Sat, 7 May 2016 05:21:34 +0000 (00:21 -0500)]
Work around increasingly insane compiler developers wanting to make everything
undefined behavior so the optimizer can silently eliminate your entire program.
Elliott Hughes [Fri, 6 May 2016 20:05:15 +0000 (20:05 +0000)]
Regenerate generated files.
am:
7844a48fe7
* commit '
7844a48fe792b5effdb5acbcb35aa20ab97379ed':
Regenerate generated files.
Change-Id: Ic93c3b0e004cb3f37c6510165e0b2b3023d5e138
Alistair Strachan [Fri, 6 May 2016 20:05:13 +0000 (20:05 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
93eb0e019e
* commit '
93eb0e019e298939867733b9fd831a51f65b1872':
Fix static linkage of toybox binary.
Add top -H.
Android roadmap update.
Change-Id: I34da7d5e50fd36d07fa5d935cbdb2956cce98c1c
Elliott Hughes [Fri, 6 May 2016 19:49:08 +0000 (12:49 -0700)]
Regenerate generated files.
Change-Id: I781e947ca3cf323262b0acb4269727357d7f9347
Elliott Hughes [Fri, 6 May 2016 18:06:20 +0000 (11:06 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Alistair Strachan [Thu, 5 May 2016 23:11:35 +0000 (16:11 -0700)]
Fix static linkage of toybox binary.
If toybox was compiled statically e.g. for use in a recovery ramdisk,
it would not build after
b66a29a. This is because libselinux already
exports a selinux_log_callback() function which getprop.c is trying
to override.
This change simply makes the second symbol static, since it is only
used in a function table so we do not actually need to export it
from toybox.
Change-Id: I603258877ae2286660df35738bbf4f4285df5b54
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
Elliott Hughes [Thu, 5 May 2016 17:27:56 +0000 (10:27 -0700)]
Add top -H.
Also enable the same behavior we have with ps, where adding a thread-related
field implies that you're interested in threads.
Also clean up the help text slightly --- we're still not including the
TOP_COMMON help, but at least when we do, we'll have each option covered with
no duplicates.
Elliott Hughes [Thu, 5 May 2016 16:23:07 +0000 (09:23 -0700)]
Android roadmap update.
I removed iftop a while back but didn't remove it everywhere in the
documentation. I switched over to toybox ps yesterday.
Elliott Hughes [Thu, 5 May 2016 17:30:46 +0000 (17:30 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
e386192471
* commit '
e38619247153b7e78e4720bae85b0e315439d543':
"top -b -n1" should end with a newline.
Elliott says -T should fetch threads even when not displaying thread fields.
Simplify ps android scheduling policy fetch slightly.
Change-Id: I1d490d7db157f76dc3459001b5855856b5ad554d
Elliott Hughes [Thu, 5 May 2016 16:34:17 +0000 (09:34 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Thu, 5 May 2016 01:25:41 +0000 (18:25 -0700)]
"top -b -n1" should end with a newline.
The use of TT.time to determine whether to use \r or \n is a little odd,
but let's stick with that for now. Correct the spelling of millitime and
add a test.
Elliott Hughes [Thu, 5 May 2016 00:36:01 +0000 (00:36 +0000)]
Switch to toybox ps.
am:
782aced0d9
* commit '
782aced0d9714d1fd0a9caad92ad999f33c06f39':
Switch to toybox ps.
Change-Id: I0ff5892289e4e432d4eca79421d777e06171b88a
Rob Landley [Wed, 4 May 2016 23:43:19 +0000 (18:43 -0500)]
Elliott says -T should fetch threads even when not displaying thread fields.
Rob Landley [Wed, 4 May 2016 23:37:50 +0000 (18:37 -0500)]
Simplify ps android scheduling policy fetch slightly.
Elliott Hughes [Wed, 4 May 2016 22:18:27 +0000 (15:18 -0700)]
Switch to toybox ps.
Change-Id: I1f0307a8c9511d02a173555b92ebd0f83df229c9
Elliott Hughes [Wed, 4 May 2016 20:57:40 +0000 (20:57 +0000)]
Regenerate generated files.
am:
2737fdfe8c
* commit '
2737fdfe8cd90b1dfe0ea3acd28b9c5f02a0f6a1':
Regenerate generated files.
Change-Id: I959d21cedde1df1626f29272895b73edec5a6f06
Rob Landley [Wed, 4 May 2016 20:57:34 +0000 (20:57 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
67d6a99a50
* commit '
67d6a99a509fede4f90a70f8b8d02533ef1ab308':
Hostname cleanup, as described on the list.
Add -b and -F arguments to hostname
Fluff up README.
Add a ps "PCY" field for Android scheduling policy.
Change-Id: I63376d97f4aca4e9c061ec4e6cbf908a93fbb426
Elliott Hughes [Wed, 4 May 2016 20:42:18 +0000 (13:42 -0700)]
Regenerate generated files.
Change-Id: I8d1590a61a7339f65cd1bdf28601f85768563b57
Elliott Hughes [Wed, 4 May 2016 20:36:49 +0000 (13:36 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Wed, 4 May 2016 10:14:35 +0000 (05:14 -0500)]
Hostname cleanup, as described on the list.
Paul Barker [Sun, 1 May 2016 14:42:57 +0000 (15:42 +0100)]
Add -b and -F arguments to hostname
These arguments are required to correctly set the hostname at boot time. They
are used by the '/etc/init.d/hostname.sh' init script in an OpenEmbedded system.
Rob Landley [Mon, 2 May 2016 23:59:57 +0000 (18:59 -0500)]
Fluff up README.
Elliott Hughes [Sat, 30 Apr 2016 01:04:20 +0000 (18:04 -0700)]
Add a ps "PCY" field for Android scheduling policy.
Elliott Hughes [Sat, 30 Apr 2016 18:10:07 +0000 (18:10 +0000)]
Regenerate generated files.
am:
d79a424de9
* commit '
d79a424de98848850dd5f17f892a3a269e0eee39':
Regenerate generated files.
Change-Id: I739ae831ab7103700be63c899beeec6bfb2a95cf
Rob Landley [Sat, 30 Apr 2016 16:57:05 +0000 (16:57 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
665bd50906
* commit '
665bd509068d1856d4c1774c584a80fcae6fcea0':
First guess at showing thread names properly.
Show "-" rather 0 if we don't know whether a process is 32- or 64-bit.
Fix ps -O help output alignment.
Change-Id: I970c8c676b03a9bf5cf8916f07199f2073b52980
Elliott Hughes [Sat, 30 Apr 2016 16:52:51 +0000 (09:52 -0700)]
Regenerate generated files.
Change-Id: Id500eb735af13344c65dfce96f37199e65d4fe53
Elliott Hughes [Sat, 30 Apr 2016 16:26:12 +0000 (09:26 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Sat, 30 Apr 2016 00:45:18 +0000 (19:45 -0500)]
First guess at showing thread names properly.
Elliott Hughes [Fri, 29 Apr 2016 21:04:40 +0000 (14:04 -0700)]
Show "-" rather 0 if we don't know whether a process is 32- or 64-bit.
Elliott Hughes [Fri, 29 Apr 2016 20:44:01 +0000 (13:44 -0700)]
Fix ps -O help output alignment.
Elliott Hughes [Fri, 29 Apr 2016 21:18:17 +0000 (21:18 +0000)]
Regenerate generated files.
am:
3b8b9e954f
* commit '
3b8b9e954fcecbcfe1a39b288ba181160fb8fb90':
Regenerate generated files.
Change-Id: If380f6c84db39b11c24ceac45eae654d129eac99
Rob Landley [Fri, 29 Apr 2016 21:18:14 +0000 (21:18 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
2305dc0dd2
* commit '
2305dc0dd21b7abcd221df9c3636a5dce05b0692':
ps thread supportand 32/64 bit detection.
Fix find bug reported by Tom Marshall, add test for it, and while we're at it fix two tests looking for a too-specific error message (so TEST_HOST failed).
Add "infrastructure in search of a user" to cleanup.html.
Add the non-tty more(1) test.
Change-Id: Ib8b006ffa215e6ec92c28d7f1a7057e3e09cded3
Elliott Hughes [Fri, 29 Apr 2016 21:10:40 +0000 (14:10 -0700)]
Regenerate generated files.
Change-Id: Ifbb9056f6fa700c3426012d4ec6c43b70a4947c4
Elliott Hughes [Fri, 29 Apr 2016 18:57:24 +0000 (11:57 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Mon, 25 Apr 2016 22:46:26 +0000 (17:46 -0500)]
ps thread supportand 32/64 bit detection.
Add ps -o BIT,TID,TCNT, and make -T display "PID,TID" for default output types
(adding TCNT to -f)
Rob Landley [Mon, 25 Apr 2016 05:55:01 +0000 (00:55 -0500)]
Fix find bug reported by Tom Marshall, add test for it, and while we're at it
fix two tests looking for a too-specific error message (so TEST_HOST failed).
Rob Landley [Sun, 24 Apr 2016 19:30:31 +0000 (14:30 -0500)]
Add "infrastructure in search of a user" to cleanup.html.
Elliott Hughes [Sun, 24 Apr 2016 16:37:00 +0000 (16:37 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
1fdd927
* commit '
1fdd9271635a8681326c756ec43e7b037ca5891d':
Fix more to not append an extra newline.
Fix more to a non-tty.
Remove inappropriate bzip tests (we're not comparing with random "host version") replace with testing 2 known files out of blkid tests, and add badcrc test.
Fiz bzcat segfault reported by John Regehr (bad crc didn't set error message).
Allow EVAL= to run test under a different shell (for sh.test)
Have dirtree_recurse() take the new dirfd as an argument.
Fix touch -t seconds parsing
Change-Id: I6003a9818923b1968963624f6a6f7b42584bcbb0
Elliott Hughes [Sun, 24 Apr 2016 16:19:49 +0000 (09:19 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sat, 23 Apr 2016 21:20:38 +0000 (14:20 -0700)]
Add the non-tty more(1) test.
(This was supposed to be in the earlier patch, but I was fooled by
"git commit -a" yet again...)
Elliott Hughes [Fri, 22 Apr 2016 01:18:05 +0000 (18:18 -0700)]
Fix more to not append an extra newline.
More's sigatexit handler needs to distinguish between normal exit and exit
due to receipt of a signal.
Change tty_sigreset to look at the signal number too, so that pressing 'q'
to exit top doesn't cause its exit status to be 128.
Elliott Hughes [Fri, 22 Apr 2016 00:41:40 +0000 (17:41 -0700)]
Fix more to a non-tty.
And add a test.
Rob Landley [Sat, 23 Apr 2016 10:26:17 +0000 (05:26 -0500)]
Remove inappropriate bzip tests (we're not comparing with random "host version")
replace with testing 2 known files out of blkid tests, and add badcrc test.
Rob Landley [Sat, 23 Apr 2016 10:04:37 +0000 (05:04 -0500)]
Fiz bzcat segfault reported by John Regehr (bad crc didn't set error message).
Rob Landley [Sat, 23 Apr 2016 00:08:56 +0000 (19:08 -0500)]
Allow EVAL= to run test under a different shell (for sh.test)
Elliott Hughes [Fri, 22 Apr 2016 16:26:51 +0000 (16:26 +0000)]
Regenerate generated files.
am:
bba047d92c
* commit '
bba047d92c355e15913c3ab4d3859746b8070571':
Regenerate generated files.
Change-Id: I4470a3eca7026c1c7c94e7fece26bcfd6ef90ae7
Elliott Hughes [Fri, 22 Apr 2016 15:34:27 +0000 (08:34 -0700)]
Regenerate generated files.
Change-Id: I2557e28527c58f25c814a961c003371b1a3214fc
Rob Landley [Thu, 21 Apr 2016 22:46:25 +0000 (17:46 -0500)]
Have dirtree_recurse() take the new dirfd as an argument.
Davis Mosenkovs [Wed, 20 Apr 2016 21:44:13 +0000 (14:44 -0700)]
Fix touch -t seconds parsing
Rob Landley [Thu, 21 Apr 2016 02:33:15 +0000 (02:33 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
b9cc6c6427
* commit '
b9cc6c64274a1b67546ff8be78dbc0290b3e0634':
Start of shell tests: $(()) and $'' expansion.
Replace list_working with just list, "make list list_pending" shows combined list.
ps and top are implemented from the android todo. Record enh's wishlist items.
Dust off toysh, remove ancient config debris, add start of prompt logic.
Fix tail -NUM again.
Fix "ssh top".
Fix top -b.
Rename gratuitous references to Roger Zelazny's amber series, add comments.
Fix a buffer overflow in diff -r.
Andy Chu pointed out an out of bounds access for zero length lines.
sed -f - should read from stdin.
Didn't check in all my local basename_r->getbasename changes. (Oops.)
Jakob Flierl pointed out a broken URL in the README.
Redefining basename_r to mean something random seems popular (bionic and freebsd both did it) so use getbasename instead.
Whitespace and comment.
Implement mv -n / cp -n (no clobber).
Change-Id: I2acb9b1a9a6fa74247a4b6cdd39610853c54e2d3
Elliott Hughes [Thu, 21 Apr 2016 01:22:50 +0000 (18:22 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Wed, 20 Apr 2016 06:56:10 +0000 (01:56 -0500)]
Start of shell tests: $(()) and $'' expansion.
Rob Landley [Wed, 20 Apr 2016 05:47:05 +0000 (00:47 -0500)]
Replace list_working with just list, "make list list_pending" shows combined list.
Rob Landley [Wed, 20 Apr 2016 04:03:12 +0000 (23:03 -0500)]
ps and top are implemented from the android todo. Record enh's wishlist items.
Elliott Hughes [Mon, 18 Apr 2016 17:41:32 +0000 (17:41 +0000)]
Stop creating a symlink for route.
am:
1c2326b
* commit '
1c2326b8af500adbb5864ea87afa94a0c6cf1ff0':
Stop creating a symlink for route.
Change-Id: I222cdc63784d7c1c4f20e6a12384823c3f04754b
Rob Landley [Sun, 17 Apr 2016 21:34:47 +0000 (16:34 -0500)]
Dust off toysh, remove ancient config debris, add start of prompt logic.
Elliott Hughes [Sat, 16 Apr 2016 15:19:23 +0000 (08:19 -0700)]
Fix tail -NUM again.
This time with a test.
Elliott Hughes [Sat, 16 Apr 2016 01:48:12 +0000 (18:48 -0700)]
Fix "ssh top".
The ps.c change allows us to start. The interestingtimes.c change allows
us to clean up properly afterwards if you ^C out (which you usually do).
Tested with both ssh and "adb shell" (the latter being where I noticed
the problem).
Elliott Hughes [Sat, 16 Apr 2016 01:38:53 +0000 (18:38 -0700)]
Fix top -b.
Batch mode should never output terminal escape sequences, should ignore
the keyboard, and should include a gap between datasets.
Rob Landley [Sat, 16 Apr 2016 19:03:36 +0000 (14:03 -0500)]
Rename gratuitous references to Roger Zelazny's amber series, add comments.
Elliott Hughes [Fri, 15 Apr 2016 18:57:05 +0000 (11:57 -0700)]
Stop creating a symlink for route.
We should remove the "route" command because its output is irrelevant and
misleading. This is because it only looks at the "main" routing table,
which is a last resort routing table that is a) trumped by all other
networks, b) empty except for directly-connected routes c) cannot even be
used by non-root users.
The proper way to understand device routing is to look at the output of
"ip rule" and "ip route", both of which are already available.
Example of how this is confusing:
$ adb shell route
Kernel IP routing table
Destination Gateway Genmask Flags Metric Ref Use Iface
160.249.218.72 * 255.255.255.248 U 0 0 0 rmnet_data0
192.168.144.0 * 255.255.240.0 U 0 0 0 wlan0
These aren't guaranteed to be used. For example, according to the output
above 160.249.218.73 should go through rmnet_data0, but it doesn't:
$ adb shell ip route get 160.249.218.73
160.249.218.73 via 192.168.159.254 dev wlan0 src 192.168.159.164 uid 0
cache
Also, there is no default route. But the device has networking just fine:
$ adb shell ip route get 8.8.8.8
8.8.8.8 via 192.168.159.254 dev wlan0 src 192.168.159.164 uid 0
cache
This is a first step. If no device breaks, I'll stop building it too. In the
meantime, it's still available as "toybox route".
Bug: http://b/
27603033
Change-Id: Ie444bfa9083e1f11b332d5d050a07cec48436e11
Andy Chu [Sun, 20 Mar 2016 06:11:30 +0000 (23:11 -0700)]
Fix a buffer overflow in diff -r.
We were doing two 32-byte memset()s instead of two 16-byte memset()s.
'dir' referred to the instance (array of 2) and not the struct type.
Add some test coverage for diff, including a case that hit this bug.
The bug was found by running cp.test under AddressSanitizer, since it
happens to use diff.
Rob Landley [Fri, 15 Apr 2016 02:00:54 +0000 (21:00 -0500)]
Andy Chu pointed out an out of bounds access for zero length lines.
While we're at it, use unsigned for the line length.
Rob Landley [Mon, 11 Apr 2016 16:32:36 +0000 (11:32 -0500)]
sed -f - should read from stdin.
Rob Landley [Sun, 10 Apr 2016 19:35:51 +0000 (14:35 -0500)]
Didn't check in all my local basename_r->getbasename changes. (Oops.)
Rob Landley [Sat, 9 Apr 2016 16:04:16 +0000 (11:04 -0500)]
Jakob Flierl pointed out a broken URL in the README.
Rob Landley [Fri, 8 Apr 2016 23:25:59 +0000 (18:25 -0500)]
Redefining basename_r to mean something random seems popular (bionic and freebsd
both did it) so use getbasename instead.
Elliott Hughes [Wed, 30 Mar 2016 17:48:09 +0000 (17:48 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD
am:
a898e9c
* commit '
a898e9c4b457765173a0ec6adea26d45b70b744c': (34 commits)
Fix build when wchar_t is unsigned.
Fix exit code of things like sed -i that use tempfile_handler().
basename: fix segfault on null input; add tests
Add od -w.
toolbox prlimit is no more.
Debian bug 635570 did something horribly nonstandard (depending on a side effect of "sed -e 'a\'" with no trailing line). But there's an actual user, and it's not hard to implement, and it's not hard to implement, and there isn't an obvious _other_ way to do it, so add the behavior and a test for it.
Fix bzcat.test (as noted by Andy Chu), wean tests off $TOPDIR and supply $FILES instead, move tests/blkid into tests/files/blkid.
The test infrastructure prints the command name now, so file.test shouldn't.
Minor blkid cleanup. (There was a while(ptr[-1]==' ') ptr--; that could fall off the start of the string. I pulled on the thread...)
Redo build stuff in response to Andy Chu's suggestions.
blkid: Handle short/empty vfat labels; update tests
Posix requires "" to be false, and 00 should be false, and -0 should be false. Fix memory leaks in regex. Simplify regex check (if we matched, subexpression had to match). Don't exit() from a command, set exitval and return.
Make lsof 10x faster by caching /proc/net socket info.
Fix last commit (had newline before first ==> name <==) and add -f tests.
Fix "tail -f single_file".
expr cleanup: simplify get_str() and free returned allocations.
Remove 'exit' from xargs test too.
Fix bug where all tests aren't being run with 'make test'.
expr cleanup: traverse optargs with tok instead of incrementing optargs and copying itinto a second variable. Also add error message for empty ( )
Move whitespace and curly brackets around, move reference URLs to top of file, eliminate syntax_error() function (just call error_exit() directly), eliminate advance() wrapper, pipe expected error messages in test to /dev/null
...
Change-Id: I59e775d702b1930dff37e8b0736857f6cbb4a6b6
Elliott Hughes [Wed, 30 Mar 2016 17:48:09 +0000 (17:48 +0000)]
Regenerate generated files.
am:
fafe427
* commit '
fafe427f2eae495dd9b081ed3f17d33dbba0e690':
Regenerate generated files.
Change-Id: Ibf1139f58e22205dc3b0f14251e4e1d5bd7de040
Elliott Hughes [Wed, 30 Mar 2016 17:22:06 +0000 (10:22 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 30 Mar 2016 17:20:45 +0000 (10:20 -0700)]
Regenerate generated files.
Change-Id: I5323d381d9dd2e10c90fc10d16ef21dbffdd716b