Elliott Hughes
3215ed4228
am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
...
* commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a':
Remove obsolete 'setconsole' command.
2014-01-17 01:06:44 +00:00
Elliott Hughes
c1e91b0034
Remove obsolete 'setconsole' command.
...
Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
2014-01-16 14:50:23 -08:00
Elliott Hughes
b70375abc2
resolved conflicts for merge of ec9e5891 to master
...
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
2014-01-16 14:42:35 -08:00
Elliott Hughes
ccecf14254
system/core 64-bit cleanup.
...
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.
Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
2014-01-16 12:54:18 -08:00
Benoit Goby
f922380f9a
am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
...
* commit '58c4a7ddf227bd6977677f4c8046eab6376477b3':
toolbox: Fix date tool with /dev/alarm
2014-01-10 03:43:29 +00:00
Benoit Goby
d340734cd7
toolbox: Fix date tool with /dev/alarm
...
Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210
Signed-off-by: Benoit Goby <benoit@android.com>
2014-01-09 18:59:23 -08:00
Elliott Hughes
ebf1b66c81
am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."
...
* commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd':
SWAP_FLAG_* constants are now in <sys/swap.h>.
2014-01-08 02:48:40 +00:00
Elliott Hughes
bfa7d0822b
SWAP_FLAG_* constants are now in <sys/swap.h>.
...
Bug: 9336527
Change-Id: I77e2b05cefbfb4eebda39b4079107833f4160563
2014-01-07 18:20:17 -08:00
Nick Kralevich
d09eee892f
am 05bfe7fb: am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
...
* commit '05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c':
toolbox-ls: re-introduce clobbered error message
2014-01-03 05:50:02 +00:00
William Roberts
ded3464a10
toolbox-ls: re-introduce clobbered error message
...
commit 403b1955 clobbered the error message on lstat()
calls.
Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
2014-01-03 02:52:34 +00:00
Greg Hackmann
2f77ecb813
am 796be8f1: am b1a82bcb: am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"
...
* commit '796be8f1432fd02d83f2dae9dbcf11a0976df3b5':
toolbox: date: use RTC subsystem on devices without /dev/alarm
2013-12-18 00:35:07 +00:00
Greg Hackmann
ec5b104ca2
am 619376f4: am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
...
* commit '619376f41fb93ceb9fa634e9ddc561b90be01e23':
toolbox: date: fix parameter type warnings
2013-12-18 00:31:33 +00:00
Greg Hackmann
821ac10bdc
am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
...
* commit '07dbb562a848af658f65cd41864f31aab5f4b955':
toolbox: uptime: use clock_gettime() on devices without /dev/alarm
2013-12-18 00:31:32 +00:00
Greg Hackmann
3fd9ca979a
am e75af574: am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
...
* commit 'e75af5745440eb70d1f5682168edb84eaa631982':
toolbox: uptime: fix unused parameter warnings
2013-12-18 00:31:31 +00:00
Greg Hackmann
4a7bc60071
toolbox: date: use RTC subsystem on devices without /dev/alarm
...
Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann
c057503aaf
toolbox: date: fix parameter type warnings
...
Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann
fa66f1e494
toolbox: uptime: use clock_gettime() on devices without /dev/alarm
...
Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann
7f625ed026
toolbox: uptime: fix unused parameter warnings
...
Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Nick Kralevich
2f06ba6122
am bfb1d8a2: am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."
...
* commit 'bfb1d8a27532180dd08fc48190aed464abbdd8b8':
Minor cleanups.
2013-12-11 23:05:12 +00:00
Sasha Levitskiy
1dd77487ab
Merge "Getevent: make sure the monotonic timestamp is displayed; warning cleanup."
2013-12-11 02:43:08 +00:00
Sasha Levitskiy
2037a307a4
Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
...
Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2013-12-10 08:53:21 -08:00
Nick Kralevich
f374fb84af
am 5e362c87: am 71e096c8: Merge "Increase buffer size, use bounds checking functions"
...
* commit '5e362c871a7b79b12e91a8737606988163f84dcf':
Increase buffer size, use bounds checking functions
2013-12-02 23:31:11 +00:00
Nick Kralevich
8dfdf650ab
Minor cleanups.
...
Use ssize_t for handling the result of a readlink call.
Fix the following compiler warning:
system/core/toolbox/ls.c: In function 'listfile_maclabel':
system/core/toolbox/ls.c:238:68: warning: unused parameter 'flags' [-Wunused-parameter]
static int listfile_maclabel(const char *path, struct stat *s, int flags)
Change-Id: Idd65f3349fb9dfb6f7a374c81f72d3169af33505
2013-11-27 16:12:48 -08:00
Nick Kralevich
4ec2910fb6
Increase buffer size, use bounds checking functions
...
Increase the size of the user/group buffer from 16 bytes
to 32 bytes. Some OEMs are creating usernames longer than
15 bytes, causing problems.
Use bounds checking functions when handling user/group
data, to avoid overflowing buffers.
Change-Id: I4a5824b819b0c37662ba4f33573af0d0e071b444
2013-11-27 15:47:16 -08:00
The Android Open Source Project
66ed50af68
Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
...
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
2013-11-22 13:44:43 -08:00
Elliott Hughes
230e98bfea
am 36ff3bd2: am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers."
...
* commit '36ff3bd273d9f60822104eb53f3aa1886160b360':
Fix nandread to build with old or uapi headers.
2013-11-11 20:52:05 -08:00
Elliott Hughes
36ff3bd273
am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers."
...
* commit 'e8c6d15b1892ffd09dae8ac7922854140a11130d':
Fix nandread to build with old or uapi headers.
2013-11-11 16:33:30 -08:00
Elliott Hughes
b05a2e5130
Fix nandread to build with old or uapi headers.
...
Bug: 11559337
Change-Id: I9795a16649dafdfe3df150170265157170cd5a79
2013-11-11 16:17:49 -08:00
Marco Nelissen
377cb2ab3a
Add -n option to ps to print numeric uid
...
and fix some whitespace issues
Change-Id: Iefb6f51f5f4522ce4ab0f1ea3c996fe892715e90
2013-10-25 08:15:42 -07:00
Scott Anderson
9e97fee019
Enhance the ioctl toolbox command
...
1) Implement documented but unimplemented read-only option.
2) Allow standard input to be used as the <device> by passing
"-". On some devices, opening the device has side effects.
Allowing standard input can prevent this by using a sequence
of something like:
# Open the device on file descriptor 3
exec 3<> /dev/something
ioctl -d - 0 0 <&3
ioctl -d - 1 0 <&3
dd if=myfile >&3
# Close file descriptor 3
exec 3>&-
Change-Id: If17ac3cffa7ccb159051550724b4ce7d8efa5feb
Signed-off-by: Scott Anderson <saa@android.com>
2013-10-17 17:20:37 -07:00
Glenn Kasten
3707e7ff03
toolbox: Add nohup command
...
Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-09-23 15:37:55 -07:00
Michael Wright
1e1d29133f
Add standard options to readlink
...
Change-Id: I4c2624d22ce879a3578d5b17440a9895b19e2f1f
2013-08-22 16:38:08 -07:00
Michael Wright
9f50abdee0
Add basic readlink command
...
Change-Id: I693c1098e6c6d107a9e97285bf826ab153a1c8f0
2013-08-19 16:31:35 -07:00
Colin Cross
9227bd3855
Move liblog headers to system/core/include/log
...
Move the liblog headers to log/ instead of cutils/ to complete
the separation of libcutils and liblog. cutils/log.h still
exists and includes log/log.h in order to support the many existing
modules that use cutils/log.h.
Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
2013-07-24 12:32:39 -07:00
Rom Lemarchand
fb3280886d
Merge "toolbox: swap utils"
2013-07-02 02:07:10 +00:00
Ken Sumrall
cf0b4d94fa
Merge "Do not exit early on errors when -f is specified"
2013-06-28 02:47:01 +00:00
Ken Sumrall
3b2b2b5137
Merge "Update the touch command to take a human readable timestamp"
2013-06-28 02:46:09 +00:00
Ken Sumrall
0354829763
Do not exit early on errors when -f is specified
...
When running with the -f option, do not stop recursion or proccessing
command line args if an error occurs. Continue trying to remove all
the items specified on the command line. However, still return an
error status if some files could not be removed.
Change-Id: I83d66babe833da8a68aad68248647ba0601c5d32
2013-06-26 17:42:38 -07:00
Ken Sumrall
13495a1cbb
Update the touch command to take a human readable timestamp
...
Now the -t option to the toolbox touch command takes a timestamp
in the form of YYYYMMDD.hhmmss
Change-Id: I3812700edaa1a06590a07c15b050721b49e9b7e0
2013-06-26 17:42:25 -07:00
Rom Lemarchand
367297c3d7
toolbox: swap utils
...
Add swap utilities (mkswap, swapon, swapoff) to the toolbox
Change-Id: If5ed6981670a1cdda6b528b587dbc1be7ccdf832
Signed-off-by: Rom Lemarchand <romlem@google.com>
2013-06-25 13:21:53 -07:00
Colin Cross
a44c31cc91
am e755dfd4: Merge changes I1db3137b,I0f66144e
...
* commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2':
toolbox: reimplement watchprops using __system_property_foreach()
libcutils: reimplement property_list() using __system_property_foreach()
2013-06-19 10:33:42 -07:00
Greg Hackmann
68e9b6bc94
toolbox: reimplement watchprops using __system_property_foreach()
...
Internally, replace the watchlist array with a hashmap since the array
assumes properties are enumerated in a consistent order and foreach()
probably won't. (find_nth() never guaranteed this either but it usually
worked in practice.)
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit 389e358017 )
Change-Id: I1db3137b130474f4bb205f01f0bdcf37cf974764
2013-06-18 19:26:28 -07:00
Greg Hackmann
389e358017
toolbox: reimplement watchprops using __system_property_foreach()
...
Internally, replace the watchlist array with a hashmap since the array
assumes properties are enumerated in a consistent order and foreach()
probably won't. (find_nth() never guaranteed this either but it usually
worked in practice.)
Change-Id: I83843facdd671edd09652edf472e88ec3d1edd3b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-06-18 16:37:54 -07:00
Colin Cross
99c1a4168b
resolved conflicts for merge of 95a41f6b to stage-aosp-master
...
Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
2013-06-17 18:19:28 -07:00
Colin Cross
8196316411
toolbox: hide property implementation from watchprops
...
(cherry picked from commit 91779634de )
Change-Id: I7a2d8aa507ac61cedc5f67c563531a7d4ec8e4c2
2013-06-17 16:58:09 -07:00
Colin Cross
91779634de
toolbox: hide property implementation from watchprops
...
Change-Id: Ia6609116d641d3354971ca40a16ffcab38484150
2013-06-17 13:13:40 -07:00
Brian Carlstrom
89c2be335d
am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"
...
* commit '603746f0e3b645954f33be36f7602cc8205cb71c':
Fixed reversed output in netstat Recv-Q Send-Q columns
2013-06-04 11:17:19 -07:00
Brian Carlstrom
603746f0e3
am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"
...
* commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071':
Fixed reversed output in netstat Recv-Q Send-Q columns
2013-06-04 10:28:55 -07:00
Brian Carlstrom
3c412f6260
Fixed reversed output in netstat Recv-Q Send-Q columns
...
Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
2013-06-03 19:24:44 -07:00
Nick Kralevich
29393d69b3
fix another misuse of strncat
...
This has the potential to overflow "buffer" if the command line
is more than 4K.
Change-Id: Icdfed0d9d21804f290b75787ef3809e0475b14f0
2013-06-03 13:40:11 -07:00