OSDN Git Service

android-x86/external-toybox.git
8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a am: 0a2465b7db
Rob Landley [Fri, 27 May 2016 22:31:15 +0000 (22:31 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a am: 0a2465b7db
am: e08318d24b

* commit 'e08318d24bea5e12bf5bc71b5e58f8d72cec8f6f':
  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: I7911c2df4e3abb806f2bda86e627b8894994f89a

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a
Elliott Hughes [Fri, 27 May 2016 22:26:47 +0000 (22:26 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a
am: 0a2465b7db

* commit '0a2465b7dbd911e4745af51f691b7618ff43b1e8':
  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: Ic0675d535dc0717aef51a9c2a59ce2cd61175146

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 27 May 2016 20:57:40 +0000 (13:57 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoAdd -o TNAME for android, fix display of last field (retain left justifification
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.

8 years agoStabilize another sort.
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...)

8 years agoStop building toybox route. am: 48e1f81151 am: 127fdfaa41
Elliott Hughes [Wed, 25 May 2016 23:46:27 +0000 (23:46 +0000)]
Stop building toybox route. am: 48e1f81151 am: 127fdfaa41
am: 9bf37a0686

* commit '9bf37a0686523c0f04d6091a67cfa75b3307aa45':
  Stop building toybox route.

Change-Id: I82c389e94a6c263231769bbb0f5a3ef9cfe0c084

8 years agoStop building toybox route. am: 48e1f81151
Elliott Hughes [Wed, 25 May 2016 23:36:32 +0000 (23:36 +0000)]
Stop building toybox route. am: 48e1f81151
am: 127fdfaa41

* commit '127fdfaa4146bf81e0d6f4503f6dcfafad7037a1':
  Stop building toybox route.

Change-Id: Ide8827adc6239ea2c92db663c1ee2f68e81d0388

8 years agoStop building toybox route.
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

8 years agoStop building toybox route.
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

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac am: afd5761e89
Rob Landley [Wed, 25 May 2016 21:37:57 +0000 (21:37 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac am: afd5761e89
am: e0a437e83c

* commit 'e0a437e83cc988274890589fd5d0c8146830403e':
  The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)

Change-Id: I84710826975f03e4533c235906e4195ec47eb99e

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac
Elliott Hughes [Wed, 25 May 2016 21:26:06 +0000 (21:26 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac
am: afd5761e89

* commit 'afd5761e898130744d19e3d2960f72295478d70f':
  The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)

Change-Id: Icff8308b066d65d51ec9c915f8fe226334d3ae68

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoStand alone builds of OLDTOY should show help text for corresponding NEWTOY.
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.

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 24 May 2016 22:27:49 +0000 (15:27 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoThe "show parent command path" commit changed the criteria for active nodes,
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.)

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 87bfced0f8 am: 046214fe5a
Elliott Hughes [Tue, 24 May 2016 16:37:41 +0000 (16:37 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 87bfced0f8 am: 046214fe5a
am: ed5ef36048

* commit 'ed5ef3604838d4f14de5f3615a314d1cd81129a6':
  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: Ibae5c10b95e6e6578178826cd1332bd40fdf72ac

8 years agoRegenerate generated files. am: a2ba247f52 am: 263dcfefc1
Elliott Hughes [Tue, 24 May 2016 16:37:38 +0000 (16:37 +0000)]
Regenerate generated files. am: a2ba247f52 am: 263dcfefc1
am: 1ac6c797a4

* commit '1ac6c797a4412898e774df725cc7a6973e6a2de1':
  Regenerate generated files.

Change-Id: I58acbfaddd4e9c3ffd12c75a925106fe8eff2889

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 87bfced0f8
Elliott Hughes [Tue, 24 May 2016 16:33:03 +0000 (16:33 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 87bfced0f8
am: 046214fe5a

* commit '046214fe5a2d4ebcdfe64f14ae69b156e357c437':
  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: Ibe9fba9fd4678e6a57edebd8cfbaad0d8b3eb28a

8 years agoRegenerate generated files. am: a2ba247f52
Elliott Hughes [Tue, 24 May 2016 16:33:02 +0000 (16:33 +0000)]
Regenerate generated files. am: a2ba247f52
am: 263dcfefc1

* commit '263dcfefc10ea5930445b521db34a51b2742537c':
  Regenerate generated files.

Change-Id: Ieb3008c2166e992f8eea44038bd79bd4dee25371

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoRegenerate generated files.
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

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 24 May 2016 16:13:35 +0000 (09:13 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoRegenerate generated files.
Elliott Hughes [Tue, 24 May 2016 16:12:04 +0000 (09:12 -0700)]
Regenerate generated files.

Change-Id: I2014135856d6316a53c22cace2cc935cf65434f6

8 years agoFix remaining pkill tests.
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.

8 years agoFix pkill -9.
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.

8 years agoDon't truncate number fields for anything but right edge of screen, instead
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.

8 years agoMake -o COMMAND show parent command path for threads, and use saved length
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.

8 years agoComment and help text tweaks.
Rob Landley [Sun, 22 May 2016 17:00:16 +0000 (12:00 -0500)]
Comment and help text tweaks.

8 years agoAdd bufgetgrgid()
Rob Landley [Fri, 20 May 2016 19:28:13 +0000 (14:28 -0500)]
Add bufgetgrgid()

8 years agoMake build dependencies more granular. This should fix the problem where
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.

8 years agoAdd bufgetpwuid. (Repeated calls to getpwuid() are really expensive.)
Rob Landley [Tue, 17 May 2016 17:10:07 +0000 (12:10 -0500)]
Add bufgetpwuid. (Repeated calls to getpwuid() are really expensive.)

8 years agoAdd top -O
Rob Landley [Mon, 16 May 2016 19:51:37 +0000 (14:51 -0500)]
Add top -O

8 years agoAdd stat -tL and -c %m%t%T.
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.

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 498e61d5a4 am: 5cf25606a1
Rob Landley [Tue, 10 May 2016 22:27:19 +0000 (22:27 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 498e61d5a4 am: 5cf25606a1
am: 2b493c18d2

* commit '2b493c18d2bbb4fd4efb414d67e824fa5da56036':
  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: I92bcd00db61be8a22339ea849e84359a49befdc7

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 498e61d5a4
Elliott Hughes [Tue, 10 May 2016 22:24:39 +0000 (22:24 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 498e61d5a4
am: 5cf25606a1

* commit '5cf25606a1ad610d3b81b4549adbfa9db5dda448':
  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: Ia21afb192112caf0343f74a8953f3b4d2b449c94

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Tue, 10 May 2016 22:03:41 +0000 (15:03 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoUse CFG_TOYBOX_NORECURSE to avoid
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.

8 years agoTurn on CONFIG_TOYBOX_NORECURSE for SafeStack. am: d9417c0630 am: e840b40177
Elliott Hughes [Mon, 9 May 2016 21:38:15 +0000 (21:38 +0000)]
Turn on CONFIG_TOYBOX_NORECURSE for SafeStack. am: d9417c0630 am: e840b40177
am: 82faf8f435

* commit '82faf8f4354d1e490e76f1fafd65962d96e07b17':
  Turn on CONFIG_TOYBOX_NORECURSE for SafeStack.

Change-Id: I377ee4cfc32eefa605e99c038413424a2401d3e1

8 years agoTurn on CONFIG_TOYBOX_NORECURSE for SafeStack. am: d9417c0630
Elliott Hughes [Mon, 9 May 2016 21:32:51 +0000 (21:32 +0000)]
Turn on CONFIG_TOYBOX_NORECURSE for SafeStack. am: d9417c0630
am: e840b40177

* commit 'e840b401771119498d842d226b67293ba26c2b11':
  Turn on CONFIG_TOYBOX_NORECURSE for SafeStack.

Change-Id: Ibbd7f7c8d000ceebe1c68df6feb8edd01f3d1484

8 years agoTurn on CONFIG_TOYBOX_NORECURSE for SafeStack.
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

8 years agoTurn on CONFIG_TOYBOX_NORECURSE for SafeStack.
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

8 years agoWork around increasingly insane compiler developers wanting to make everything
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.

8 years agoRegenerate generated files. am: 7844a48fe7 am: 72f844897f
Elliott Hughes [Fri, 6 May 2016 20:14:57 +0000 (20:14 +0000)]
Regenerate generated files. am: 7844a48fe7 am: 72f844897f
am: 4dcacc70e2

* commit '4dcacc70e23bac1bbfd4af48d04fc590bffa4dc4':
  Regenerate generated files.

Change-Id: I3966f5bf2151f7430364680d60c4ec9600f087ca

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e am: a1f82e90c4
Alistair Strachan [Fri, 6 May 2016 20:14:57 +0000 (20:14 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e am: a1f82e90c4
am: 7bdecc3b26

* commit '7bdecc3b26d4f89aace94736acd95c03e894130b':
  Fix static linkage of toybox binary.
  Add top -H.
  Android roadmap update.

Change-Id: I7f8c173bfea0331a260a13660be40623854adf22

8 years agoRegenerate generated files. am: 7844a48fe7
Elliott Hughes [Fri, 6 May 2016 20:09:56 +0000 (20:09 +0000)]
Regenerate generated files. am: 7844a48fe7
am: 72f844897f

* commit '72f844897fe36fa06108d999f07d2739e8ce6510':
  Regenerate generated files.

Change-Id: Ie29e3f8ec0a419ce3a7c6f463d1d038f41662c51

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e
Elliott Hughes [Fri, 6 May 2016 20:09:55 +0000 (20:09 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e
am: a1f82e90c4

* commit 'a1f82e90c421498ce800c36aa17b3c5a30b6eea0':
  Fix static linkage of toybox binary.
  Add top -H.
  Android roadmap update.

Change-Id: I939d6447e08a9d48f9b4d9bcc06c7d53831ade99

8 years agoRegenerate generated files.
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

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 6 May 2016 19:49:08 +0000 (12:49 -0700)]
Regenerate generated files.

Change-Id: I781e947ca3cf323262b0acb4269727357d7f9347

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 6 May 2016 18:06:20 +0000 (11:06 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoFix static linkage of toybox binary.
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>
8 years agoAdd top -H.
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.

8 years agoAndroid roadmap update.
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.

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: e386192471 am: 90ed87b8c1
Elliott Hughes [Thu, 5 May 2016 17:38:50 +0000 (17:38 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: e386192471 am: 90ed87b8c1
am: 2a14db897c

* commit '2a14db897cee57e35c79cc34ebd31845373f75b4':
  "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: I59868d6f69eca9b2759cd7c31467f869db47af66

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: e386192471
Elliott Hughes [Thu, 5 May 2016 17:34:49 +0000 (17:34 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: e386192471
am: 90ed87b8c1

* commit '90ed87b8c123fd0e6b8e2be8ac7137e7f3f60c61':
  "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: Ia09d91982e3a9468c611a83363cf4c9e57dce5e6

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Thu, 5 May 2016 16:34:17 +0000 (09:34 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years ago"top -b -n1" should end with a newline.
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.

8 years agoSwitch to toybox ps. am: 782aced0d9 am: 023bb1a8fb
Elliott Hughes [Thu, 5 May 2016 00:40:35 +0000 (00:40 +0000)]
Switch to toybox ps. am: 782aced0d9 am: 023bb1a8fb
am: 022b6e2c97

* commit '022b6e2c9725262a528f8e732e3217ad814b25a6':
  Switch to toybox ps.

Change-Id: Iddafa6f8545d2d16f1c8256d1e0f4f7bcd84881c

8 years agoSwitch to toybox ps. am: 782aced0d9
Elliott Hughes [Thu, 5 May 2016 00:38:16 +0000 (00:38 +0000)]
Switch to toybox ps. am: 782aced0d9
am: 023bb1a8fb

* commit '023bb1a8fb9bd19a700278bd88997d8d20b6bc15':
  Switch to toybox ps.

Change-Id: I00857da365b9a091509bb6e2e6da2e56b69adfd5

8 years agoSwitch to toybox ps.
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

8 years agoElliott says -T should fetch threads even when not displaying thread fields.
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.

8 years agoSimplify ps android scheduling policy fetch slightly.
Rob Landley [Wed, 4 May 2016 23:37:50 +0000 (18:37 -0500)]
Simplify ps android scheduling policy fetch slightly.

8 years agoSwitch to toybox ps.
Elliott Hughes [Wed, 4 May 2016 22:18:27 +0000 (15:18 -0700)]
Switch to toybox ps.

Change-Id: I1f0307a8c9511d02a173555b92ebd0f83df229c9

8 years agoRegenerate generated files. am: 2737fdfe8c am: 345f26605e
Elliott Hughes [Wed, 4 May 2016 21:38:24 +0000 (21:38 +0000)]
Regenerate generated files. am: 2737fdfe8c am: 345f26605e
am: 4b494a5668

* commit '4b494a56684d3c11c8f33cf6c1be156286317af4':
  Regenerate generated files.

Change-Id: Ifdd0b0260bf77e454fc55b69753a05b0baa71c15

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 67d6a99a50 am: 9b8364720e
Rob Landley [Wed, 4 May 2016 21:38:23 +0000 (21:38 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 67d6a99a50 am: 9b8364720e
am: ada7fe5808

* commit 'ada7fe5808c00dc79abd0529abf3af1c19a53230':
  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: I907c42e57ddafe97af8acc8dce7a138166f38a7d

8 years agoRegenerate generated files. am: 2737fdfe8c
Elliott Hughes [Wed, 4 May 2016 21:02:51 +0000 (21:02 +0000)]
Regenerate generated files. am: 2737fdfe8c
am: 345f26605e

* commit '345f26605ec576fdb185102282864d4f8ee9d787':
  Regenerate generated files.

Change-Id: I35785bfef30b9d5988280458146c080e54884f93

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 67d6a99a50
Elliott Hughes [Wed, 4 May 2016 21:02:50 +0000 (21:02 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 67d6a99a50
am: 9b8364720e

* commit '9b8364720e43847d07908910d0aef3525a117986':
  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: I9b7d908e4bd364ea8c13a887fd50f9b02d408b97

8 years agoRegenerate generated files.
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

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoRegenerate generated files.
Elliott Hughes [Wed, 4 May 2016 20:42:18 +0000 (13:42 -0700)]
Regenerate generated files.

Change-Id: I8d1590a61a7339f65cd1bdf28601f85768563b57

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Wed, 4 May 2016 20:36:49 +0000 (13:36 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoHostname cleanup, as described on the list.
Rob Landley [Wed, 4 May 2016 10:14:35 +0000 (05:14 -0500)]
Hostname cleanup, as described on the list.

8 years agoAdd -b and -F arguments to hostname
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.

8 years agoFluff up README.
Rob Landley [Mon, 2 May 2016 23:59:57 +0000 (18:59 -0500)]
Fluff up README.

8 years agoAdd a ps "PCY" field for Android scheduling policy.
Elliott Hughes [Sat, 30 Apr 2016 01:04:20 +0000 (18:04 -0700)]
Add a ps "PCY" field for Android scheduling policy.

8 years agoRegenerate generated files. am: d79a424de9 am: cc0dd37709
Elliott Hughes [Sat, 30 Apr 2016 18:17:06 +0000 (18:17 +0000)]
Regenerate generated files. am: d79a424de9 am: cc0dd37709
am: bd6a05e397

* commit 'bd6a05e397b87ad7a3a452035e5b7c06ad9a7d18':
  Regenerate generated files.

Change-Id: I95590ed85bb8603fad7d0c2e2ecbc32a7577919b

8 years agoRegenerate generated files. am: d79a424de9
Elliott Hughes [Sat, 30 Apr 2016 18:13:37 +0000 (18:13 +0000)]
Regenerate generated files. am: d79a424de9
am: cc0dd37709

* commit 'cc0dd377096bc99eef63c465a975d1f0f238ce1b':
  Regenerate generated files.

Change-Id: Id0326799db9540cf67364fd36a41f075c78e72b0

8 years agoRegenerate generated files.
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

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906 am: ee12b24d75
Rob Landley [Sat, 30 Apr 2016 17:03:59 +0000 (17:03 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906 am: ee12b24d75
am: 09ba017639

* commit '09ba01763966031b76763c5a77c9177b1443a550':
  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: If651ad7da69be51c9daa5ab83bc3cc26968c4961

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906
Elliott Hughes [Sat, 30 Apr 2016 17:00:32 +0000 (17:00 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906
am: ee12b24d75

* commit 'ee12b24d751225f4e04c67edaa31610cad77f737':
  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: I15b34c904196f8754e8be659642367b70d042ced

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoRegenerate generated files.
Elliott Hughes [Sat, 30 Apr 2016 16:52:51 +0000 (09:52 -0700)]
Regenerate generated files.

Change-Id: Id500eb735af13344c65dfce96f37199e65d4fe53

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Sat, 30 Apr 2016 16:26:12 +0000 (09:26 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agoFirst guess at showing thread names properly.
Rob Landley [Sat, 30 Apr 2016 00:45:18 +0000 (19:45 -0500)]
First guess at showing thread names properly.

8 years agoShow "-" rather 0 if we don't know whether a process is 32- or 64-bit.
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.

8 years agoFix ps -O help output alignment.
Elliott Hughes [Fri, 29 Apr 2016 20:44:01 +0000 (13:44 -0700)]
Fix ps -O help output alignment.

8 years agoRegenerate generated files. am: 3b8b9e954f am: 00f33040d7
Elliott Hughes [Fri, 29 Apr 2016 21:22:44 +0000 (21:22 +0000)]
Regenerate generated files. am: 3b8b9e954f am: 00f33040d7
am: 12d0a53480

* commit '12d0a534801ab829f8e7ce3bb267e2d78360638b':
  Regenerate generated files.

Change-Id: I284d7b6069fa431c5e6a34518a08e3bba44e77df

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2 am: 5e9d6ffc29
Rob Landley [Fri, 29 Apr 2016 21:22:44 +0000 (21:22 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2 am: 5e9d6ffc29
am: e5f725e205

* commit 'e5f725e2055630545a3fafcca644200c599fb9da':
  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: Ie6591e2ec6f33c49513c25d5bdcc20883dd10732

8 years agoRegenerate generated files. am: 3b8b9e954f
Elliott Hughes [Fri, 29 Apr 2016 21:20:31 +0000 (21:20 +0000)]
Regenerate generated files. am: 3b8b9e954f
am: 00f33040d7

* commit '00f33040d74c4bb0218a1501887b9fa9611fac18':
  Regenerate generated files.

Change-Id: I76283bc35e1f2ec1a9aef738d9e640983baeec98

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2
Elliott Hughes [Fri, 29 Apr 2016 21:20:31 +0000 (21:20 +0000)]
Merge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2
am: 5e9d6ffc29

* commit '5e9d6ffc295d032659045b0374ebf1434fc1288d':
  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: Idd28f5ad3481a0ea9650f8033ae945e226c9f60a

8 years agoRegenerate generated files.
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

8 years agoMerge remote-tracking branch \'toybox/master\' into HEAD
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

8 years agoRegenerate generated files.
Elliott Hughes [Fri, 29 Apr 2016 21:10:40 +0000 (14:10 -0700)]
Regenerate generated files.

Change-Id: Ifbb9056f6fa700c3426012d4ec6c43b70a4947c4

8 years agoMerge remote-tracking branch 'toybox/master' into HEAD
Elliott Hughes [Fri, 29 Apr 2016 18:57:24 +0000 (11:57 -0700)]
Merge remote-tracking branch 'toybox/master' into HEAD

8 years agops thread supportand 32/64 bit detection.
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)

8 years agoFix find bug reported by Tom Marshall, add test for it, and while we're at it
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).

8 years agoAdd "infrastructure in search of a user" to cleanup.html.
Rob Landley [Sun, 24 Apr 2016 19:30:31 +0000 (14:30 -0500)]
Add "infrastructure in search of a user" to cleanup.html.