openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolved conflicts for merge of 2237ca4c to jb-mr1-dev 

Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
This commit is contained in:
Jean-Baptiste Queru 2012-08-15 09:54:30 -07:00
parent d7f78e88b5 2237ca4c66
commit e92372ba9e
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdcard/sdcard.c
View File

@ -1314,11 +1314,23 @@ int main(int argc, char **argv)
source_path = arg;
else if (!dest_path)
dest_path = arg;
else if (!uid)
uid = strtoul(arg, 0, 10);
else if (!gid)
gid = strtoul(arg, 0, 10);
else {
else if (!uid) {
char* endptr = NULL;
errno = 0;
uid = strtoul(arg, &endptr, 10);
if (*endptr != '\0' || errno != 0) {
ERROR("Invalid uid");
return usage();
}
} else if (!gid) {
char* endptr = NULL;
errno = 0;
gid = strtoul(arg, &endptr, 10);
if (*endptr != '\0' || errno != 0) {
ERROR("Invalid gid");
return usage();
}
} else {
ERROR("too many arguments\n");
return usage();
}