tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
72790 commits 1 branch 0 tags 215 MiB
Commit graph

591 commits

Author SHA1 Message Date
Elliott Hughes
402f7e97d5 Lose nohup to toybox. 
Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
 2014-11-25 16:58:53 -08:00
Elliott Hughes
8e8cd0cf7a Lose dmesg to toybox. 
Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
 2014-11-25 16:23:15 -08:00
Elliott Hughes
8e76610cfc am 077ff309: Merge "Lose mkswap, swapoff, and swapon to toybox." 
* commit '077ff30954275e635c5faa8b75afcd0a44a78dcc':
  Lose mkswap, swapoff, and swapon to toybox.
 2014-11-25 19:03:59 +00:00
Elliott Hughes
4d7a262c63 am 75afd633: Merge "Lose printenv to toybox." 
* commit '75afd63340b2a19ff85e5a577a8a0bdd1ca46d26':
  Lose printenv to toybox.
 2014-11-25 19:03:43 +00:00
Elliott Hughes
45f296ec48 am bcece29c: Merge "Lose sleep to toybox." 
* commit 'bcece29c4438c6b92c973d30bc8a46331f16369f':
  Lose sleep to toybox.
 2014-11-25 19:03:35 +00:00
Elliott Hughes
f2f0b0fa69 am e494c513: Merge "Lose sync to toybox." 
* commit 'e494c513f919b405f92d3a3ebefa105a2482ec5b':
  Lose sync to toybox.
 2014-11-25 19:03:25 +00:00
Ying Wang
b14bc39b36 am 9f693b8f: Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks" 
* commit '9f693b8f1e97fd8977d66e3bf003d7b9460be0e7':
  Use LOCAL_POST_LINK_CMD to install toolbox symlinks
 2014-11-25 19:03:21 +00:00
Elliott Hughes
59acfee63f am f3c8eb83: Merge "Remove dead tools." 
* commit 'f3c8eb838db02a5fc215e178e4eb319831894d48':
  Remove dead tools.
 2014-11-25 19:03:20 +00:00
Elliott Hughes
a0959e90f5 am 8eb770d3: Merge "Remove long-dead readtty." 
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
  Remove long-dead readtty.
 2014-11-25 19:03:12 +00:00
Elliott Hughes
0c0ab6bb06 resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aosp 
Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b
 2014-11-25 11:00:41 -08:00
Elliott Hughes
7376cef149 Lose mkswap, swapoff, and swapon to toybox. 
Change-Id: Iedb371ad0f1f74822b3ff4bc1b7b1f9e6ecd300d
 2014-11-24 16:13:03 -08:00
Elliott Hughes
64d2944674 Lose printenv to toybox. 
Change-Id: Icdc6766a7ef853bc846fe811fa2ad2284ed8a18f
 2014-11-24 15:32:51 -08:00
Elliott Hughes
493faf525c Lose sleep to toybox. 
No pun intended.

Change-Id: Ic1d9c8fa9719a7749b4eeaeac20df313600c0b88
 2014-11-24 15:22:22 -08:00
Elliott Hughes
47b3f9e29d Lose sync to toybox. 
Change-Id: I36c98135bb4ab1e2ca7137b7a83782fce5ac683a
 2014-11-24 14:53:09 -08:00
Ying Wang
9f693b8f1e Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks" 2014-11-24 22:17:57 +00:00
Ying Wang
7d45be0e4a Use LOCAL_POST_LINK_CMD to install toolbox symlinks 
It's simpler; Also whenever toolbox is updated the symlinks get
recreated.

Change-Id: I03fb61a5e0f14fd4ed23680dd6db87eed5b46787
 2014-11-24 14:09:24 -08:00
Elliott Hughes
3024977037 Remove dead tools. 
These have all been obsolete since we first moved to git!

Change-Id: Ie5bfc1b30000930ef6a604b4313ff7af1b7c4573
 2014-11-24 14:03:28 -08:00
Elliott Hughes
8eb770d37c Merge "Remove long-dead readtty." 2014-11-24 21:43:32 +00:00
Elliott Hughes
b120134bd1 Remove long-dead readtty. 
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
 2014-11-24 12:01:21 -08:00
Elliott Hughes
b054178a15 Lose insmod/lsmod/rmmod to toybox. 
Change-Id: Ia654cdca14a4fda958a406f5e6ccd0919ce88a8f
 2014-11-24 11:34:14 -08:00
Elliott Hughes
3d5b5162e3 am 7f187c5f: Merge "Lose clear, false, and true to toybox." 
* commit '7f187c5f95d6bf0514e71e0e074768bd5395d45f':
  Lose clear, false, and true to toybox.
 2014-11-23 18:10:39 +00:00
Elliott Hughes
ed7959fe62 Lose clear, false, and true to toybox. 
Change-Id: I125ea881e61b834b188d9a5411f3b6efe59b9bad
 2014-11-22 22:58:42 -08:00
Elliott Hughes
b0669f5aa2 am caed3d9f: Merge "notify: dynamically allocate filename buffer" 
* commit 'caed3d9fae1fd372dfa01cb60fbf157233c9052e':
  notify: dynamically allocate filename buffer
 2014-11-21 20:25:58 +00:00
Johan Redestig
80bf9a456e notify: dynamically allocate filename buffer 
use asprintf to dynamically allocate filename buffer
rather than just reserving 512 bytes on the stack to
avoid potential overflow.

Change-Id: Ieeb9c6c2e5f97a9574f8128d84eba0b8efdb7263
 2014-11-20 15:25:18 +01:00
Elliott Hughes
450c4ad097 am 16068830: Merge "toolbox: enable mkswap to work on block devices" 
* commit '16068830444361ab65cbc9804b76e2d415aff9a2':
  toolbox: enable mkswap to work on block devices
 2014-11-18 19:19:49 +00:00
Andrew Boie
d90615cefd toolbox: enable mkswap to work on block devices 
Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2014-11-18 10:42:14 -08:00
Elliott Hughes
23ac318d56 am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed" 
* commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca':
  toolbox: indicate why swap{on|off} failed
 2014-11-18 18:06:06 +00:00
Elliott Hughes
91cb2cb341 Merge "toolbox: indicate why swap{on|off} failed" 2014-11-18 17:57:59 +00:00
Dmitriy Ivanov
e4d7eaab97 am 359d58dc: resolved conflicts for merge of cb8c583d to stage-aosp-master 
* commit '359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5':
  Fix ps <process name>
 2014-11-03 17:38:04 +00:00
Dmitriy Ivanov
359d58dc0f resolved conflicts for merge of cb8c583d to stage-aosp-master 
Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
 2014-11-03 09:27:47 -08:00
Dmitriy Ivanov
65267bcc27 Fix ps <process name> 
Use /proc/pid/cmdline instead of /proc/pid/stat
 to filter process by name.

Bug: 8638853
Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
 2014-11-03 01:28:31 -08:00
Iliyan Malchev
343e66d6e0 toolbox: add prlimit command 
automerge: 5b244cd

* commit '5b244cd4141d7e42bf9382e39c669e1ccf96266c':
  toolbox: add prlimit command
 2014-10-28 00:25:18 +00:00
Iliyan Malchev
5b244cd414 toolbox: add prlimit command 
adb shell prlimit <pid> <cur> <max>

prlimit uses prlimit internally to allow you to set the limits on an arbitrary
process, if you have the privileges to.

Change-Id: Ie9a5dc510c7c695debd8f948361d4c51befa5604
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2014-10-27 12:25:41 -07:00
Daniel Rosenberg
9011c1bc7a am 86b4dba9: am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once 
* commit '86b4dba9c48841659c566ac71a034230f02ec259':
  newfs_msdos: Set sectors per fat once
 2014-10-11 04:55:01 +00:00
Daniel Rosenberg
86b4dba9c4 am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once 
* commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179':
  newfs_msdos: Set sectors per fat once
 2014-10-11 02:49:40 +00:00
Daniel Rosenberg
8bdcc99d60 am 8218b6aa: newfs_msdos: Set sectors per fat once 
* commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447':
  newfs_msdos: Set sectors per fat once
 2014-10-10 23:38:45 +00:00
Daniel Rosenberg
8218b6aae9 newfs_msdos: Set sectors per fat once 
There was an issue causing the fat size to shrink too small, causing
a fsck check to fail.

Bug: 17949028
Bug: 17761281
Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-10-10 14:40:48 -07:00
Elliott Hughes
28a78a25cf am f7c287b7: am 47d24416: Merge "Fix top for very large VSS." 
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
  Fix top for very large VSS.
 2014-10-08 18:30:26 +00:00
Elliott Hughes
5c9d4227fe am f7c287b7: am 47d24416: Merge "Fix top for very large VSS." 
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
  Fix top for very large VSS.
 2014-10-08 18:29:57 +00:00
Elliott Hughes
2c05b4fe41 Fix top for very large VSS. 
Bug: 17913995

(cherry picked from commit 052d78f334)

Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
 2014-10-08 11:21:23 -07:00
Elliott Hughes
052d78f334 Fix top for very large VSS. 
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
 2014-10-08 11:20:03 -07:00
Elliott Hughes
ddf510d478 am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message." 
* commit '85cac2abd416120646b0fe058aac812ca517d71b':
  Fix a typo in ioctl usage message.
 2014-10-06 17:20:55 +00:00
Elliott Hughes
eb7072a576 am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message." 
* commit '85cac2abd416120646b0fe058aac812ca517d71b':
  Fix a typo in ioctl usage message.
 2014-10-06 17:19:38 +00:00
Elliott Hughes
a0d61ba3e9 Fix a typo in ioctl usage message. 
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
 2014-10-06 10:09:25 -07:00
Elliott Hughes
4ac3d28dea am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now." 
* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
  bionic has O_RSYNC now.
 2014-09-24 05:08:59 +00:00
Elliott Hughes
45625ecc43 am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now." 
* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
  bionic has O_RSYNC now.
 2014-09-24 05:08:24 +00:00
Elliott Hughes
c2d9837c0e bionic has O_RSYNC now. 
Change-Id: Idad77b6ddc0abe270edff773bb0316d30b9f894d
 2014-09-23 20:12:05 -07:00
Elliott Hughes
e10d297e33 am 61b4b809: am d1d11fcb: Merge "Build the optional \'r\' tool separately." 
* commit '61b4b8095a4de1e4d8ea27f860c32ea345b37bfa':
  Build the optional 'r' tool separately.
 2014-08-29 16:41:04 +00:00
Elliott Hughes
660e750b12 Build the optional 'r' tool separately. 
You can't use $(TARGET_BUILD_VARIANT) to change how a module
is built like this makefile used to.

Change-Id: Ie6a274cab9a77eb2376a9494e9c17aae8ba0ee0b
Signed-off-by: Olivier Fourdan <olivier.fourdan@intel.com>
Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
 2014-08-28 20:44:20 -07:00
Elliott Hughes
2f26c56a49 am 619765d7: am 31e29dbe: Merge "Remove duplication from sendevent.c." 
* commit '619765d7364234f5f13c3e2a1d3094be6c6839aa':
  Remove duplication from sendevent.c.
 2014-08-26 16:13:02 +00:00
Elliott Hughes
8e947fe716 Remove duplication from sendevent.c. 
Change-Id: I402e68f843e9673e1c02e4f84f4832380c0e91ac
 2014-08-25 22:16:08 -07:00
Elliott Hughes
a024c2e770 am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)." 
* commit 'b48c46bcc2986ccb0a2bcac5549285537d8d9d1a':
  Add BSD false(1) and true(1).
 2014-08-24 08:57:39 +00:00
Elliott Hughes
50221f5837 Add BSD false(1) and true(1). 
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
 2014-08-22 20:26:23 -07:00
Elliott Hughes
c2e2e4271e am 70b5cb79: am c9343cfe: Merge "Refresh toolbox." 
* commit '70b5cb79486e2af9df2213b7305c4e0b5ee18dfd':
  Refresh toolbox.
 2014-07-25 18:50:46 +00:00
Elliott Hughes
7bb5660647 Refresh toolbox. 
Use more upstream NetBSD, and update those things that were already NetBSD.

Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.

Bug: 16493461

(cherry picked from commit fd4c6b0a3a)

Change-Id: I53267edaac0b92ad062a5df0f3201e3952eb084e
 2014-07-25 10:51:19 -07:00
Elliott Hughes
fd4c6b0a3a Refresh toolbox. 
Use more upstream NetBSD, and update those things that were already NetBSD.

Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.

Bug: 16493461
Change-Id: I99762bfe02caa0945ea4a184670888a4b5435a1d
 2014-07-24 17:20:51 -07:00
Elliott Hughes
82ad033562 am 04857219: am 2fd1fec6: Merge "Switch to NetBSD\'s kill(1)." 
* commit '04857219b2a28653aeed8e42891d995cd0d712f7':
  Switch to NetBSD's kill(1).
 2014-07-22 20:47:05 +00:00
Elliott Hughes
d40c7560e4 am 1ff2df3f: am 82a2687a: Merge "Fix cp(1) for files in /proc." 
* commit '1ff2df3f642018277066d73fcd57db08d41d387f':
  Fix cp(1) for files in /proc.
 2014-07-22 20:36:12 +00:00
Sreeram Ramachandran
c7e85bf5e3 am 1575e163: am 34627d82: Merge "Stop and start netd explicitly for "adb shell stop/start"." 
* commit '1575e1639c7c72f042fe20f0d862f53b55ded651':
  Stop and start netd explicitly for "adb shell stop/start".
 2014-07-22 20:09:20 +00:00
Elliott Hughes
2fd1fec619 Merge "Switch to NetBSD's kill(1)." 2014-07-22 16:25:43 +00:00
Elliott Hughes
5054c0db70 Switch to NetBSD's kill(1). 
Change-Id: Idd1635673e01758b5a7d34f1fdfbb695296c6164
 2014-07-22 10:46:15 -07:00
Elliott Hughes
82a2687a3c Merge "Fix cp(1) for files in /proc." 2014-07-22 16:18:32 +00:00
Elliott Hughes
1dc64f7a46 Fix cp(1) for files in /proc. 
Also modernize the Android-specific hacks.

Bug: https://code.google.com/p/android/issues/detail?id=70793
Change-Id: I2aebcd2ff10ca2466017379d87f5fabdb77c05e2
 2014-07-22 13:27:16 -07:00
Sreeram Ramachandran
435fe9bb02 Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE 
netd is supposed to be restarted when the zygote is restarted (see the
"onrestart" section for "service zygote" in init.zygote*.rc). But this
only works if you send a restart command (say via "ctl.restart").

"stop && start" != "restart". It seems ingrained in developers to do
"stop && start", so we don't have much hope of convincing everyone to
switch to "adb shell restart", even if we did add such a toolbox command.

(cherry picked from commit 018c6a57f3)

Bug: 15855807
Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
 2014-07-22 22:43:42 +00:00
Elliott Hughes
930d53eae6 Switch to NetBSD's kill(1). 
(cherry picked from commit 5054c0db70)

Change-Id: I7e1e311d8d8e43e4ee59119eef4eec13c552cae9
 2014-07-22 14:22:02 -07:00
Elliott Hughes
bb2e400ec7 Fix cp(1) for files in /proc. 
Also modernize the Android-specific hacks.

Bug: https://code.google.com/p/android/issues/detail?id=70793

(cherry picked from commit 1dc64f7a46)

Change-Id: Icacb20e735ec4ab3a93889f06a8d7b1a917f6b16
 2014-07-22 13:28:31 -07:00
Sreeram Ramachandran
018c6a57f3 Stop and start netd explicitly for "adb shell stop/start". 
netd is supposed to be restarted when the zygote is restarted (see the
"onrestart" section for "service zygote" in init.zygote*.rc). But this
only works if you send a restart command (say via "ctl.restart").

"stop && start" != "restart". It seems ingrained in developers to do
"stop && start", so we don't have much hope of convincing everyone to
switch to "adb shell restart", even if we did add such a toolbox command.

Bug: 15855807
Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
 2014-07-19 18:36:32 +00:00
Daniel Rosenberg
052f275621 newfs_msdos: Added option to cluster-align the start of the root directory 
This follows the recommendations of the SD-card association.

Change-Id: Ie89a5972d086b3df9d92e631c394a521f807b016
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-07-16 16:56:00 -07:00
Christopher Ferris
611dceecd5 am ce61f74f: am 56cbd19b: Merge "Fix build." 
* commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963':
  Fix build.
 2014-07-12 19:36:58 +00:00
Elliott Hughes
c785caa4b4 am 802943ab: am 8098114c: Merge "Sync with upstream grep." 
* commit '802943ab514de0814078b2e0a400d18632daa188':
  Sync with upstream grep.
 2014-07-12 19:36:58 +00:00
Elliott Hughes
3aad879660 am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing" 
* commit '895d67473854e89abf5834be66a79589de8c4b9e':
  fix duplicated grep usage printing
 2014-07-12 19:36:58 +00:00
Elliott Hughes
04650ef7f6 Sync with upstream grep. 
Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
 2014-07-10 19:38:01 -07:00
Rocky Zhang
b34b1fcb2b fix duplicated grep usage printing 
Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea
Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
 2014-07-11 09:49:35 +08:00
Christopher Ferris
3cbea9f056 Fix build. 
Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
 2014-07-10 23:12:49 -07:00
Daniel Rosenberg
33e7b13167 Made formatting for newfs_msdos.c more uniform 
Change-Id: I3d14350c70c05a7e2f713d0065524d78f9a413c6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-07-09 17:33:39 +00:00
Elliott Hughes
d2b82e3099 am f0c19562: am fdd4ffd1: am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c." 
* commit 'f0c195625b499257d8b957321b75b52aacac857e':
  Fix %llx to PRIx64 in nandread.c.
 2014-06-26 00:19:53 +00:00
Elliott Hughes
a5f28628b1 Fix %llx to PRIx64 in nandread.c. 
Change-Id: I541d1f4efac3c91d1a26f60735c72e799490fcc9
 2014-06-25 16:37:18 -07:00
Colin Cross
bb8aec4175 am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values" 
* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
  Use inet_ntoa to display ipaddr and mask values
 2014-06-19 00:57:07 +00:00
Bhanu Chetlapalli
9875ee97c7 Use inet_ntoa to display ipaddr and mask values 
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
 2014-06-18 17:24:04 -07:00
Kenny Root
7dfdb3c436 resolved conflicts for merge of 41b797de to master 
Change-Id: Id433da0bde006a6661431ee58a627497f07c7cdf
 2014-06-11 11:02:13 -07:00
Sujith Ramakrishnan
032d4e298b Add mknod utility to system/core/toolbox 
Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
 2014-06-11 11:10:28 -07:00
Sasha Levitskiy
140b13546a Getevent: make sure the monotonic timestamp is displayed; warning cleanup. 
Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2014-06-11 11:10:28 -07:00
Glenn Kasten
38e5f07c0f toolbox: Add nohup command 
Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2014-06-11 11:10:28 -07:00
Elliott Hughes
7fc47129cf Switch md5 over to openssl rather than libc. 
It doesn't make any sense for the C library to contain private stuff
that's only used by toolbox. Rather than move that stuff out of bionic
and into here, let's just use the same MD5 implementation the rest of
the system's using.

Change-Id: Ia1c73164124094b532af3453b90c4bd1ebfdaa24
 2014-06-09 16:10:42 -07:00
Elliott Hughes
6963176fb2 am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>." 
* commit '7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b':
  Remove unnecessary #includes of <sys/atomics.h>.
 2014-05-22 18:27:56 +00:00
Elliott Hughes
617681d355 Remove unnecessary #includes of <sys/atomics.h>. 
Bug: 14903517
Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
 2014-05-22 10:00:35 -07:00
Greg Hackmann
e12dd29755 am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build" 
* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
  toolbox: fix x86 build
 2014-05-21 18:20:55 +00:00
Greg Hackmann
4dc379b59b am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build" 
* commit '5d93823e557834c9b17771241ea6eecad74a5749':
  toolbox: fix build
 2014-05-21 18:10:38 +00:00
Greg Hackmann
2122aac5c9 toolbox: fix x86 build 
Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2014-05-21 11:04:32 -07:00
Greg Hackmann
eeed45fa24 toolbox: fix build 
Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2014-05-21 10:39:44 -07:00
Mark Salyzyn
6cd488e95a resolved conflicts for merge of faf84529 to master 
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
 2014-05-21 10:07:55 -07:00
Mark Salyzyn
36ccca155c Merge "toolbox: turn on -Werror" 2014-05-21 15:40:14 +00:00
Narayan Kamath
50415394c5 am b3bd09cd: am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well." 
* commit 'b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2':
  "stop" / "start must apply to the secondary zygote as well.
 2014-05-15 09:24:12 +00:00
Narayan Kamath
5f6beb12c1 Merge ""stop" / "start must apply to the secondary zygote as well." 2014-05-15 09:15:52 +00:00
Kenny Root
7c01585339 resolved conflicts for merge of 101e92ac to master 
Change-Id: I837bc0732c2e72d99ce47d0534915012ff43a21e
 2014-05-14 17:29:21 -07:00
Elliott Hughes
569e834602 am 7c633e6f: am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft." 
* commit '7c633e6fe6f69006ca4299a475230dd583da38f3':
  Clean up some unnecessary system_properties cruft.
 2014-05-15 00:08:58 +00:00
Kenny Root
d20ba7fca2 Merge "ps: add flag to show ABI" 2014-05-15 00:03:41 +00:00
Elliott Hughes
f94853f294 Clean up some unnecessary system_properties cruft. 
Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
 2014-05-14 16:51:09 -07:00
Kenny Root
8f197e6579 ps: add flag to show ABI 
Allow us to easily identify the 32/64 bitness of the process. Yes, I
know this is not technically an ABI, but it seemed close enough!

Change-Id: Ia03a17fd74d61e7619911cb26b3dd7d82b62930c
 2014-05-14 16:11:37 -07:00
Mark Salyzyn
aa907768af toolbox: turn on -Werror 
- Deal with some signedness issues
- Deal with some size issues
- Deal with NULL pointer issues
- Deal with some -Wunused issues

Change-Id: I1479dd90d690084491bae3475f2c547833519a57
 2014-05-14 12:41:24 -07:00
Narayan Kamath
22e22acbf0 "stop" / "start must apply to the secondary zygote as well. 
Would've been nice if we could use the sys property
observer to start and stop all services in a service
class but service classes do not appear to be fully
supported.

Change-Id: Iaf17a2dbcf913c4c646bc1e8e13adee9f952c45e
 2014-05-13 17:32:43 +01:00
Andrew Boie
c82b8d217d toolbox: indicate why swap{on|off} failed 
Change-Id: I1247e3592ab0f9878fb27d114fd14f9b29282b0e
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2014-04-30 12:57:45 +08:00
Elliott Hughes
265a1d285e am 0888e52f: am afe5bbef: am a67914e4: Merge "Fix top(1) SIGPIPE behavior." 
* commit '0888e52fa8141acdcf62eff1b14059d9aab17382':
  Fix top(1) SIGPIPE behavior.
 2014-04-21 15:59:27 +00:00
Elliott Hughes
a67914e4d6 Merge "Fix top(1) SIGPIPE behavior." 2014-04-19 00:19:00 +00:00
Elliott Hughes
5922d3b5be Fix top(1) SIGPIPE behavior. 
Bug: 14166609
Change-Id: I4aad1e0db2e875735405d094fb0d1a36862b5b19
 2014-04-18 16:53:04 -07:00
Colin Cross
dd8e1bbbb0 am 8d57b79c: am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren utility" 
* commit '8d57b79c26c9618ec50d3ee304e9abba41bfe4c9':
  Fix buffer overflow in syren utility
 2014-04-14 15:49:17 +00:00
nks
3967f81b56 Fix buffer overflow in syren utility 
Patch for https://code.google.com/p/android/issues/detail?id=68268

A length check for the argv[2] was added in order to prevent buffer
overflow.  Also replace strcpy with strlcpy.

Signed-off-by: nks <nks@sixserv.org>
Change-Id: If65b83e9b658315c672e684f64e3ae00e69fac31
 2014-04-13 10:45:30 -07:00
Elliott Hughes
241d5aa3d2 am 8f2a205f: am 1a09a804: am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'." 
* commit '8f2a205f34bfad9eddbd62a073d1ca492276d538':
  Move date off the non-portable bionic32 'strtotimeval'.
 2014-04-07 22:42:28 +00:00
Elliott Hughes
e25a6413d3 Move date off the non-portable bionic32 'strtotimeval'. 
Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
 2014-04-07 15:24:47 -07:00
Mark Salyzyn
731e24e99f am fd0f4d9a: am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings" 
* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
  toolbox: ls: 64 bit compile warnings
 2014-03-14 21:35:41 +00:00
Mark Salyzyn
4727c7711e toolbox: ls: 64 bit compile warnings 
Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
 2014-03-14 13:47:16 -07:00
Mark Salyzyn
ed6178976d am 713aedd7: am 9e38da5f: am 1a379899: Merge "toolbox: schedtop 64 bit build issue" 
* commit '713aedd74a9e7bf81929ccd8225d2784afcbb9c9':
  toolbox: schedtop 64 bit build issue
 2014-03-14 17:13:11 +00:00
Mark Salyzyn
161b55fc5d toolbox: schedtop 64 bit build issue 
Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
 2014-03-13 17:14:15 -07:00
Dmitriy Ivanov
fbbc85ea8e am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly" 
* commit '6bb6372b3ee930e2e8517262ec7db4f057a50725':
  fix: making lsof show devies and loaded .so file names correctly
 2014-03-04 20:16:46 +00:00
Dmitriy Ivanov
7c1fc0ed42 fix: making lsof show devies and loaded .so file names correctly 
Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
 2014-03-04 11:17:57 -08:00
Elliott Hughes
6a732d423f am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from_user." 
* commit '2ae567c82ee34fb7e51e797fce140313de34338b':
  Declare (and simplify) uid_from_user.
 2014-03-01 01:51:23 +00:00
Elliott Hughes
e12311fcb2 am f767e9c9: am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)." 
* commit 'f767e9c97a0719b342e91c7770885c108a66e02f':
  Switch to BSD chown (for -R, primarily).
 2014-03-01 01:31:51 +00:00
Elliott Hughes
3f6b63e74d Declare (and simplify) uid_from_user. 
uid_from_user doesn't need to cope with numeric ids in the BSD code
like it did with the old Android code; the caller now handles those.

Also explain what SUPPORT_DOT is for.

Change-Id: I185c9f02b7039795069aa30545563b8a6ef54cd5
 2014-02-28 17:27:08 -08:00
Elliott Hughes
7bc9748420 am 1f570812: am d262b2a8: am 54bb1d3b: Merge "Fix grep -f." 
* commit '1f57081216a2eae81672dadd67c94476b27fbf63':
  Fix grep -f.
 2014-03-01 01:24:37 +00:00
Elliott Hughes
fbcdf6f9fe Merge "Switch to BSD chown (for -R, primarily)." 2014-03-01 01:18:29 +00:00
Elliott Hughes
0b024677ec Switch to BSD chown (for -R, primarily). 
Change-Id: I45381b8a04f4cb651123a2d43860418e06df6e65
 2014-02-28 16:48:49 -08:00
Elliott Hughes
4014501d79 Fix grep -f. 
bionic has getline now.

Change-Id: I5e4ee137768ab3113dbe8a07406fa39f4b6546af
 2014-02-28 16:45:56 -08:00
Elliott Hughes
dc3dd44c02 am 51437ed2: am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of <asm/page.h>." 
* commit '51437ed26565f4bc55e516b73b7e9cafef8e012f':
  Remove unused #includes of <asm/page.h>.
 2014-02-24 23:53:26 +00:00
Elliott Hughes
2f77bb6931 Remove unused #includes of <asm/page.h>. 
(<asm/page.h> is going away.)

Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
 2014-02-24 15:38:44 -08:00
Nick Kralevich
5a78e23a00 am 490963a5: am c0f95624: am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data." 
* commit '490963a54e5ef0c421f0e1ac87eafc2b46c32b95':
  Add -D option to restorecon for relabeling /data/data.
 2014-02-20 23:15:40 +00:00
Stephen Smalley
500308a7e6 Add -D option to restorecon for relabeling /data/data. 
This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83.

Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-18 11:15:52 -05:00
Nick Kralevich
3049f23915 am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-13 00:19:47 +00:00
Nick Kralevich
2e7347d617 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:28 +00:00
Elliott Hughes
4160507b75 am a1ebd4d5: am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread." 
* commit 'a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73':
  Remove a pre-uapi hack from nandread.
 2014-02-10 12:51:27 +00:00
Elliott Hughes
2c1d62d622 Remove a pre-uapi hack from nandread. 
We only have uapi headers now.

Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
 2014-02-07 17:10:37 -08:00
Stephen Smalley
27a93650c0 Convert all selinux_android_restorecon and _setfilecon calls to new API. 
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-07 09:38:32 -05:00
Nick Kralevich
b3e2d02588 am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations." 
* commit '52ca10d15aa803333467db456a40d2bbc89dc18e':
  Unify toolbox restorecon and libselinux restorecon implementations.
 2014-02-07 00:02:23 +00:00
Stephen Smalley
2761b71d3f Unify toolbox restorecon and libselinux restorecon implementations. 
Extend the libselinux restorecon implementation to allow reuse
by the toolbox restorecon command.  This simply requires adding
support for the nochange (-n) and verbose (-v) options to the
libselinux functions and rewriting the toolbox restorecon command
to use the libselinux functions.   Also add a force (-F) option to
support forcing a restorecon_recursive even if the restorecon_last
attribute matches the current file_contexts hash so that we can
continue to force a restorecon via the toolbox command for testing
or when we know something else has changed (e.g. for when we support
relabeling /data/data and package information has changed).

Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-06 09:42:04 -05:00
Sujith Ramakrishnan
42e5fda53a Merge "Add mknod utility to system/core/toolbox" 2014-01-24 22:31:17 +00:00
Sujith Ramakrishnan
71bbbd1578 Add mknod utility to system/core/toolbox 
Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
 2014-01-17 19:14:47 -08:00
Elliott Hughes
5dbb002217 am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64." 
* commit '1571dac49fee8d7304a082a787aed15520ed48b4':
  Fix 'r' for LP64.
 2014-01-17 20:11:24 +00:00
Elliott Hughes
2430a064bd Fix 'r' for LP64. 
Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
 2014-01-17 09:50:56 -08:00
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
Nick Kralevich
960ac434a4 fix strncat misuse 
The third argument of strncat() tells how much data to append from
src, not the total size of the buffer.

Change uses of strncat() to strlcat(), which has the buffer overflow
protection behavior intended by the original author.

This fixes the following compiler warning:

In function 'strncat',
    inlined from 'print_type' at system/core/toolbox/lsof.c:76:12:
bionic/libc/include/string.h:142:5: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default]

Change-Id: Id69edc641de3cb87d1867a409cd57b04b12f90a7
 2013-06-03 12:13:36 -07:00
Nick Kralevich
44a5fb5704 Merge "fs_mgr: make block devices read-only" 2013-04-25 20:22:20 +00:00
Nick Kralevich
49edc0acf8 am 4c1840e6: am 5ea58543: Merge "mount: fix incorrect string length calculation" 
* commit '4c1840e6547266ba251d8c34905036d73240ff57':
  mount: fix incorrect string length calculation
 2013-04-24 17:37:37 -07:00
Nick Kralevich
4c1840e654 am 5ea58543: Merge "mount: fix incorrect string length calculation" 
* commit '5ea58543154a97c42c0b7fc58c2639a4fea64f5b':
  mount: fix incorrect string length calculation
 2013-04-24 17:36:11 -07:00
Nick Kralevich
29a5298366 mount: fix incorrect string length calculation 
Fix bug https://code.google.com/p/android/issues/detail?id=54192
which incorrectly calculated the length of a string.

Fix compiler warning:

system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default]
system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default]

Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
 2013-04-24 16:31:02 -07:00
Nick Kralevich
e18c0d508a fs_mgr: make block devices read-only 
When a filesystem is mounted read-only, make the underlying
block device read-only too. This helps prevent an attacker
who is able to change permissions on the files in /dev
(for example, symlink attack) from modifying the block device.

In particular, this change would have stopped the LG Thrill / Optimus
3D rooting exploit
(http://vulnfactory.org/blog/2012/02/26/rooting-the-lg-thrill-optimus-3d/)
as that exploit modified the raw block device corresponding to /system.

This change also makes UID=0 less powerful. Block devices cannot
be made writable again without CAP_SYS_ADMIN, so an escalation
to UID=0 by itself doesn't give full root access.

adb/mount: Prior to mounting something read-write, remove the
read-only restrictions on the underlying block device. This avoids
messing up developer workflows.

Change-Id: I135098a8fe06f327336f045aab0d48ed9de33807
 2013-04-24 08:53:26 -07:00
Colin Cross
ba4ac0cc3a am 03546553: am b73a0ef4: Merge "use lseek64 to resolve offset oveflow" 
* commit '03546553205b56fc1ba0318b146971f43f54a155':
  use lseek64 to resolve offset oveflow
 2013-04-18 15:25:54 -07:00
Colin Cross
0354655320 am b73a0ef4: Merge "use lseek64 to resolve offset oveflow" 
* commit 'b73a0ef4d05ad594ba07b98e1f4aa7fe66a18c2e':
  use lseek64 to resolve offset oveflow
 2013-04-18 15:20:54 -07:00
Jongrak Kwon
c05aae4ac4 use lseek64 to resolve offset oveflow 
The offset variable in lseek is 32 bit and get easily overflow
when accessing with large offset in dd command.
Use lseek64 to resolve it.

Change-Id: Ib75d9dcb587004a6851365ab5bb8584ce1010b57
 2013-04-17 14:05:55 -07:00
Ying Wang
39f6dd65f9 am 129b6d90: am 083b5ccb: Add liblog 
* commit '129b6d907b3c32a0f0a2e4fc585502484d47a1e4':
  Add liblog
 2013-04-09 23:25:24 -07:00
Ying Wang
129b6d907b am 083b5ccb: Add liblog 
* commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27':
  Add liblog
 2013-04-09 22:29:03 -07:00
Ying Wang
083b5ccba3 Add liblog 
Bug: 8580410
Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
 2013-04-09 22:03:45 -07:00
Colin Cross
58b0642abb am d3859e43: am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 
* commit 'd3859e433d5a4e0da3f24851c5f5f6c9c8b97849':
  toolbox/dmesg: do not hardcode KLOG_BUF_LEN
 2013-04-06 12:56:31 -07:00
Colin Cross
d3859e433d am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 
* commit '6e0b9ecb503b5611d815214e0a134ea0b1395089':
  toolbox/dmesg: do not hardcode KLOG_BUF_LEN
 2013-04-06 12:51:35 -07:00
Colin Cross
6e0b9ecb50 Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 2013-04-06 19:02:01 +00:00
Geremy Condra
e5920ffdca am a7096004: am 911ba269: Merge "Add -i option to toolbox cmd ls" 
* commit 'a7096004f220dd7578d7b2e26a3513fa5efc0fc1':
  Add -i option to toolbox cmd ls
 2013-04-04 23:46:55 -07:00
Geremy Condra
a7096004f2 am 911ba269: Merge "Add -i option to toolbox cmd ls" 
* commit '911ba269e369035f9a4a250fa22233b37d724356':
  Add -i option to toolbox cmd ls
 2013-04-04 23:42:16 -07:00
William Roberts
403b195548 Add -i option to toolbox cmd ls 
Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
 2013-04-03 17:39:19 -07:00
James Sullins
edee93dc5b toolbox/dmesg: do not hardcode KLOG_BUF_LEN 
Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
 2013-04-01 21:50:03 +05:30
Benoit Goby
c6d7e200ed toolbox: Make reboot a separate command from toolbox 
Set the CAP_SYS_BOOT filesystem capability on the new reboot
command and keep CAP_SYS_BOOT in adb bounding set so that the
shell user can run it.

Change-Id: I1dd6143445ee2a952254f0452ab6e544318431dd
 2013-03-26 12:24:10 -07:00
Benoit Goby
391f365c6d toolbox: Fix rm -f with multiple files 
Only check errno if unlink returns -1.
Continue instead of exiting if one file does not exist.

Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b
 2013-03-25 19:59:21 -07:00
Dmitry Shmidt
4db7df71da toolbox: renice: Add -t TYPE parameter and switch to getopt 
Change-Id: Idaedabe1505a9c373629ef1fd31aa4b4beb068c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-01-22 16:59:36 -08:00
Dima Zavin
487c4ea012 am 7ec62dbd: am 82ea44f8: Merge "Change setsebool syntax to be consistent with other init built-ins." 
* commit '7ec62dbd9d2bd7369fa074bf002f642b03e6dd39':
  Change setsebool syntax to be consistent with other init built-ins.
 2012-12-19 09:51:38 -08:00
Dima Zavin
82ea44f88f Merge "Change setsebool syntax to be consistent with other init built-ins." 2012-12-18 23:42:09 -08:00
Stephen Smalley
0e23fee505 Change setsebool syntax to be consistent with other init built-ins. 
Change setsebool syntax from name=value to name value.
This is to make it consistent with setprop and similar commands.
Update both the init built-in command and the toolbox command
for consistency.

Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2012-12-13 15:41:53 -05:00
Elliott Hughes
229d2ace9d am b8db1e09: am 777991d9: Merge "Fixed improper size displaying in \'df\' utility" 
* commit 'b8db1e093d412f57263dc597dbac14c377945781':
  Fixed improper size displaying in 'df' utility
 2012-12-03 08:15:25 -08:00
Elliott Hughes
777991d939 Merge "Fixed improper size displaying in 'df' utility" 2012-12-03 07:33:38 -08:00
Kenny Root
efb5e3c709 resolved conflicts for merge of 20f5daa8 to master 
Change-Id: Ie3e67696d265a56dfa4d089c777506f27783a9a6
 2012-10-16 18:00:29 -07:00
Kenny Root
20f5daa865 resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp 
Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
 2012-10-16 17:51:14 -07:00
Kenny Root
b83c09812f Remove HAVE_SELINUX guards 
Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
 2012-10-16 12:34:06 -07:00
Kenny Root
f638b7e0a0 am e47eb98a: am 674c0445: Merge "toolbox: silence some compiler warnings" 
* commit 'e47eb98a337081d0d6c740eb7d8b990faf4090d7':
  toolbox: silence some compiler warnings
 2012-10-11 00:30:23 -07:00
Kenny Root
e47eb98a33 am 674c0445: Merge "toolbox: silence some compiler warnings" 
* commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0':
  toolbox: silence some compiler warnings
 2012-10-11 00:29:10 -07:00
Kenny Root
ef5d0340e4 toolbox: silence some compiler warnings 
Comparison of signed and unsigned integers. Use parenthesis around a
group of bitwise OR operations.

Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
 2012-10-10 11:28:27 -07:00
Michal Frynas
1f90dcd0c0 Fixed improper size displaying in 'df' utility 
'df' command used to display filesystem usage statistics as integer
values, in most cases rounding the actual value down. Because of
that 'df' tended to display faulty size values.
This fix to 'df' utility calculates the fractional part of the size,
then it rounds it when needed to the nearest one-digit integer value
and displays after decimal dot.

Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
 2012-10-02 10:39:19 +02:00
Jeff Sharkey
ad8663e970 am 08f748a2: am 42a1e6c9: Merge "Iteration on multi-user external storage." into jb-mr1-dev 
* commit '08f748a2f8e6933fdd96290de049c1aa1f3f8479':
  Iteration on multi-user external storage.
 2012-08-22 18:21:03 -07:00
Jeff Sharkey
bfcd810b79 Iteration on multi-user external storage. 
Define /storage as top-level concept, so that we enforce permissions
uniformly.  Moves external storage paths from headers to per-device
environment variables.  Added missing mount flags, and we no longer
have adb-specific external storage.

Bug: 6925012
Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
 2012-08-22 14:28:37 -07:00
Jean-Baptiste Queru
1ef97deea5 am 81eecb1e: am 2ab69388: am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag" 
* commit '81eecb1eb8c23e603c78d60a7278a3afd1798962':
  vmstat: Fix -n flag
 2012-08-20 14:56:02 -07:00
Jean-Baptiste Queru
2ab69388cb am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag" 
* commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad':
  vmstat: Fix -n flag
 2012-08-20 14:51:52 -07:00
Jean-Baptiste Queru
52d5dfc8d3 Merge "vmstat: Fix -n flag" 2012-08-20 14:25:13 -07:00
Jon Larimer
78f7aefae2 Merge "Make usage() static in du.c to avoid conflicts" 2012-08-14 10:38:45 -07:00
Kenny Root
3790b9be66 am f48a4b4b: am ba822edb: am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static." 
* commit 'f48a4b4be699f63670acbff94b78e1fdf3b4338c':
  Make setenforce usage function static.
 2012-08-13 16:08:20 -07:00
Kenny Root
ba822edb30 am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static." 
* commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c':
  Make setenforce usage function static.
 2012-08-13 16:03:25 -07:00
Jon Larimer
f286dd75f6 Make usage() static in du.c to avoid conflicts 
Change-Id: Ic6b036d050943fb5f0af8553c081ca75362167e8
 2012-08-13 16:02:55 -04:00
Matt Finifter
492051ed2a Make setenforce usage function static. 
Change-Id: I6de204dc072418805160a35d799b8948ecb39251
 2012-08-13 12:56:23 -07:00
Kenny Root
28358cf9e7 am a0347971: am 605103fb: resolved conflicts for merge of 4dcd52ab to jb-mr1-dev 
* commit 'a0347971dec3dc34c6ccebad5170ced255fdf35f':
  Add support for reloading policy from /data/system.
 2012-08-13 10:26:19 -07:00
Kenny Root
605103fb55 resolved conflicts for merge of 4dcd52ab to jb-mr1-dev 
Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866
 2012-08-13 10:21:35 -07:00
Stephen Smalley
ae6f3d7c05 Add support for reloading policy from /data/system. 
To support runtime policy management, add support for reloading
policy from /data/system.  This can be triggered by setting the
selinux.loadpolicy property to 1, whether from init.rc after
mounting /data or from the system_server (e.g. upon invocation of
a new device admin API for provisioning policy). ueventd and
installd are restarted upon policy reloads to pick up the new
policy configurations relevant to their operation.

Change-Id: I97479aecef8cec23b32f60e09cc778cc5520b691
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2012-08-09 09:59:10 -04:00
Elliott Hughes
7acf56f8f7 am 79737802: am 8268a75e: am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT" 
* commit '79737802421d7b32707f1c248b5ecb239965234a':
  Conditionally use SIGSTKFLT
 2012-08-08 15:11:22 -07:00
Elliott Hughes
8268a75e86 am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT" 
* commit 'c5db017cc3d30b1b15544ca9889e66890710f93c':
  Conditionally use SIGSTKFLT
 2012-08-08 14:06:25 -07:00
Michael Wright
52abb4b1ef Added clear command to toolbox 
Change-Id: Ifb1b7693727997b94614f7da73081f0894ee88ad
 2012-08-07 21:47:51 -07:00
Chris Dearman
7ac420972a Conditionally use SIGSTKFLT 
Change-Id: I555b33b5a93df332c556944a1c00fff417825247
 2012-08-01 15:51:09 -07:00
Jeff Sharkey
3e8b1581ff Ported "grep" from NetBSD to toolbox. 
Bug: 6798417
Change-Id: I581c496a726a4814edaaa3672849c090bac8552c
 2012-07-13 16:37:38 -07:00
Jeff Sharkey
57df14c654 Ported "cp" from NetBSD to toolbox. 
Bug: 6798417
Change-Id: I716ab459b9edf4c7405bf042adbee0300b6f51c9
 2012-07-13 16:26:30 -07:00
Arun Raghavan
6caab4ce95 vmstat: Fix -n flag 
The loop condition for the number of iterations basically caused the
argument to -n to be ignored. This fixes the condition appropriately.
 2012-07-10 10:43:57 +05:30
Ken Sumrall
8103e91483 Add the du command to toolbox 
The code is from NetBSD, with the -n and -h options removed to make
porting easy.  Also, removed support for the BLOCKSIZE environment
variable for the same reason.

Change-Id: Ib927ff3527e02802785fdd7f75bab1f05222918e
 2012-07-09 17:33:08 -07:00
Nick Kralevich
3f2b0a506f Add mode when open(O_CREAT) is used. 
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a runtime error in a future version of Android.

Change-Id: I00609f37d2ea68e21b6404d542830386be354202
 2012-06-26 14:59:36 -07:00
Jean-Baptiste Queru
60f3d65c83 am 2a2e10fb: am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading" 
* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
  toolbox: rmmod: fix module unloading
 2012-06-11 15:28:12 -07:00
Jean-Baptiste Queru
2a2e10fbb3 am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading" 
* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
  toolbox: rmmod: fix module unloading
 2012-06-11 15:25:44 -07:00
Jean-Baptiste Queru
91e5551f88 Merge "toolbox: rmmod: fix module unloading" 2012-06-11 15:16:07 -07:00
Jeff Sharkey
393e559ddc Enable conv=fdatasync in dd. 
Matches behavior of coreutils dd.  Also removes unsupported
conversions.

Change-Id: I9ed5a7d43b5b083041b261ce70f6c835b41dc7ac
 2012-05-29 14:26:04 -07:00
Jean-Baptiste Queru
79c71831ca am a802b837: am 1d5e7885: Merge "toolbox: implement rm -f flag" 
* commit 'a802b8374a22da9f52541e1fc286dcbdb1cfa1b4':
  toolbox: implement rm -f flag
 2012-05-25 08:12:59 -07:00
Vishal Bhoj
fc26c0ba59 toolbox: rmmod: fix module unloading 
Replace "-" with "_" in module name. This would keep
rmmod compatible with module-init-tools version of rmmod

Change-Id: I4470d9a98bc2f299acd94859fca4403aee279d2b
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
 2012-05-15 18:01:34 +05:30
Jeff Brown
1ee467c760 Delete dead code. 
This file is not compiled and not used.

Bug: 6435382
Change-Id: I3a08690950f1c77f8b0bc57a9e5cdb6eb402ac77
 2012-05-11 17:35:16 -07:00