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

am 60babf8b: delete files before symlinking; log error messages

Browse source 
Merge commit '60babf8ba766662cc0932e8271b67daa69cddd5f' into eclair-plus-aosp

* commit '60babf8ba766662cc0932e8271b67daa69cddd5f':
  delete files before symlinking; log error messages
This commit is contained in:
Doug Zongker 2009-09-18 15:49:37 -07:00 committed by Android Git Automerger
commit d16fb221cd
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
updater/install.c
View file

@ -86,6 +86,8 @@ char* MountFn(const char* name, State* state, int argc, Expr* argv[]) {
} else { } else {
if (mount(location, mount_point, type, if (mount(location, mount_point, type,
MS_NOATIME | MS_NODEV | MS_NODIRATIME, "") < 0) { MS_NOATIME | MS_NODEV | MS_NODIRATIME, "") < 0) {
fprintf(stderr, "%s: failed to mount %s at %s: %s\n",
name, location, mount_point, strerror(errno));
result = strdup(""); result = strdup("");
} else { } else {
result = mount_point; result = mount_point;
@ -348,6 +350,7 @@ char* PackageExtractFileFn(const char* name, State* state,
// symlink target src1 src2 ... // symlink target src1 src2 ...
// unlinks any previously existing src1, src2, etc before creating symlinks.
char* SymlinkFn(const char* name, State* state, int argc, Expr* argv[]) { char* SymlinkFn(const char* name, State* state, int argc, Expr* argv[]) {
if (argc == 0) { if (argc == 0) {
return ErrorAbort(state, "%s() expects 1+ args, got %d", name, argc); return ErrorAbort(state, "%s() expects 1+ args, got %d", name, argc);
@ -364,7 +367,16 @@ char* SymlinkFn(const char* name, State* state, int argc, Expr* argv[]) {
int i; int i;
for (i = 0; i < argc-1; ++i) { for (i = 0; i < argc-1; ++i) {
symlink(target, srcs[i]); if (unlink(srcs[i]) < 0) {
if (errno != ENOENT) {
fprintf(stderr, "%s: failed to remove %s: %s\n",
name, srcs[i], strerror(errno));
}
}
if (symlink(target, srcs[i]) < 0) {
fprintf(stderr, "%s: failed to symlink %s to %s: %s\n",
name, srcs[i], target, strerror(errno));
}
free(srcs[i]); free(srcs[i]);
} }
free(srcs); free(srcs);
@ -424,8 +436,14 @@ char* SetPermFn(const char* name, State* state, int argc, Expr* argv[]) {
} }
for (i = 3; i < argc; ++i) { for (i = 3; i < argc; ++i) {
chown(args[i], uid, gid); if (chown(args[i], uid, gid) < 0) {
chmod(args[i], mode); fprintf(stderr, "%s: chown of %s to %d %d failed: %s\n",
name, args[i], uid, gid, strerror(errno));
}
if (chmod(args[i], mode) < 0) {
fprintf(stderr, "%s: chmod of %s to %o failed: %s\n",
name, args[i], mode, strerror(errno));
}
} }
} }
result = strdup(""); result = strdup("");