summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Runge <mrunge@google.com>2013-11-07 22:55:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-07 22:55:51 +0000
commitc64e76c75088b951f61a7f7bacf8af6eccd2ccfa (patch)
tree9a07575896cd084298b65bf9c35fe3d8e50e03bc
parent3966c571a0c36a40a8142e70b1aa6de547ea6ec3 (diff)
parentce7ca7165bb263c91ca7616a21457032c645e23d (diff)
downloadbootable_recovery-c64e76c75088b951f61a7f7bacf8af6eccd2ccfa.zip
bootable_recovery-c64e76c75088b951f61a7f7bacf8af6eccd2ccfa.tar.gz
bootable_recovery-c64e76c75088b951f61a7f7bacf8af6eccd2ccfa.tar.bz2
Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev
-rw-r--r--updater/install.c35
1 files changed, 35 insertions, 0 deletions
diff --git a/updater/install.c b/updater/install.c
index 0a85945..9fb1b63 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -285,6 +285,40 @@ done:
return StringValue(result);
}
+Value* RenameFn(const char* name, State* state, int argc, Expr* argv[]) {
+ char* result = NULL;
+ if (argc != 2) {
+ return ErrorAbort(state, "%s() expects 2 args, got %d", name, argc);
+ }
+
+ char* src_name;
+ char* dst_name;
+
+ if (ReadArgs(state, argv, 2, &src_name, &dst_name) < 0) {
+ return NULL;
+ }
+ if (strlen(src_name) == 0) {
+ ErrorAbort(state, "src_name argument to %s() can't be empty", name);
+ goto done;
+ }
+ if (strlen(dst_name) == 0) {
+ ErrorAbort(state, "dst_name argument to %s() can't be empty",
+ name);
+ goto done;
+ }
+
+ if (rename(src_name, dst_name) != 0) {
+ ErrorAbort(state, "Rename of %s() to %s() failed, error %s()",
+ src_name, dst_name, strerror(errno));
+ } else {
+ result = dst_name;
+ }
+
+done:
+ free(src_name);
+ if (result != dst_name) free(dst_name);
+ return StringValue(result);
+}
Value* DeleteFn(const char* name, State* state, int argc, Expr* argv[]) {
char** paths = malloc(argc * sizeof(char*));
@@ -1425,6 +1459,7 @@ void RegisterInstallFunctions() {
RegisterFunction("read_file", ReadFileFn);
RegisterFunction("sha1_check", Sha1CheckFn);
+ RegisterFunction("rename", RenameFn);
RegisterFunction("wipe_cache", WipeCacheFn);