summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-16 13:41:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-16 13:41:48 -0700
commitf13c2ba5f85f6cd5499f90978b635724856b7eb3 (patch)
tree7614f26a8ec02524d538e1818171bfb52ed59216 /init
parent4e246965bbd124bad1c1d98c5936d13b4db0d566 (diff)
parent742150c031756da1393bf4223b2468b17cb79326 (diff)
downloadsystem_core-f13c2ba5f85f6cd5499f90978b635724856b7eb3.zip
system_core-f13c2ba5f85f6cd5499f90978b635724856b7eb3.tar.gz
system_core-f13c2ba5f85f6cd5499f90978b635724856b7eb3.tar.bz2
am 742150c0: merge from open-source master
Merge commit '742150c031756da1393bf4223b2468b17cb79326' * commit '742150c031756da1393bf4223b2468b17cb79326': Use complete hardware name without spaces.
Diffstat (limited to 'init')
-rwxr-xr-x[-rw-r--r--]init/util.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/init/util.c b/init/util.c
index 377754b..d8ec88e 100644..100755
--- a/init/util.c
+++ b/init/util.c
@@ -439,8 +439,9 @@ void get_hardware_name(char *hardware, unsigned int *revision)
if (x) {
x += 2;
n = 0;
- while (*x && !isspace(*x)) {
- hardware[n++] = tolower(*x);
+ while (*x && *x != '\n') {
+ if (!isspace(*x))
+ hardware[n++] = tolower(*x);
x++;
if (n == 31) break;
}