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