Commit graph

517 commits

Author SHA1 Message Date
Chih-Hung Hsieh
c713bce901 Fix misc-macro-parentheses warnings in init and other core modules.
Bug: 28705665
Change-Id: Ice67cebb8c42538f8fb9cf1756678f41a9d68a31
2016-05-18 18:11:49 -07:00
Elliott Hughes
eea3c0e601 Lose ps to toybox.
Change-Id: I890a453533e1b3066169738f55314f8813285c17
2016-05-04 15:20:02 -07:00
Elliott Hughes
defd249d3d toolbox ps: replace strcpy with snprintf.
Change-Id: I0fdf9a8d5ab15bcff06cca3f3e7024ab76b219d9
2016-04-29 22:10:40 -07:00
Treehugger Robot
2123c6fc30 Merge "Add empty <util.h> to build BSD source." 2016-04-29 19:46:43 +00:00
Elliott Hughes
36abd48c6a Add empty <util.h> to build BSD source.
Hopefully this will let us remove the empty file from bionic. It shouldn't
be there because -- unlike BSD -- we don't actually have a libutil.

Change-Id: I7e3042ca120aafa877709797866b52ac62675870
2016-04-29 11:53:29 -07:00
Jorge Lucangeli Obes
5c1b3afbd4 Fix 'ps.c' formatting.
Insert a space between 'if'/'while' and their clause.
Also insert a space after ',' for arguments.

This was done with clang-format.

Bug: None

Change-Id: I5315eba3d5d8ac68996a373dc7c8e1bc45165824
2016-04-25 16:31:15 -07:00
Jorge Lucangeli Obes
c5e7f73bc6 Fix 'ps --ppid'.
Currently, 'ps' will segfault when called with '--ppid' and no argument.
Make it return an error instead.

Bug: 28383024

Change-Id: I71f2d1ba9502996ae75b17605234eb99ebb589f2
2016-04-25 15:54:12 -07:00
Elliott Hughes
72886ce0af Remove toolbox iftop.
It's nothing like the real iftop, and there's no evidence anyone uses it.
In particular, it hasn't been touched since it was first checked in, back
in 2008. So it's either perfect or unused. Let's find out...

Change-Id: I941adbb67f0166b9b3bd796291060bd67eafa867
2016-04-16 09:08:05 -07:00
Elliott Hughes
22b3567e88 Fix toolbox failure return to match similar tools.
Bug: https://code.google.com/p/android/issues/detail?id=182226
Change-Id: Ib05709b8f9b474d5989b69abd949a6dc661af998
2016-04-12 08:40:43 -07:00
Elliott Hughes
ad2c07e4b5 Clean up toolbox runner slightly.
Remove the weird @command syntax, and make toolbox itself list the available
commands, like toybox does. Also stop special-casing toolbox itself.

Change-Id: I77dfaaf0cf42e375d866b77362dd8afa717fb2e1
2016-04-11 17:45:49 -07:00
George Burgess IV
2c5b89a64a Merge "Cleanup uses of sprintf so we can deprecate it." 2016-03-08 04:14:06 +00:00
George Burgess IV
e7aa2b2c83 Cleanup uses of sprintf so we can deprecate it.
Also cleans up two instances of open() with useless mode params, and
changes a few uses of snprintf to use sizeof(buffer) instead of
hardcoded buffer sizes.

Change-Id: If11591003d910c995e72ad8f75afd072c255a3c5
2016-03-07 18:40:40 -08:00
Elliott Hughes
15ca17cabc Remove toolbox prlimit.
Use /system/bin/ulimit -p instead.

Change-Id: I4f2e2f2f2ac98de9ce57a7def3636669ea0034fe
2016-03-07 14:02:32 -08:00
Elliott Hughes
fd64c5d07e Make toolbox top a little more like everyone else's.
The use of PR to mean PSR rather than PR was confusing, so let's just
use PR and NI the same way everyone else does.

Also remove bogus blank lines and unnecessary delays (both before first
showing anything and after having shown the final iteration).

Bug: http://b/27447491
Change-Id: I676131956facf2167abb5d0852c55b0670b5eaa6
2016-03-02 07:49:03 -08:00
Bernhard Rosenkränzer
c434cf82d5 Allow building with Python 3.x
Allow the scripts to run with both python 2.x and 3.x

Change-Id: I911118bcf370d09bdb2fb46afa21af64257f1ffb
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2016-02-23 21:39:35 +00:00
Dimitry Ivanov
0bb350a04c Add missing liblog dependency
Bug: http://b/27171986
Change-Id: I43fe595c05f5584e76d0359c42c8dc006bd3f5c5
2016-02-12 16:39:09 -08:00
Elliott Hughes
bd02a47b22 Fix generation of event labels for getevent.
The recent uapi header update moved all the interesting constants
out into another file. Track that, and add the missing makefile
dependency.

Bug: http://b/27073568
Change-Id: I8ac1dd1122865479f69a76cbf427d4aacdf7b790
2016-02-08 14:56:03 -08:00
Christopher Ferris
78e08066f2 Always have ps output to stdout at least one line.
There is at least one app that assumes that you will always get at least
one line of output in stdout from ps.

To fix this, move error output to stdout, and move the check of whether
/proc can be opened until after the ps header is printed.

Bug: 26554285
Change-Id: I6d9342aafd5c6f728735507cdd87a48a8e0373ac
2016-01-28 16:08:08 -08:00
Phani (Gargey) Avadhanam
6268d4c057 Toolbox: |ps -t| now correctly displays the USER for threads
use tid to display thread information

Bug: https://code.google.com/p/android/issues/detail?id=198564
Bug: http://b/26470660
Signed-off-by: "Phani (Gargey) Avadhanam" <pgargey@codeaurora.org>
Change-Id: Ife8ce59d7b6eb6906ab39acebea18c7aee50339a
2016-01-12 15:06:09 -08:00
Elliott Hughes
d7bd5759d2 Improve top(1) compatibility and interactive usefulness.
The toolbox -t option is really the standard -H option. Add -H so
I can switch dumpstate over.

We should also flush after each run so we don't arbitrarily truncate
at the stdio buffer size. (I'm pretty sure no one uses toolbox top
interactively, but it annoyed me while testing -H.)

Change-Id: Ib87cb541d1b21c48468614b2ef60b0cc62694c95
2015-11-13 08:30:12 -08:00
Elliott Hughes
d2e26c0e30 Fix ps -Z so it combines with other arguments.
This is another step towards being able to swap toolbox ps out for
a more complete ps. This should also let us fix dumpstate to not
need a separate "ps -Z" run --- we can just add -Z to the previous
run of ps instead.

Change-Id: I0b96dff51988edd2b33879f8c31faccebeeffddd
2015-10-30 15:16:45 -07:00
Elliott Hughes
5dc119a67b Remove the name filtering from toolbox ps.
Regular ps doesn't have this, and at least in our tree everyone
seems to actually pipe to grep instead of using this anyway. But
since the switch to a more full-featured ps is going to be a nightmare
anyway, let's dip a toe in the water by removing something we don't plan
on supporting.

Change-Id: Id220ae0cfdad8368341730f643a2bfbaad3c9716
2015-10-30 15:03:30 -07:00
Elliott Hughes
cca6019108 Lose df to toybox.
Change-Id: I4c8e6c1071779914969cc7f5a80fe6248b508405
2015-10-23 11:09:53 -07:00
Elliott Hughes
5cf29bc9f9 Lose du to toybox.
Change-Id: Ib240f74990274027258a454d3c63202791fcdb0b
2015-09-14 10:37:52 -07:00
Elliott Hughes
42325f073c Lose lsof to toybox.
Change-Id: I4b5e0c8c33f5b2dfd3db85628d9a657940978a10
2015-09-11 10:58:21 -07:00
Elliott Hughes
ce98fc40fd Merge "Lose ls to toybox." 2015-09-03 20:58:58 +00:00
Elliott Hughes
e66be4dd76 Lose ls to toybox.
Bug: http://b/23040458
Change-Id: I0e9f89b1169df409a38a2134ac2cb9edd0421be3
2015-08-31 12:45:47 -07:00
Elliott Hughes
1498261fc5 Merge "Lose uptime to toybox." 2015-08-31 18:48:31 +00:00
Elliott Hughes
703a3f1d07 lsof fixes.
Change-Id: Ie3befc7c8e3540b9ebe93786e711f8445cf6f6c7
2015-08-24 17:21:31 -07:00
Elliott Hughes
49ef9c0fc0 Lose uptime to toybox.
Let's see if anyone actually needs the non-POSIX information...

Change-Id: I0bb63b3a81f6295d281a661bd941a26fef675598
2015-08-17 10:49:42 -07:00
Elliott Hughes
17ddfcb282 Lose ionice and renice to toybox.
Change-Id: I77264e70aeff5a2320ce178c8e7176b67b898bd9
2015-08-14 15:35:33 -07:00
Elliott Hughes
e8606c85c5 Remove watchprops.
Since watchprops would have to be rewritten anyway in the upcoming properties
rewrite, there seems little point in rewriting it for toybox first. Let's
see how many people actually use watchprops and decide whether it's worth
the effort...

Change-Id: I996e7209bc81633ee66602f09f130226336d9987
2015-08-10 19:27:18 -07:00
Andreas Gampe
3294ad163f Toolbox: Disable unused-const-variable warning
For build-system CFLAGS clean-up, disable unused-const-variable
warning.

Bug: 18632512
Change-Id: I1be1ac744f8c77bd0a8378578072285a2c035245
2015-07-30 11:52:11 -07:00
Elliott Hughes
24d41e76e7 Switch to toybox mount(1).
Change-Id: Ieda6e2bfbf5ea3e9a96f5facfded4c2a467e4a02
2015-06-08 14:52:25 -07:00
Elliott Hughes
6e83c3d76d Make start/stop warn if you're not root.
Bug: https://code.google.com/p/android/issues/detail?id=165602
Change-Id: Ia1e2de1697d971381b0c949fdaaeff424ab8bf32
2015-06-05 17:01:01 -07:00
Elliott Hughes
88f0f4b2b4 Revert "Switch to toybox ls."
This reverts commit 9c94aa9982.

Change-Id: Ie2479ee4a0614e285ce8d57c727200a0381904e2
2015-05-16 06:28:10 +00:00
Elliott Hughes
9c94aa9982 Switch to toybox ls.
Bug: http://b/21171466
Change-Id: I3fa09db7ca43d337cbda60f10269e7607544982b
2015-05-15 16:54:35 -07:00
Elliott Hughes
5976018b4a Improve toolbox SIGPIPE behavior.
None of our tools -- except for top, which I'd fixed previously --
handles SIGPIE correctly. Let's just handle SIGPIPE in the driver.

Bug: https://code.google.com/p/android/issues/detail?id=157920
Change-Id: I322ea411f53c71585a64118c217d54389f675d4e
2015-04-25 12:03:41 -07:00
Elliott Hughes
cf5f9b99cb Move ls implementation detail into ls.
Also remove the unused generality, and remove a dependency on a linux/
header file when there's a sys/ one that's even better.

Change-Id: If07608cc9ae2b7c2928ee2a9e33d20d63a9a8f45
2015-04-08 11:38:16 -07:00
Elliott Hughes
5b50fc3d3a Lose getprop to toybox.
Change-Id: I5188dbcc7e248b2fabade2d8d137610b4adb3164
2015-04-07 22:32:49 -07:00
Elliott Hughes
3da8e5ea97 Lose setprop to toybox.
Change-Id: Ic0fd9cfb70e117067f4ebc5e120dea4b5fe1d883
2015-04-07 15:59:07 -07:00
Elliott Hughes
877dfc2896 Lose restorecon to toybox.
Change-Id: I5460f46700011b7733a1d87a9049e828531627be
2015-04-07 14:45:07 -07:00
Elliott Hughes
17cb719e10 Lose umount to toybox.
Change-Id: Ide35731c37d70ccb38a5e84b7310434ce6c3aa6e
2015-04-02 21:24:34 -07:00
Elliott Hughes
bcc2b5f44a Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.
Change-Id: I720b8ef1050da45a7833adef8219b6acb2cf3a38
2015-04-02 14:31:07 -07:00
Chris Fries
4868b07931 toolbox: ioctl: fix signedness on ioctl_nr
ioctl_nr is passed signed to the kernel, but many users refer
to ioctl's in unsigned 32 bit notation.

Let's use stroll to set it, to let people specify either
negative numbers or large positive numbers.

Also improve error reporting.

Reported-By: Alex Piliev <ktnr74@motorola.com>
Change-Id: I789434895b70b051d4d5c1a5db566a1925478ef0
2015-04-01 15:46:20 -07:00
Elliott Hughes
798ec0c39d Lose route to toybox.
Change-Id: If68fa6a691478921452ebd785bd35e3ba5a8470a
2015-03-30 11:23:44 -07:00
Johan Redestig
c06541912d toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
ioctl(BLKGETSIZE) expects unsigned long
(8 bytes on 64 bit environment).

Change-Id: Ic0f1d48e1d4cb890dbf617b3eb6285425cdbf0d0
2015-03-30 10:17:29 -07:00
Elliott Hughes
f29940559a Lose load_policy to toybox.
Change-Id: I3ef3aab9eef8e07ee598e2559a316e2fccf7199b
2015-03-28 13:29:05 -07:00
Elliott Hughes
608fb70dd8 $ANDROID_BUILD_TOP isn't set for continuous builds.
Instead, take advantage of the fact that we'll be run from the root of the
tree.

Change-Id: I5ce6d1c9ae8d478748ab90c9d3cc8e665ae5859b
2015-03-25 21:18:43 -07:00
Elliott Hughes
c7f3c5c10c Auto-generate the getevent labels from <linux/input.h>.
Now we only have to remember to update the kernel uapi headers, which
we're pretty good at.

Change-Id: If04eb8c50882fff5e5e2a5d72664f5d4c4c538b1
2015-03-25 17:34:22 -07:00