Commit graph

501 commits

Author SHA1 Message Date
Elliott Hughes
b71e897003 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

(cherry picked from commit bd02a47b22)

Change-Id: I9323a995511b12905949cba22c59cc28623068f3
2016-02-09 11:24:42 -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
Elliott Hughes
addb229c72 Lose runcon to toybox.
Change-Id: I0fa4a1907a9def4ba7dc1348f57299cd578fdf87
2015-03-23 17:55:23 -07:00
Elliott Hughes
12235947eb Remove /dev/alarm cruft from uptime.
Our uptime is very different from the regular one, and usefully so, so
this code will live on. Remove dead bits.

Also fix the annoying "1 days" bug while I'm here.

Change-Id: Ied5403ba96dcc5eddd4d386b59c6fcdea3209881
2015-03-20 11:14:50 -07:00
Elliott Hughes
031fa81b2d Remove schedtop.
This seems to have only been used before we had top(1).

Change-Id: I6c3e5dad19754cf00a07161d2b93093dc0fe7c08
2015-03-19 13:53:59 -07:00
Elliott Hughes
1b9cc5b2e1 Remove obsolete smd tool.
It's basically "echo" with a redirect, and it hasn't been touched since
cupcake. Could be replaced with a shell script if need be.

Change-Id: I75b663ea4be3d7cd9581faa6ef3979de28e68dfb
2015-03-16 13:47:14 -07:00
Stephen Smalley
d4b2d8923f Remove getsebool/setsebool from init and toolbox.
These were leftovers from the SELinux boolean support that
was originally merged.  Since Android prohibits SELinux policy
booleans, we can just drop it.

Change-Id: I02f646a7d8db65e153702205b082b87a73f60d73
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:01:58 -04:00
Elliott Hughes
1f90933450 am ed5b81c9: Merge "Fix LP32 build."
* commit 'ed5b81c9e59c0a6c618f43964a4a2639448c0686':
  Fix LP32 build.
2015-03-10 15:03:41 +00:00
Elliott Hughes
8576aa055c am 9cce837d: Merge "Increase output width for wchan and pc on 64 bit targets."
* commit '9cce837d025d05a07a3b91cf23337a7b688c3eb9':
  Increase output width for wchan and pc on 64 bit targets.
2015-03-10 15:03:40 +00:00
Elliott Hughes
8ac94d3a54 Fix LP32 build.
Change-Id: I66e084330e7a32eac639d06187e780ffa0ad7b14
2015-03-09 21:10:10 -07:00
Chris Dearman
08b3466bc2 Increase output width for wchan and pc on 64 bit targets.
Also switch wchan to the textual form, since most of us
don't know kernel addresses off by heart.

Change-Id: I8e28d910034d8171c5b994189b16114f80f38d2f
2015-03-09 20:26:10 -07:00
Elliott Hughes
965ec3e1d7 am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."
* commit '6385d626a585017ec1fe4027f4faa79741f9d117':
  Remove toolbox's obsolete 'wipe' command.
2015-03-07 19:24:25 +00:00
Elliott Hughes
bfa9d6a3c4 Remove toolbox's obsolete 'wipe' command.
It hasn't worked in some time (it removes /data/dalvik-cache, which is
required by art), and if you're prepared to reboot (to let init put back
all the directories a working system needs) there are other ways to wipe
data (such as "fastboot format userdata reboot").

Bug: 19644330
Change-Id: Ib074ea21cc28409a506d66d75060bb4ad85539e2
2015-03-07 11:07:10 -08:00
Elliott Hughes
daef336718 am 830914a4: Merge "Lose touch to toybox."
* commit '830914a4b6c42d04004e2ec3ff38823f6be8c23f':
  Lose touch to toybox.
2015-02-10 16:52:50 +00:00
Elliott Hughes
c6fa276515 Lose touch to toybox.
Change-Id: Id9646ff10870425fc4013aab6621a5f6a0c6e98e
2015-02-09 14:10:44 -08:00
Elliott Hughes
05d8a22c2d am 051f369a: Merge "Build BSD grep separately from toolbox."
* commit '051f369a14a405dc6dbaf708dc51a21c5629bf88':
  Build BSD grep separately from toolbox.
2015-02-05 18:47:23 +00:00
Elliott Hughes
d20218e05d Build BSD grep separately from toolbox.
Also move the dd-only library code into the dd section (so a future
maintainer will know to keep/remove them as a block) and fix the one
build warning remaining.

Change-Id: Ibf6b28ef05e4cbb70b9308b0f4387f5af5b7fa94
2015-02-04 18:50:14 -08:00
Elliott Hughes
3a8064c5cf am 0114e124: Merge "Add ps --ppid."
* commit '0114e1243ad25cbb43dec33a3b0b267fe624fbfe':
  Add ps --ppid.
2015-01-30 04:17:01 +00:00