X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Fzpm.c;h=30e8dc81cdeb15617f5a8089533d792898445373;hb=94119dbdd3030415abee60b3946193082239e936;hp=6827caf629a13693cea6fb3bc73741f5d928b3b3;hpb=e92a165344556d728332e211425d371f43a7ac8b;p=zpackage

diff --git a/lib/zpm.c b/lib/zpm.c
index 6827caf..30e8dc8 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -323,6 +323,20 @@ struct zpm *zpm_clearmem(struct zpm *zpm) {
 	return zpm;
 }
 
+static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
+	if (zpm) {
+		if (zpm->dberrmsg) {
+			free(zpm->dberrmsg);
+		}
+		if (msg) {
+			zpm->dberrmsg = strdup(msg);
+			if (!zpm->dberrmsg) {
+				zpm->error = 1;
+			}
+		}
+	}
+}
+
 int zpm_init(struct zpm *pkg, char *path) {
 	int rc;
 	sqlite3 *db = 0;
@@ -336,8 +350,15 @@ int zpm_init(struct zpm *pkg, char *path) {
 
 	rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
 	if (rc) {
-		SQLERROR(sqlite3_errmsg(db));
-		sqlite3_close(db);
+		pkg->error = 1;
+		pkg->dbresult = rc;
+		zpm_set_db_errmsg(pkg, sqlite3_errstr(rc));
+		if (db) {
+			sqlite3_close(db);
+		}
+		fprintf(stderr, "error (%d): %s: %s\n", rc,
+				pkg->dberrmsg, path);
+
 		return 0;
 	}
 	pkg->db   = db;