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

Merge "libcutils: canned_fs_config.c drop tabs"

Browse source
This commit is contained in:
Treehugger Robot 2016-07-06 18:50:22 +00:00 • committed by Gerrit Code Review
commit 4ee9ed5366
1 changed files with 72 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
libcutils/canned_fs_config.c
View file

@ -14,22 +14,22 @@
* limitations under the License. * limitations under the License.
*/ */
#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <errno.h> #include <errno.h>
#include <inttypes.h>
#include <limits.h> #include <limits.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include <private/canned_fs_config.h> #include <private/canned_fs_config.h>
typedef struct { typedef struct {
const char* path; const char* path;
unsigned uid; unsigned uid;
unsigned gid; unsigned gid;
unsigned mode; unsigned mode;
uint64_t capabilities; uint64_t capabilities;
} Path; } Path;
static Path* canned_data = NULL; static Path* canned_data = NULL;
@ -37,81 +37,87 @@ static int canned_alloc = 0;
static int canned_used = 0; static int canned_used = 0;
static int path_compare(const void* a, const void* b) { static int path_compare(const void* a, const void* b) {
return strcmp(((Path*)a)->path, ((Path*)b)->path); return strcmp(((Path*)a)->path, ((Path*)b)->path);
} }
int load_canned_fs_config(const char* fn) { int load_canned_fs_config(const char* fn) {
FILE* f = fopen(fn, "r"); char line[PATH_MAX + 200];
if (f == NULL) { FILE* f;
fprintf(stderr, "failed to open %s: %s\n", fn, strerror(errno));
return -1;
}
char line[PATH_MAX + 200]; f = fopen(fn, "r");
while (fgets(line, sizeof(line), f)) { if (f == NULL) {
while (canned_used >= canned_alloc) { fprintf(stderr, "failed to open %s: %s\n", fn, strerror(errno));
canned_alloc = (canned_alloc+1) * 2; return -1;
canned_data = (Path*) realloc(canned_data, canned_alloc * sizeof(Path)); }
}
Path* p = canned_data + canned_used;
p->path = strdup(strtok(line, " "));
p->uid = atoi(strtok(NULL, " "));
p->gid = atoi(strtok(NULL, " "));
p->mode = strtol(strtok(NULL, " "), NULL, 8); // mode is in octal
p->capabilities = 0;
char* token = NULL; while (fgets(line, sizeof(line), f)) {
do { Path* p;
token = strtok(NULL, " "); char* token;
if (token && strncmp(token, "capabilities=", 13) == 0) {
p->capabilities = strtoll(token+13, NULL, 0);
break;
}
} while (token);
canned_used++; 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, " "));
p->gid = atoi(strtok(NULL, " "));
p->mode = strtol(strtok(NULL, " "), NULL, 8); // mode is in octal
p->capabilities = 0;
fclose(f); do {
token = strtok(NULL, " ");
if (token && strncmp(token, "capabilities=", 13) == 0) {
p->capabilities = strtoll(token+13, NULL, 0);
break;
}
} while (token);
qsort(canned_data, canned_used, sizeof(Path), path_compare); canned_used++;
printf("loaded %d fs_config entries\n", canned_used); }
return 0; fclose(f);
qsort(canned_data, canned_used, sizeof(Path), path_compare);
printf("loaded %d fs_config entries\n", canned_used);
return 0;
} }
static const int kDebugCannedFsConfig = 0; static const int kDebugCannedFsConfig = 0;
void canned_fs_config(const char* path, int dir, const char* target_out_path, void canned_fs_config(const char* path, int dir, const char* target_out_path,
unsigned* uid, unsigned* gid, unsigned* mode, uint64_t* capabilities) { unsigned* uid, unsigned* gid, unsigned* mode, uint64_t* capabilities) {
Path key; Path key, *p;
key.path = path; key.path = path;
if (path[0] == '/') if (path[0] == '/') key.path++; // canned paths lack the leading '/'
key.path++; // canned paths lack the leading '/' p = (Path*) bsearch(&key, canned_data, canned_used, sizeof(Path), path_compare);
Path* p = (Path*) bsearch(&key, canned_data, canned_used, sizeof(Path), path_compare); if (p == NULL) {
if (p == NULL) { fprintf(stderr, "failed to find [%s] in canned fs_config\n", path);
fprintf(stderr, "failed to find [%s] in canned fs_config\n", path); exit(1);
exit(1); }
} *uid = p->uid;
*uid = p->uid; *gid = p->gid;
*gid = p->gid; *mode = p->mode;
*mode = p->mode; *capabilities = p->capabilities;
*capabilities = p->capabilities;
if (kDebugCannedFsConfig) { if (kDebugCannedFsConfig) {
// for debugging, run the built-in fs_config and compare the results. // for debugging, run the built-in fs_config and compare the results.
unsigned c_uid, c_gid, c_mode; unsigned c_uid, c_gid, c_mode;
uint64_t c_capabilities; uint64_t c_capabilities;
fs_config(path, dir, target_out_path, &c_uid, &c_gid, &c_mode, &c_capabilities);
if (c_uid != *uid) printf("%s uid %d %d\n", path, *uid, c_uid); fs_config(path, dir, target_out_path, &c_uid, &c_gid, &c_mode, &c_capabilities);
if (c_gid != *gid) printf("%s gid %d %d\n", path, *gid, c_gid);
if (c_mode != *mode) printf("%s mode 0%o 0%o\n", path, *mode, c_mode); if (c_uid != *uid) printf("%s uid %d %d\n", path, *uid, c_uid);
if (c_capabilities != *capabilities) if (c_gid != *gid) printf("%s gid %d %d\n", path, *gid, c_gid);
printf("%s capabilities %" PRIx64 " %" PRIx64 "\n", if (c_mode != *mode) printf("%s mode 0%o 0%o\n", path, *mode, c_mode);
path, if (c_capabilities != *capabilities) {
*capabilities, printf("%s capabilities %" PRIx64 " %" PRIx64 "\n",
c_capabilities); path,
*capabilities,
c_capabilities);
} }
}
} }