tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev

Browse source 
* commit '473967d87ff9fc7a541c16ebdc56364c285d2862':
  Log to UI any metadata setting errors
This commit is contained in:
Brian Carlstrom 2014-10-23 21:56:52 +00:00 committed by Android Git Automerger
commit 4da9cdeab9
1 changed files with 50 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
updater/install.c
View file

@ -52,6 +52,26 @@
#include "wipe.h" #include "wipe.h"
#endif #endif
void uiPrint(State* state, char* buffer) {
char* line = strtok(buffer, "\n");
UpdaterInfo* ui = (UpdaterInfo*)(state->cookie);
while (line) {
fprintf(ui->cmd_pipe, "ui_print %s\n", line);
line = strtok(NULL, "\n");
}
fprintf(ui->cmd_pipe, "ui_print\n");
}
__attribute__((__format__(printf, 2, 3))) __nonnull((2))
void uiPrintf(State* state, const char* format, ...) {
char error_msg[1024];
va_list ap;
va_start(ap, format);
vsnprintf(error_msg, sizeof(error_msg), format, ap);
va_end(ap);
uiPrint(state, error_msg);
}
// Take a sha-1 digest and return it as a newly-allocated hex string. // Take a sha-1 digest and return it as a newly-allocated hex string.
char* PrintSha1(const uint8_t* digest) { char* PrintSha1(const uint8_t* digest) {
char* buffer = malloc(SHA_DIGEST_SIZE*2 + 1); char* buffer = malloc(SHA_DIGEST_SIZE*2 + 1);
@ -633,7 +653,7 @@ struct perm_parsed_args {
uint64_t capabilities; uint64_t capabilities;
}; };
static struct perm_parsed_args ParsePermArgs(int argc, char** args) { static struct perm_parsed_args ParsePermArgs(State * state, int argc, char** args) {
int i; int i;
struct perm_parsed_args parsed; struct perm_parsed_args parsed;
int bad = 0; int bad = 0;
@ -648,7 +668,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.uid = uid; parsed.uid = uid;
parsed.has_uid = true; parsed.has_uid = true;
} else { } else {
printf("ParsePermArgs: invalid UID \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid UID \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -659,7 +679,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.gid = gid; parsed.gid = gid;
parsed.has_gid = true; parsed.has_gid = true;
} else { } else {
printf("ParsePermArgs: invalid GID \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid GID \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -670,7 +690,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.mode = mode; parsed.mode = mode;
parsed.has_mode = true; parsed.has_mode = true;
} else { } else {
printf("ParsePermArgs: invalid mode \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid mode \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -681,7 +701,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.dmode = mode; parsed.dmode = mode;
parsed.has_dmode = true; parsed.has_dmode = true;
} else { } else {
printf("ParsePermArgs: invalid dmode \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid dmode \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -692,7 +712,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.fmode = mode; parsed.fmode = mode;
parsed.has_fmode = true; parsed.has_fmode = true;
} else { } else {
printf("ParsePermArgs: invalid fmode \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid fmode \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -703,7 +723,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.capabilities = capabilities; parsed.capabilities = capabilities;
parsed.has_capabilities = true; parsed.has_capabilities = true;
} else { } else {
printf("ParsePermArgs: invalid capabilities \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid capabilities \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -713,7 +733,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
parsed.selabel = args[i+1]; parsed.selabel = args[i+1];
parsed.has_selabel = true; parsed.has_selabel = true;
} else { } else {
printf("ParsePermArgs: invalid selabel \"%s\"\n", args[i + 1]); uiPrintf(state, "ParsePermArgs: invalid selabel \"%s\"\n", args[i + 1]);
bad++; bad++;
} }
continue; continue;
@ -730,6 +750,7 @@ static struct perm_parsed_args ParsePermArgs(int argc, char** args) {
} }
static int ApplyParsedPerms( static int ApplyParsedPerms(
State * state,
const char* filename, const char* filename,
const struct stat *statptr, const struct stat *statptr,
struct perm_parsed_args parsed) struct perm_parsed_args parsed)
@ -743,7 +764,7 @@ static int ApplyParsedPerms(
if (parsed.has_uid) { if (parsed.has_uid) {
if (chown(filename, parsed.uid, -1) < 0) { if (chown(filename, parsed.uid, -1) < 0) {
printf("ApplyParsedPerms: chown of %s to %d failed: %s\n", uiPrintf(state, "ApplyParsedPerms: chown of %s to %d failed: %s\n",
filename, parsed.uid, strerror(errno)); filename, parsed.uid, strerror(errno));
bad++; bad++;
} }
@ -751,7 +772,7 @@ static int ApplyParsedPerms(
if (parsed.has_gid) { if (parsed.has_gid) {
if (chown(filename, -1, parsed.gid) < 0) { if (chown(filename, -1, parsed.gid) < 0) {
printf("ApplyParsedPerms: chgrp of %s to %d failed: %s\n", uiPrintf(state, "ApplyParsedPerms: chgrp of %s to %d failed: %s\n",
filename, parsed.gid, strerror(errno)); filename, parsed.gid, strerror(errno));
bad++; bad++;
} }
@ -759,7 +780,7 @@ static int ApplyParsedPerms(
if (parsed.has_mode) { if (parsed.has_mode) {
if (chmod(filename, parsed.mode) < 0) { if (chmod(filename, parsed.mode) < 0) {
printf("ApplyParsedPerms: chmod of %s to %d failed: %s\n", uiPrintf(state, "ApplyParsedPerms: chmod of %s to %d failed: %s\n",
filename, parsed.mode, strerror(errno)); filename, parsed.mode, strerror(errno));
bad++; bad++;
} }
@ -767,7 +788,7 @@ static int ApplyParsedPerms(
if (parsed.has_dmode && S_ISDIR(statptr->st_mode)) { if (parsed.has_dmode && S_ISDIR(statptr->st_mode)) {
if (chmod(filename, parsed.dmode) < 0) { if (chmod(filename, parsed.dmode) < 0) {
printf("ApplyParsedPerms: chmod of %s to %d failed: %s\n", uiPrintf(state, "ApplyParsedPerms: chmod of %s to %d failed: %s\n",
filename, parsed.dmode, strerror(errno)); filename, parsed.dmode, strerror(errno));
bad++; bad++;
} }
@ -775,7 +796,7 @@ static int ApplyParsedPerms(
if (parsed.has_fmode && S_ISREG(statptr->st_mode)) { if (parsed.has_fmode && S_ISREG(statptr->st_mode)) {
if (chmod(filename, parsed.fmode) < 0) { if (chmod(filename, parsed.fmode) < 0) {
printf("ApplyParsedPerms: chmod of %s to %d failed: %s\n", uiPrintf(state, "ApplyParsedPerms: chmod of %s to %d failed: %s\n",
filename, parsed.fmode, strerror(errno)); filename, parsed.fmode, strerror(errno));
bad++; bad++;
} }
@ -784,7 +805,7 @@ static int ApplyParsedPerms(
if (parsed.has_selabel) { if (parsed.has_selabel) {
// TODO: Don't silently ignore ENOTSUP // TODO: Don't silently ignore ENOTSUP
if (lsetfilecon(filename, parsed.selabel) && (errno != ENOTSUP)) { if (lsetfilecon(filename, parsed.selabel) && (errno != ENOTSUP)) {
printf("ApplyParsedPerms: lsetfilecon of %s to %s failed: %s\n", uiPrintf(state, "ApplyParsedPerms: lsetfilecon of %s to %s failed: %s\n",
filename, parsed.selabel, strerror(errno)); filename, parsed.selabel, strerror(errno));
bad++; bad++;
} }
@ -794,7 +815,7 @@ static int ApplyParsedPerms(
if (parsed.capabilities == 0) { if (parsed.capabilities == 0) {
if ((removexattr(filename, XATTR_NAME_CAPS) == -1) && (errno != ENODATA)) { if ((removexattr(filename, XATTR_NAME_CAPS) == -1) && (errno != ENODATA)) {
// Report failure unless it's ENODATA (attribute not set) // Report failure unless it's ENODATA (attribute not set)
printf("ApplyParsedPerms: removexattr of %s to %" PRIx64 " failed: %s\n", uiPrintf(state, "ApplyParsedPerms: removexattr of %s to %" PRIx64 " failed: %s\n",
filename, parsed.capabilities, strerror(errno)); filename, parsed.capabilities, strerror(errno));
bad++; bad++;
} }
@ -807,7 +828,7 @@ static int ApplyParsedPerms(
cap_data.data[1].permitted = (uint32_t) (parsed.capabilities >> 32); cap_data.data[1].permitted = (uint32_t) (parsed.capabilities >> 32);
cap_data.data[1].inheritable = 0; cap_data.data[1].inheritable = 0;
if (setxattr(filename, XATTR_NAME_CAPS, &cap_data, sizeof(cap_data), 0) < 0) { if (setxattr(filename, XATTR_NAME_CAPS, &cap_data, sizeof(cap_data), 0) < 0) {
printf("ApplyParsedPerms: setcap of %s to %" PRIx64 " failed: %s\n", uiPrintf(state, "ApplyParsedPerms: setcap of %s to %" PRIx64 " failed: %s\n",
filename, parsed.capabilities, strerror(errno)); filename, parsed.capabilities, strerror(errno));
bad++; bad++;
} }
@ -820,10 +841,11 @@ static int ApplyParsedPerms(
// nftw doesn't allow us to pass along context, so we need to use // nftw doesn't allow us to pass along context, so we need to use
// global variables. *sigh* // global variables. *sigh*
static struct perm_parsed_args recursive_parsed_args; static struct perm_parsed_args recursive_parsed_args;
static State* recursive_state;
static int do_SetMetadataRecursive(const char* filename, const struct stat *statptr, static int do_SetMetadataRecursive(const char* filename, const struct stat *statptr,
int fileflags, struct FTW *pfwt) { int fileflags, struct FTW *pfwt) {
return ApplyParsedPerms(filename, statptr, recursive_parsed_args); return ApplyParsedPerms(recursive_state, filename, statptr, recursive_parsed_args);
} }
static Value* SetMetadataFn(const char* name, State* state, int argc, Expr* argv[]) { static Value* SetMetadataFn(const char* name, State* state, int argc, Expr* argv[]) {
@ -848,14 +870,16 @@ static Value* SetMetadataFn(const char* name, State* state, int argc, Expr* argv
goto done; goto done;
} }
struct perm_parsed_args parsed = ParsePermArgs(argc, args); struct perm_parsed_args parsed = ParsePermArgs(state, argc, args);
if (recursive) { if (recursive) {
recursive_parsed_args = parsed; recursive_parsed_args = parsed;
recursive_state = state;
bad += nftw(args[0], do_SetMetadataRecursive, 30, FTW_CHDIR | FTW_DEPTH | FTW_PHYS); bad += nftw(args[0], do_SetMetadataRecursive, 30, FTW_CHDIR | FTW_DEPTH | FTW_PHYS);
memset(&recursive_parsed_args, 0, sizeof(recursive_parsed_args)); memset(&recursive_parsed_args, 0, sizeof(recursive_parsed_args));
recursive_state = NULL;
} else { } else {
bad += ApplyParsedPerms(args[0], &sb, parsed); bad += ApplyParsedPerms(state, args[0], &sb, parsed);
} }
done: done:
@ -1227,15 +1251,7 @@ Value* UIPrintFn(const char* name, State* state, int argc, Expr* argv[]) {
} }
free(args); free(args);
buffer[size] = '\0'; buffer[size] = '\0';
uiPrint(state, buffer);
char* line = strtok(buffer, "\n");
while (line) {
fprintf(((UpdaterInfo*)(state->cookie))->cmd_pipe,
"ui_print %s\n", line);
line = strtok(NULL, "\n");
}
fprintf(((UpdaterInfo*)(state->cookie))->cmd_pipe, "ui_print\n");
return StringValue(buffer); return StringValue(buffer);
} }