use tempfile when extracting

[zpackage] / lib / zpm.c

diff --git a/lib/zpm.c b/lib/zpm.c
index 50594477bc33cc59261a6f04102a21f4773b0134..f0a0ba256888317757b37f9df104fca9b8f25131 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -333,6 +333,8 @@ static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
                        if (!zpm->dberrmsg) {
                                zpm->error = 1;
                        }
+               } else {
+                       zpm->dberrmsg = 0;
                }
        }
 }
@@ -357,7 +359,7 @@ int zpm_init(struct zpm *pkg, char *path) {
                        sqlite3_close(db);
                }
                fprintf(stderr, "error (%d): %s: %s\n", rc,
-                               pkg->dberrmsg, path);
+                               pkg->dberrmsg ? pkg->dberrmsg : "null", path);
 
                return 0;
        }
@@ -445,18 +447,21 @@ int zpm_addvercmp(struct zpm *pkg) {
                        );
 }
 
-int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
+int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
        int rc;
-
        int blobsize;
-       //int64_t size;
        void *xzdata;
        int type;
-       FILE *out;
+       int out;
        sqlite3_stmt *ifile;
+       size_t len;
+       char *tmpfile = 0;
+       sqlite3 *db;
 
-       /* TODO check null */
-       sqlite3 *db = pkg->db;
+       if (!pkg || !pkg->db) {
+               return 0;
+       }
+       db = pkg->db;
 
        rc = sqlite3_prepare(db, "select size, content from files where hash = ?", -1, &ifile,0);
        if (rc != SQLITE_OK) {
@@ -505,26 +510,55 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
        blobsize = sqlite3_column_bytes(ifile, 1);
 
        if (strcmp(path, "-")) {
-               out = fopen(path, "w");
+               len = strlen(path);
+               tmpfile = malloc(len+8+1);
+               if (!tmpfile) {
+                       fprintf(stderr, "malloc error\n");
+                       return 0;
+               }
+               sprintf(tmpfile, "%sXXXXXX", path);
+
+               out = open(tmpfile, O_CREAT|O_WRONLY|O_TRUNC, 0600);
+               if (out == -1) {
+                       fprintf(stderr, "can't open output file %s: %s\n",
+                                       tmpfile, strerror(errno));
+                       sqlite3_finalize(ifile);
+                       sqlite3_close(db);
+                       return 0;
+               }
        } else {
-               out = stdout;
+               out = 1;
        }
-       if (!out) {
-               fprintf(stderr, "can't open output file %s\n", path);
-               sqlite3_finalize(ifile);
-               sqlite3_close(db);
-               return 0;
-       }
-       //fwrite(xzdata, blobsize, 1, stdout);
 
-       //fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
+#if 0
+       fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
+#endif
        uncompresslzma(xzdata, blobsize, out);
-       fclose(out);
-       chmod(path, mode);
-
+       close(out);
        sqlite3_finalize(ifile);
 
-       return 1;
+       rc = 1;
+       if (tmpfile) {
+               if (chmod(tmpfile, mode) == -1) {
+                       fprintf(stderr, "can't chmod %s: %s\n", tmpfile,
+                                       strerror(errno));
+                       rc = 0;
+               } else if (rename(tmpfile, path) == -1) {
+                       fprintf(stderr, "extract rename failed: %s\n",
+                                       strerror(errno));
+                       rc = 0;
+               }
+       }
+
+       if (rc == 0 && tmpfile) {
+               if (unlink(tmpfile) == -1) {
+                       fprintf(stderr, "unlink tmpfile %s fail: %s\n",
+                                       tmpfile,
+                                       strerror(errno));
+               }
+       }
+
+       return rc;
 }
 
 static int run_for_hash(sqlite3 *db, char *sql, char *hash) {