commit 6b1ff61f62db82adf8e47c121cd13c29831ad21b
author Doug Zongker <dougz@android.com> Wed Sep 15 16:32:52 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 15 16:32:52 2010 -0700
tree 8c6fc308e9e26895a46aca7ba7e930dd83fe6a44
parent 4f69afdb631a2480d466505635cde3a1d61e3610
parent 858f0a763d0f736eb721f54257b6164886bfcbfc

am 858f0a76: am 8e5e4dad: close update package before installing; allow remount

Merge commit '858f0a763d0f736eb721f54257b6164886bfcbfc'

* commit '858f0a763d0f736eb721f54257b6164886bfcbfc':
  close update package before installing; allow remount

install.c

diff --git a/install.c b/install.c
index 20e8998..2619a0c 100644
--- a/install.c
+++ b/install.c
@@ -42,6 +42,7 @@
     const ZipEntry* binary_entry =
             mzFindZipEntry(zip, ASSUMED_UPDATE_BINARY_NAME);
     if (binary_entry == NULL) {
+        mzCloseZipArchive(zip);
         return INSTALL_CORRUPT;
     }
 
@@ -49,11 +50,13 @@
     unlink(binary);
     int fd = creat(binary, 0755);
     if (fd < 0) {
+        mzCloseZipArchive(zip);
         LOGE("Can't make %s\n", binary);
         return 1;
     }
     bool ok = mzExtractZipEntryToFile(zip, binary_entry, fd);
     close(fd);
+    mzCloseZipArchive(zip);
 
     if (!ok) {
         LOGE("Can't copy %s\n", ASSUMED_UPDATE_BINARY_NAME);
@@ -298,6 +301,5 @@
     /* Verify and install the contents of the package.
      */
     int status = handle_update_package(path, &zip);
-    mzCloseZipArchive(&zip);
     return status;
 }

mtdutils/mounts.c

diff --git a/mtdutils/mounts.c b/mtdutils/mounts.c
index 2ab3ff6..c90fc8a 100644
--- a/mtdutils/mounts.c
+++ b/mtdutils/mounts.c
@@ -212,3 +212,11 @@
     }
     return ret;
 }
+
+int
+remount_read_only(const MountedVolume* volume)
+{
+    return mount(volume->device, volume->mount_point, volume->filesystem,
+                 MS_NOATIME | MS_NODEV | MS_NODIRATIME |
+                 MS_RDONLY | MS_REMOUNT, 0);
+}

mtdutils/mounts.h

diff --git a/mtdutils/mounts.h b/mtdutils/mounts.h
index 2e2765a..30b2927 100644
--- a/mtdutils/mounts.h
+++ b/mtdutils/mounts.h
@@ -28,4 +28,6 @@
 
 int unmount_mounted_volume(const MountedVolume *volume);
 
+int remount_read_only(const MountedVolume* volume);
+
 #endif  // MTDUTILS_MOUNTS_H_

mtdutils/mtdutils.c

diff --git a/mtdutils/mtdutils.c b/mtdutils/mtdutils.c
index d16f44e..48d5ea9 100644
--- a/mtdutils/mtdutils.c
+++ b/mtdutils/mtdutils.c
@@ -455,7 +455,7 @@
             if (retry > 0) {
                 fprintf(stderr, "mtd: wrote block after %d retries\n", retry);
             }
-            fprintf(stderr, "mtd: successfully wrote block at %x\n", pos);
+            fprintf(stderr, "mtd: successfully wrote block at %llx\n", pos);
             return 0;  // Success!
         }
 

updater/updater.c

diff --git a/updater/updater.c b/updater/updater.c
index 6537a94..aa626d2 100644
--- a/updater/updater.c
+++ b/updater/updater.c
@@ -136,7 +136,9 @@
         free(result);
     }
 
-    mzCloseZipArchive(&za);
+    if (updater_info.package_zip) {
+        mzCloseZipArchive(updater_info.package_zip);
+    }
     free(script);
 
     return 0;