Commit graph

326 commits

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