ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libcutils: handle root directory empty path" am: 6105dbd01b

Browse source 
am: 621ae033a4

Change-Id: Ibde5e2b3d703b1dbd42d01f9e5720d6075a2dd45
This commit is contained in:
Mark Salyzyn 2017-03-28 17:23:24 +00:00 • committed by android-build-merger
commit a31d895910
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libcutils/canned_fs_config.c
View file

@ -17,6 +17,7 @@
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -41,7 +42,7 @@ static int path_compare(const void* a, const void* b) {
}
int load_canned_fs_config(const char* fn) {
char line[PATH_MAX + 200];
char buf[PATH_MAX + 200];
FILE* f;
f = fopen(fn, "r");
@ -50,17 +51,21 @@ int load_canned_fs_config(const char* fn) {
return -1;
}
while (fgets(line, sizeof(line), f)) {
while (fgets(buf, sizeof(buf), f)) {
Path* p;
char* token;
char* line = buf;
bool rootdir;
while (canned_used >= canned_alloc) {
canned_alloc = (canned_alloc+1) * 2;
canned_data = (Path*) realloc(canned_data, canned_alloc * sizeof(Path));
}
p = canned_data + canned_used;
p->path = strdup(strtok(line, " "));
p->uid = atoi(strtok(NULL, " "));
if (line[0] == '/') line++;
rootdir = line[0] == ' ';
p->path = strdup(rootdir ? "" : strtok(line, " "));
p->uid = atoi(strtok(rootdir ? line : NULL, " "));
p->gid = atoi(strtok(NULL, " "));
p->mode = strtol(strtok(NULL, " "), NULL, 8); // mode is in octal
p->capabilities = 0;