OSDN Git Service
Elliott Hughes [Fri, 22 Dec 2017 02:01:39 +0000 (02:01 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
5c2683335f
Change-Id: Id1c5fa6a2253e8ff1c8d00c5eb553e813af89aff
Elliott Hughes [Fri, 22 Dec 2017 01:51:17 +0000 (17:51 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Icb80c8fe862fb4db4f6bcfacb9c5e1d9d26108d5
Rob Landley [Tue, 19 Dec 2017 22:16:31 +0000 (16:16 -0600)]
Fix make bloatcheck dependencies (pointed out by Patrick Oppenlander).
Elliott Hughes [Wed, 13 Dec 2017 19:47:08 +0000 (11:47 -0800)]
killall should kill scripts too.
Found running LTP file system tests on Android.
Bug: http://b/
70627145
Rob Landley [Mon, 11 Dec 2017 13:19:37 +0000 (07:19 -0600)]
An incomplete list of deviations from posix (it's a start).
Rob Landley [Sun, 10 Dec 2017 20:12:19 +0000 (14:12 -0600)]
Cleanup pass on stty: collate do_stty() calls for future inlining,
collapse flag arrays to fewer lines, factor out xtcgetattr(),
strip curly brackets around single lines, don't have a separate error
message for tcsetattr() return code if more thorough check is on next line,
take advantage of O_RDONLY being zero, document -F.
Elliott Hughes [Wed, 6 Dec 2017 03:41:38 +0000 (03:41 +0000)]
Merge changes I768f0948,I3d79bb35
am:
2474ba9744
Change-Id: I04aec22a4eefac8439e101a6f28817e4f90b7bc9
Treehugger Robot [Wed, 6 Dec 2017 02:50:40 +0000 (02:50 +0000)]
Merge changes I768f0948,I3d79bb35
* changes:
Merge remote-tracking branch 'toybox/master' into HEAD
Use NULL rather than 0 in vargs.
Elliott Hughes [Tue, 5 Dec 2017 22:55:03 +0000 (14:55 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I768f0948024a388113ded1b689994c274565acce
Elliott Hughes [Mon, 4 Dec 2017 20:31:53 +0000 (12:31 -0800)]
Use NULL rather than 0 in vargs.
Top bits count too!
Elliott Hughes [Mon, 4 Dec 2017 20:48:15 +0000 (20:48 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
b4d75fdc5e
Change-Id: Ie14854bfa3c1a616f16382dd7a7c0578ab04fa08
Elliott Hughes [Mon, 4 Dec 2017 18:10:29 +0000 (10:10 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I8385fe7ba26eb183696d77d160c1c6662f2d775b
Rob Landley [Sun, 3 Dec 2017 07:30:39 +0000 (01:30 -0600)]
Commands in pending should default n.
Elliott Hughes [Sat, 2 Dec 2017 06:43:38 +0000 (22:43 -0800)]
Add stty(1).
Full POSIX stty with Linux extensions. Output and behavior match coreutils
8.26 as far as I can tell. For some reason busybox 1.22 stty always
shows all the special characters, even when they match "sane". I've
matched coreutils, since "shows differences from sane" is easy to describe
and obviously useful.
Flags in the various arrays are not in the order they're introduced in
POSIX or in the Linux header file: they're in the order that they're
output by coreutils' stty.
The -g output matches coreutils and busybox.
I implemented iuclc, xcase, and olcuc even though they've been removed
from POSIX because the others implement them, and "man stty" defines "raw"
and "sane" in terms of them (where POSIX doesn't define "sane" in any
useful sense).
This builds fine against glibc 2.24, and as far as I can tell all the
constants used were in Linux 2.6 so I'm assuming that there shouldn't
be any #ifdef nonsense needed for any reasonable vintage of C library.
Elliott Hughes [Fri, 17 Nov 2017 00:16:12 +0000 (16:16 -0800)]
Don't capitalize in the middle of a sentence.
Before:
toy: Unknown option p (See "toy --help")
After:
toy: Unknown option p (see "toy --help")
Elliott Hughes [Fri, 17 Nov 2017 00:35:10 +0000 (16:35 -0800)]
Add uptime -p.
We (Android) give up trying to teach folks what "up 142 days, 1:45"
means...
Bug: http://b/
65205261
Rob Landley [Sun, 3 Dec 2017 07:20:42 +0000 (01:20 -0600)]
Gaël PORTAY wants mdev to work when Linux has the block layer configured out.
Rob Landley [Sun, 3 Dec 2017 03:18:52 +0000 (21:18 -0600)]
Android has its loop devices under "block" as Elliott says "by reason of
historical accident", so fall back to check there.
Also remove an obsolete comment TODO block, check !parent for dirtree
top of tree instead of '/' in the filename, and typecast some printf
arguments for 32-bit systems.
Elliott Hughes [Tue, 28 Nov 2017 01:33:53 +0000 (01:33 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
73fd808900
Change-Id: I32af02ae6ff58b9aa9160f7a58dad6b30c2e5c44
Elliott Hughes [Tue, 28 Nov 2017 01:21:21 +0000 (17:21 -0800)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I22ec2b8b3f1a978442fd5f7031a35eba8cb9ce25
Rob Landley [Mon, 27 Nov 2017 05:40:20 +0000 (23:40 -0600)]
Recognize sh/frv fdpic, and add types for bpf and new microblaze.
Rob Landley [Sun, 26 Nov 2017 11:33:35 +0000 (05:33 -0600)]
Use endianness info to read executable type.
Elliott Hughes [Fri, 17 Nov 2017 20:10:36 +0000 (12:10 -0800)]
Add "time -v".
This shows the other fields in getrusage. I've chosen to only show the
ones actually maintained by Linux.
Elliott Hughes [Thu, 16 Nov 2017 21:59:37 +0000 (13:59 -0800)]
Make find -exec + obey ARG_MAX just like xargs.
This isn't ideal, but it matches xargs and none of us is likely to have
time to do the best possible thing any time soon.
Bug: http://b/
65818597
Test: ./toybox find /usr/local/google/ndkports/ -exec echo {} +
Rob Landley [Fri, 17 Nov 2017 03:04:31 +0000 (21:04 -0600)]
Minor tweaks.
Elliott Hughes [Wed, 15 Nov 2017 21:06:17 +0000 (13:06 -0800)]
Add "df -i".
Also switch to u64 for calculations. Some FUSE file systems have inode
counts large enough to overflow s64.
Xin Li [Mon, 13 Nov 2017 22:35:30 +0000 (14:35 -0800)]
Merge commit '
ebbab5196ab1c9dfeb610f6847650da181268e59' into HEAD
Change-Id: I4589911438030283a85737073c0c4eeb2fd875a9
Elliott Hughes [Sat, 4 Nov 2017 07:30:58 +0000 (07:30 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
62f36d9160
Change-Id: If03981a937fed75efa974b00c8cf5ed0fcc5fbce
Elliott Hughes [Sat, 4 Nov 2017 05:46:47 +0000 (22:46 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I29c0c12ba499702296fa4c6f01d5c6dfde25ae11
Elliott Hughes [Wed, 1 Nov 2017 18:09:42 +0000 (11:09 -0700)]
file(1): add ogg, TrueType font, LLVM bitcode, PEM certs, and PE executables.
More of the files encountered on the Android system image (plus PE
executables, which we build but which shouldn't actually make it to the
system image!).
Elliott Hughes [Wed, 1 Nov 2017 21:44:25 +0000 (21:44 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
60f116b00b
Change-Id: Ie744d7d4736301f157c34f797c31fdea6c7ced58
Elliott Hughes [Wed, 1 Nov 2017 15:51:16 +0000 (08:51 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I0f484781d22922c8d0764051f05924fab1d8b072
Rob Landley [Wed, 1 Nov 2017 00:44:32 +0000 (19:44 -0500)]
Add top -m, fix width truncating for narrow screens (off by one), and add iotop -H
Rob Landley [Tue, 31 Oct 2017 20:51:02 +0000 (15:51 -0500)]
Rename test_*.c to demo_*.c (because "make test_$CMD" means something already),
fluff out README, and add a comment to hostid explaining its deprecation.
Rob Landley [Tue, 31 Oct 2017 20:43:38 +0000 (15:43 -0500)]
Only show LABEL= when there is one.
Rob Landley [Tue, 31 Oct 2017 20:30:04 +0000 (15:30 -0500)]
Fix cut -s and -f when delimiter not found (posix says print whole line).
Elliott Hughes [Sat, 28 Oct 2017 20:15:24 +0000 (20:15 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
e64d3fbcfc
Change-Id: I1ea8da7d493f1f870fcf2fbbc111b844ebc1abab
Elliott Hughes [Sat, 28 Oct 2017 18:25:01 +0000 (11:25 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ie8296ab28983a463cabe2c6b3bf1a0bfee6127d4
Rob Landley [Sat, 28 Oct 2017 08:26:33 +0000 (03:26 -0500)]
Web page updates.
Rob Landley [Thu, 26 Oct 2017 01:27:33 +0000 (20:27 -0500)]
Make -c work with unicode chars, and first stab at -C measuring columns.
Elliott Hughes [Mon, 23 Oct 2017 15:59:21 +0000 (15:59 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
cb633d4175
Change-Id: Iabf046987aeeef1d866415ae35bff412c52bf29d
Elliott Hughes [Mon, 23 Oct 2017 05:56:36 +0000 (22:56 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ic864a300496f900884e5e07e834ac309c76d569e
Rob Landley [Sun, 22 Oct 2017 18:36:02 +0000 (13:36 -0500)]
Insmod dummy for ifconfig tests, and "pointopoint" only has two t's.
Rob Landley [Sun, 22 Oct 2017 16:52:32 +0000 (11:52 -0500)]
Add stat to index.
Rob Landley [Sun, 22 Oct 2017 16:42:59 +0000 (11:42 -0500)]
I ended up writing a new find from scratch, so remove old unfinished cleanup log.
Rob Landley [Sun, 22 Oct 2017 16:41:27 +0000 (11:41 -0500)]
Typo.
Rob Landley [Sat, 21 Oct 2017 14:53:14 +0000 (09:53 -0500)]
Use char for exitval and wasroot (first capped at 8 bits and second's a flag).
Rob Landley [Sat, 21 Oct 2017 14:48:24 +0000 (09:48 -0500)]
Use setlocale(LC_CTYPE, "C.UTF-8") for more targeted locale enable:
(only enable character parsing, force utf8, "C" semantics otherwise.)
Jiyong Park [Fri, 20 Oct 2017 01:10:58 +0000 (01:10 +0000)]
Remove libselinux_vendor
am:
61be2f867f
Change-Id: I6e8d751fd816f789727465a15941ea35f966db65
Rob Landley [Thu, 19 Oct 2017 21:49:52 +0000 (16:49 -0500)]
Elliott wants to add TOYBOX_VENDOR.
Jiyong Park [Fri, 13 Oct 2017 00:18:10 +0000 (09:18 +0900)]
Remove libselinux_vendor
libselinux is now a vendor_available: true library.
Bug:
66914194
Test: lunch aosp_arm64_ab-userdebug; m libselinux.vendor toybox_vendor
Change-Id: I3ff0a73c29e089881e74566c52693792b9f1ecd3
Elliott Hughes [Wed, 18 Oct 2017 23:29:02 +0000 (23:29 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
fa58895b44 am:
e77b0564e2
am:
579a5da1af
Change-Id: I36aa5ec1bc25a6aed0fad2a071e538afe5a71512
Elliott Hughes [Wed, 18 Oct 2017 23:24:10 +0000 (23:24 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
fa58895b44
am:
e77b0564e2
Change-Id: I73052043f9c026fb47ae5c110f43e5075a30d2f3
Elliott Hughes [Wed, 18 Oct 2017 23:22:07 +0000 (23:22 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
fa58895b44
Change-Id: I2d9a87c927142612d498e38a47f61cb3401842d9
Elliott Hughes [Wed, 18 Oct 2017 21:25:38 +0000 (14:25 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Icf243ef1fcceed4281f8491bc90f668fd65f3979
Elliott Hughes [Fri, 29 Sep 2017 22:20:26 +0000 (15:20 -0700)]
Fix groups(1) and id -G.
Both should only output the groups.
Elliott Hughes [Tue, 17 Oct 2017 20:23:19 +0000 (20:23 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
bac04b4984 am:
3917661b78
am:
80060a8309
Change-Id: I1c95d91113a23a50ed5f2ae6c84b3f5948765d7e
Elliott Hughes [Tue, 17 Oct 2017 20:10:59 +0000 (20:10 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
bac04b4984
am:
3917661b78
Change-Id: I069acb5748db4d150cf9cd5fc51b3e209f4cd5d6
Elliott Hughes [Tue, 17 Oct 2017 20:08:29 +0000 (20:08 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
bac04b4984
Change-Id: I2034eee62a46862ae2c1a204787af537c17ee438
Elliott Hughes [Tue, 17 Oct 2017 18:14:09 +0000 (11:14 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I017f86ef407b801d0cd9c04bd4b50905b87eb143
Tom Cherry [Thu, 12 Oct 2017 16:43:32 +0000 (09:43 -0700)]
Allow ro. properties to have arbitrary lengths
Android now allows ro. properties to have arbitrary lengths. Two
changes need to happen to support this:
1) The length check in setprop.c before attempting to set a property
needs to be removed for ro. properties
2) __system_property_read_callback() must be used in place of
__system_property_get() in getprop.c as only the former is capable
of reading properties with size > 92 characters.
Bug:
23102347
Bug:
34954705
Change-Id: Ib8565a3e6d987dd5e6a5fe790e804ecf8ad1e020
Elliott Hughes [Tue, 17 Oct 2017 05:17:33 +0000 (05:17 +0000)]
Android doesn't support setuid-root toybox. am:
ce26024f83 am:
d8a348ac79
am:
2f42b9cd22
Change-Id: I00496dd0240654a921ef4954baca6ce4c61c0950
Elliott Hughes [Mon, 16 Oct 2017 22:41:21 +0000 (22:41 +0000)]
Android doesn't support setuid-root toybox. am:
ce26024f83
am:
d8a348ac79
Change-Id: If75406c47e3fe218e19852ad23b32143656178ca
Elliott Hughes [Mon, 16 Oct 2017 22:29:25 +0000 (22:29 +0000)]
Android doesn't support setuid-root toybox.
am:
ce26024f83
Change-Id: I162cd9cebc22917f1208362359afc678e4afbe4b
Elliott Hughes [Mon, 16 Oct 2017 17:40:41 +0000 (10:40 -0700)]
Android doesn't support setuid-root toybox.
Removing this support also removes the "am I root?" check for commands like
insmod(1) and lets the system call succeed/fail as appropriate.
Bug: N/A
Test: ran tests
Change-Id: I4118d8ec2cf54395df754396f209bb0c3dd97db9
Chih-Hung Hsieh [Thu, 12 Oct 2017 21:52:23 +0000 (21:52 +0000)]
Use -Werror in external/toybox am:
0eb514a0fc am:
9ef458faee
am:
15156e9d2c
Change-Id: I8dae5c0f75da28dd64019157c8fb17712f44201d
Chih-Hung Hsieh [Thu, 12 Oct 2017 21:48:13 +0000 (21:48 +0000)]
Use -Werror in external/toybox am:
0eb514a0fc
am:
9ef458faee
Change-Id: Idf8a5adc5823b30ef5a288306e2789becad5bcfa
Chih-Hung Hsieh [Thu, 12 Oct 2017 21:45:57 +0000 (21:45 +0000)]
Use -Werror in external/toybox
am:
0eb514a0fc
Change-Id: I551ab6076b437d4e109a2a380ec9743629f01625
Chih-Hung Hsieh [Wed, 11 Oct 2017 21:24:08 +0000 (14:24 -0700)]
Use -Werror in external/toybox
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I82daf6bf8ba0bfad4489ea07336f8c3b0e8177b5
Rob Landley [Tue, 10 Oct 2017 23:16:08 +0000 (18:16 -0500)]
Tweak help_exit() to show "See %s --help" message on the same line.
Rob Landley [Tue, 10 Oct 2017 16:24:11 +0000 (11:24 -0500)]
Complete rewrite of cut. Handle multipe ranges, add -DFO options, start
of utf8 support (not finished yet)...
Adds new loopfiles_lines() wrapper to lib.c that calls do_lines from loopfiles.
Rob Landley [Tue, 3 Oct 2017 08:29:38 +0000 (03:29 -0500)]
Workaround from Patrick Oppenlander for a bug in config2help.h that resulted
in segfaults on newer toolchains. (That entire section is due for a rewrite.)
Elliott Hughes [Mon, 2 Oct 2017 17:04:58 +0000 (17:04 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
89bb822f3e am:
243a090d82
am:
fb5520cd79
Change-Id: I9e0804711913d7a76494aa211dd2cf13acfbf1f0
Elliott Hughes [Mon, 2 Oct 2017 17:02:35 +0000 (17:02 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
89bb822f3e
am:
243a090d82
Change-Id: I60d7c28199f0e7e49098459cd5bf0ccc6f0d6b7c
Elliott Hughes [Mon, 2 Oct 2017 16:59:30 +0000 (16:59 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
89bb822f3e
Change-Id: I0ba2a80d0d3a593ba89359fd6cc4f8d3c609ee1e
Elliott Hughes [Mon, 2 Oct 2017 15:09:49 +0000 (08:09 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I960715d0496be2af52a090af8b0715ea61914838
Elliott Hughes [Wed, 20 Sep 2017 20:53:23 +0000 (13:53 -0700)]
Fix xargs to obey POSIX's ARG_MAX restrictions.
This avoids "xargs: exec echo: Argument list too long" errors in practice.
find(1) needs to be fixed too, but that's a bit more complicated and a working
xargs provides a workaround.
Bug: http://b/
65818597
Test: find /proc | strace -f -e execve ./toybox xargs echo > /dev/null
Elliott Hughes [Mon, 25 Sep 2017 16:59:48 +0000 (09:59 -0700)]
Basic Mach-O support in file(1).
The Nexus Player build was subtly broken in that it assumed that the host was
using ELF. No-one noticed until a Mac user tried to flash their build, which
contained a Mach-O x86 binary instead of an ELF x86 binary. Hilarity ensued.
(On the same day, file(1) was able to explain a mixup with an ELF hexagon
binary. Next time we see a Mach-O binary on an Android device, we'll be ready!)
Bug: http://b/
66741960
Rob Landley [Thu, 21 Sep 2017 20:33:01 +0000 (15:33 -0500)]
Add #warning about musl intentionally breaking chrt.
Elliott Hughes [Tue, 19 Sep 2017 21:56:07 +0000 (21:56 +0000)]
Build toybox iotop. am:
33cf0f77c8 am:
a0f59ea43d
am:
57a2be9cb4
Change-Id: I848b74acdbafe8462cdd480f6113253057a4c21a
Elliott Hughes [Tue, 19 Sep 2017 21:44:04 +0000 (21:44 +0000)]
Build toybox iotop. am:
33cf0f77c8
am:
a0f59ea43d
Change-Id: Ia86aa224a6fc21e2a9edac19fd1b7ddcd71b6b25
Elliott Hughes [Tue, 19 Sep 2017 21:39:06 +0000 (21:39 +0000)]
Build toybox iotop.
am:
33cf0f77c8
Change-Id: I47efef72d1cce8a6d2f25eb1c1f86251888c71db
Elliott Hughes [Mon, 18 Sep 2017 23:44:16 +0000 (16:44 -0700)]
Build toybox iotop.
Bug: N/A
Test: adb shell toybox iotop
Change-Id: I9e0fa345e4defe4d60e196b5c9acdd70f7c2d272
Zach Riggle [Wed, 13 Sep 2017 17:15:45 +0000 (12:15 -0500)]
Fix URL typo
Elliott Hughes [Thu, 14 Sep 2017 16:06:17 +0000 (16:06 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
f37062b46d am:
a949b8829c
am:
e01b99e99f
Change-Id: I1229f5c61a4ece2f0a74fc7656aff3fa2258fdb3
Elliott Hughes [Thu, 14 Sep 2017 16:03:46 +0000 (16:03 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
f37062b46d
am:
a949b8829c
Change-Id: I2add91bb705fe680ddfe344118c4763d0d09bfd5
Elliott Hughes [Thu, 14 Sep 2017 16:01:20 +0000 (16:01 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
f37062b46d
Change-Id: I69d3341992386193d7a6c8b13e98db2ee44437fa
Elliott Hughes [Thu, 14 Sep 2017 06:25:38 +0000 (23:25 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: I8697d5bd7aa445d4c7acae8164eda00d20fa3c38
Rob Landley [Sun, 10 Sep 2017 03:05:10 +0000 (22:05 -0500)]
Last commit used xstrtod(), forgot to check it in.
Rob Landley [Sun, 10 Sep 2017 02:35:19 +0000 (21:35 -0500)]
Redo/add seq precision logic.
Josh Gao hit a case where "seq
1000000 1000001" output 1e+06, and while he
was there changed several things to work like existing seq implementations.
I changed a couple back (commenting out the test cases) until somebody
came come up with a reason (or existing use case) to do it that way.
Rob Landley [Wed, 6 Sep 2017 11:12:09 +0000 (06:12 -0500)]
Tighten up wc -m tests (which no longer depend on $LANG).
Rob Landley [Wed, 6 Sep 2017 02:04:43 +0000 (21:04 -0500)]
Replace remaining mb*towc() calls with utf8towc().
Rob Landley [Tue, 5 Sep 2017 07:36:24 +0000 (02:36 -0500)]
Tweak utf8towc() to return -1 earlier sometimes (instead of -2), and add test
program to compare against libc output.
Rob Landley [Sun, 3 Sep 2017 01:40:24 +0000 (20:40 -0500)]
utf8towc() has to be in lib.c if strlower() is going to use it, because
scripts/*.c builds against lib.c but not linestack.c.
Rob Landley [Sat, 2 Sep 2017 23:15:09 +0000 (18:15 -0500)]
In wc, replace mbrtowc() with new utf8towc() which doesn't have a context struct
or care about locale.
Elliott Hughes [Fri, 1 Sep 2017 01:21:03 +0000 (01:21 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
11385503ee am:
4077f75055
am:
3f3dde2e00
Change-Id: I9041878f64c292435075982eba8cb99bb9628943
Elliott Hughes [Fri, 1 Sep 2017 01:16:32 +0000 (01:16 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD am:
11385503ee
am:
4077f75055
Change-Id: Ia1136cf64257e0bbe11cafbee5cae87f9bea8265
Elliott Hughes [Fri, 1 Sep 2017 01:13:05 +0000 (01:13 +0000)]
Merge remote-tracking branch 'toybox/master' into HEAD
am:
11385503ee
Change-Id: I901afa0deb4ec639315342fd0526987a87972530
Elliott Hughes [Thu, 31 Aug 2017 23:17:43 +0000 (16:17 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD
Rob Landley [Thu, 31 Aug 2017 21:50:27 +0000 (16:50 -0500)]
Another try at fixing the ps segfault resulting from /proc entries vanishing
out from under us due to asyncronous process exit.
The directory we're traversing vanishing can result in DIRTREE_ABORTVAL
being returned, which we turn into a NUL entry, but then we were trying to
look at that null entry's children. Oops.
OSDN Git Service
