X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-syncfs.c;h=ce0c0bb85f20fa5777a092f0dec92e8731b12b0e;hb=8725eb08d773c71a6d9ec2ca6770193e978d3a8d;hp=ecc66c84f8bec7df14a66bd2ad21a50e8fe81431;hpb=2e468963f264e40379425a83048000965320a78e;p=zpackage

diff --git a/zpm-syncfs.c b/zpm-syncfs.c
index ecc66c8..ce0c0bb 100644
--- a/zpm-syncfs.c
+++ b/zpm-syncfs.c
@@ -47,7 +47,7 @@ struct nitem {
 	time_t mtime;
 	mode_t mode;
 	int ftype;
-	int configuration;
+	int configuration, oldwasconf;
 	struct timespec times[2];
 };
 
@@ -334,19 +334,35 @@ static int remove_files(void *f, int ncols, char **vals, char **cols) {
 
 #define MARK fprintf(stderr, "%s %d: mark\n", __func__, __LINE__)
 
+/* file does not exist */
 #define D_NOEXIST 0x1
+/* files are different types */
 #define D_TYPE 0x2
+/* metadata is different */
 #define D_MD 0x4
+/* content or link target is different */
 #define D_HASH 0x8
+/* file to be installed is a directory */
 #define D_ISDIR  0x10
+/* path on disk is a directory */
 #define D_EISDIR 0x20
+/* usernames different */
 #define D_UID 0x40
+/* group names different */
 #define D_GID 0x80
+/* file mode is different */
 #define D_MODE 0x100
+/* mtimes are different */
 #define D_MTIME 0x200
+/* the hash of the file we are supposedly replacing is different than
+ * the the hash of the file on disk
+ */
 #define D_OHASH 0x400
+/* an error occurred trying to compare the file (other than it doesn't exist */
 #define D_ERROR 0x1000
+/* there was a stat error */
 #define D_STATERROR 0x2000
+/* there was an error calling readlink */
 #define D_RLERROR 0x4000
 
 /* 1 = file doesn't exist, 2 = file is a directory, target isn't */
@@ -388,11 +404,15 @@ static unsigned int file_compare(struct nitem *n, struct stat *st) {
 		}
 		if (n->hash && etype == S_IFLNK && stat_type == S_IFLNK) {
 			lsize = readlink(n->dest, link, sizeof link);
+
 			if (lsize == -1 || lsize == sizeof link) {
 				diff |= D_RLERROR;
 				diff |= D_ERROR;
-			} else if (strcmp(n->target, link) != 0) {
-				diff |= D_HASH;
+			} else {
+				link[lsize] = 0;
+				if (strcmp(n->target, link) != 0) {
+					diff |= D_HASH;
+				}
 			}
 		}
 		if (n->uid != st->st_uid) {
@@ -420,6 +440,7 @@ static unsigned int file_compare(struct nitem *n, struct stat *st) {
 static int read_item(struct config *conf, int ncols, char **vals, char **cols,
 		struct nitem *n) {
 	char *val;
+	long lval;
 	struct passwd *pw;
 	struct group *gr;
 	struct nitem zero = { 0 };
@@ -474,7 +495,10 @@ static int read_item(struct config *conf, int ncols, char **vals, char **cols,
 		seterror(conf, "can't determine config status");
 		return 0;
 	}
-	n->configuration = strtoul(val, NULL, 10);
+	lval = strtol(val, NULL, 10);
+
+	n->configuration = ((lval & 1) != 0);
+	n->oldwasconf = ((lval & 2) != 0);
 
 	val = COL("filetype");
 	if (!val || strlen(val) == 0) {
@@ -532,7 +556,7 @@ static int read_item(struct config *conf, int ncols, char **vals, char **cols,
 		}
 		gr = getgrnam(val);
 		if (!gr) {
-			seterror(conf, "no group entry");
+			seterror(conf, "no group entry for %s", val);
 			return 0;
 		}
 		n->gid = gr->gr_gid;
@@ -583,9 +607,11 @@ static int set_md(struct config *conf, struct nitem *item) {
 	int success = 0;
 
 	if (conf->dryrun) {
-		printf("chmod %o %s\n", item->mode, item->dest);
+		if (item->ftype != 'l') {
+			printf("chmod %o %s\n", item->mode, item->dest);
+		}
 		if (conf->setuser && conf->setgroup) {
-			printf("chown %d:%d %s\n", item->uid, item->gid,
+			printf("lchown %d:%d %s\n", item->uid, item->gid,
 					item->dest);
 		}
 		printf("mtime %.0f %s\n", (double)item->mtime, item->dest);
@@ -593,17 +619,20 @@ static int set_md(struct config *conf, struct nitem *item) {
 		return success;
 	}
 
-	rv = chmod(item->dest, item->mode);
+	/* can't chmod a symlink */
+	if (item->ftype != 'l') {
+		rv = chmod(item->dest, item->mode);
 
-	if (rv == -1) {
-		setsyserr(conf, "can't chmod %o %s", item->mode, item->dest);
-		return conf->errabort;
+		if (rv == -1) {
+			setsyserr(conf, "can't chmod %o %s", item->mode, item->dest);
+			return conf->errabort;
+		}
 	}
 
 	if (conf->setuser && conf->setgroup) {
-		rv = chown(item->dest, item->uid, item->gid);
+		rv = lchown(item->dest, item->uid, item->gid);
 		if (rv == -1) {
-			setsyserr(conf, "can't chown %s", item->dest);
+			setsyserr(conf, "can't lchown %s", item->dest);
 			return conf->errabort;
 		}
 	}
@@ -652,9 +681,13 @@ static int install(struct config *conf, struct nitem *item, unsigned int flags)
 			printf("rmdir %s\n", item->dest);
 		}
 
-		printf("install %c%o %d:%d %s -> %s\n", item->ftype,
-				item->mode, item->uid, item->gid, item->path,
+		printf("install %c%o %d:%d %s", item->ftype,
+				item->mode, item->uid, item->gid,
 				item->dest);
+		if (item->ftype == 'l') {
+			printf(" -> %s", item->target);
+		}
+		printf("\n");
 		fflush(stdout);
 		return success;
 	}
@@ -710,26 +743,37 @@ static int install(struct config *conf, struct nitem *item, unsigned int flags)
 }
 
 /*
- *
+ * figure out what the difference is for a config file, only called
+ * for an update of a configuration file
+ * return -1 on an error
+ * return 1 if the new file should not be installed
+ * return 0 if the new file should be installed
  */
 static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 		diffs) {
-#if 0
+
 	if (!n->oldwasconf) {
 		return 0;
 	}
-#endif
+	
 	/* TODO what if old was a directory? */
 	if (!n->configuration) {
 		/* replacing conf with non-conf */
 		/* absorb file, mark todo */
 		char hash[ZPM_HASH_STRLEN+1];
-		if (zpm_import(conf->log, n->dest, 0, hash)) {
-			zpm_note_add(conf->log, n->pkglist, n->dest, hash,
-					"replaced config file with non-config.  zpm-cat %.8s", hash);
+		if (!conf->dryrun) {
+			if (conf->verbose) {
+				fprintf(stderr, "importing old conf file\n");
+			}
+			if (zpm_import(conf->log, n->dest, 0, hash)) {
+				zpm_note_add(conf->log, n->pkglist, n->dest, hash,
+						"replaced config file with non-config.  zpm-cat %.8s", hash);
+			} else {
+				fprintf(stderr, "unable to import existing config file %s\n", n->dest);
+				return -1;
+			}
 		} else {
-			fprintf(stderr, "unable to import existing config file %s\n", n->dest);
-			return 1;
+			fprintf(stderr, "dry-run: would replace config file %s with non-config file\n", n->dest);
 		}
 		return 0;
 	}
@@ -743,6 +787,9 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 		/* both config directories, can only be changing
 		 * metadata, so no adjustment needed
 		 */
+			if (conf->verbose) {
+				fprintf(stderr, "both config dirs, ok to update\n");
+			}
 		return 0;
 	}
 
@@ -751,14 +798,18 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 
 		/* replacing old file with new directory */
 		/* absorb, make note */
-		if (zpm_import(conf->log, n->dest, 0, hash)) {
-			zpm_note_add(conf->log, n->pkglist, n->dest, hash,
-					"replaced config file with config directory.  zpm-cat %.8s", hash);
+		if (!conf->dryrun) {
+			if (zpm_import(conf->log, n->dest, 0, hash)) {
+				zpm_note_add(conf->log, n->pkglist, n->dest, hash,
+						"replaced config file with config directory.  zpm-cat %.8s", hash);
+			} else {
+				fprintf(stderr, "unable to import existing config file %s\n", n->dest);
+				return -1;
+			}
 		} else {
-			fprintf(stderr, "unable to import existing config file %s\n", n->dest);
-			return -1;
+			fprintf(stderr, "dry-run: would replace config file %s with config directory\n", n->dest);
 		}
-		return 0;
+			return 0;
 	}
 
 	if (eisdir) {
@@ -773,11 +824,17 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 	/* replacing old file with new file */
 	/* new is same as on disk */
 	if (!(diffs & D_HASH)) {
+			if (conf->verbose) {
+				fprintf(stderr, "new config file is already on disk, probably shouldn't happen\n");
+			}
 		return 0;
 	}
 
 	/* new is different than on disk, but on disk is same as old */
 	if (!(diffs & D_OHASH)) {
+			if (conf->verbose) {
+				fprintf(stderr, "old config file not changed from default, replacing with new default\n");
+			}
 		/* ok to do the update, since same as default */
 		fprintf(stderr, "updating default config %s\n", n->dest);
 		return 0;
@@ -785,9 +842,17 @@ static int adjust_for_config(struct config *conf, struct nitem *n, unsigned int
 
 	/* new is different than on disk, and disk different than old */
 	/* log */
-	zpm_note_add(conf->log, n->pkglist, n->dest, n->hash,
-			"default config file update.  zpm-cat %.8s", n->hash);
-	/* TODO check for note error */
+	if (conf->verbose) {
+		fprintf(stderr, "new default config file is different than on disk, and old default was changed, should keep on-disk config\n");
+	}
+	if (!conf->dryrun) {
+		zpm_note_add(conf->log, n->pkglist, n->dest, n->hash,
+				"default config file update.  zpm-cat %.8s", n->hash);
+		/* TODO check for note error */
+	} else {
+		fprintf(stderr, "dry-run: default config file %s update\n",
+				n->dest);
+	}
 	return 1;
 
 }
@@ -806,6 +871,12 @@ static int install_files(void *f, int ncols, char **vals, char **cols) {
 		return conf->errabort;
 	}
 
+#if 0
+	int64_t used, high;
+	used = sqlite3_memory_used()/1024/1024;
+	high = sqlite3_memory_highwater(0)/1024/1024;
+	fprintf(stderr, "memory = %ld MB / %ld MB\n", used, high);
+#endif
 	if (conf->verbose && !conf->dryrun) {
 		fprintf(stderr, "%s '%c' %s\n", nitem.opstr, nitem.ftype,
 				nitem.dest);
@@ -940,23 +1011,49 @@ static int install_files(void *f, int ncols, char **vals, char **cols) {
 			if (mdsame && hashsame && (accept || overwrite)) {
 				/* do nothing */
 				if (conf->dryrun || conf->verbose) {
-					fprintf(stderr, "accepting existing file: %s\n", nitem.dest);
+					fprintf(stderr, "accept %s: %s\n",
+							eisdir ? "directory" : "file", nitem.dest);
 				}
 				return 0;
 			}
+
 			if (mdsame && hashsame && !(accept || overwrite)) {
 				/* error */
-				return seterror(conf, "will not accept or overwrite existing file: %s", nitem.dest);
+				return seterror(conf, "file exists: %s", nitem.dest);
 			}
+
 			if (mdsame && !hashsame && overwrite) {
 				/* install */
 				return install(conf, &nitem, eisdir ? 11 : 7);
 			}
+
+			if (nitem.configuration && accept) {
+				/* accept a changed config file */
+				if (conf->dryrun || conf->verbose) {
+					fprintf(stderr, "accept %smodified config %s: %s\n", (!mdsame || !hashsame) ? "" : "un", 
+							eisdir ? "directory" : "file", nitem.dest);
+				}
+				return 0;
+			}
+
 			if (mdsame && !hashsame && !overwrite) {
 				/* accept doesn't matter, since it's
 				 * not an acceptable file */
 				/* error */
-				return seterror(conf, "%s (hashdiff): %s", accept ? "existing file not acceptable" : "file exists", nitem.dest);
+				if (nitem.ftype == 'l') {
+					char link[1024];
+					ssize_t lsize;
+					lsize = readlink(nitem.dest, link, sizeof link);
+					if (lsize == -1 || (size_t)lsize >= sizeof link) {
+						return seterror(conf, "%s (linkdiff): expecting %s -> %s, unable to read link", accept ? "existing file not acceptable" : "file exists", nitem.dest, nitem.target, link);
+					} else {
+						link[lsize] = 0;
+						/* links must be different */
+						return seterror(conf, "%s (linkdiff): expecting %s -> %s, have -> %s", accept ? "existing file not acceptable" : "file exists", nitem.dest, nitem.target, link);
+					}
+				} else {
+					return seterror(conf, "%s (hashdiff): %s", accept ? "existing file not acceptable" : "file exists", nitem.dest);
+				}
 			}
 			if (!mdsame && hashsame && overwrite) {
 				/* fix md */
@@ -1211,6 +1308,7 @@ int main(int ac, char **av){
 	conf.log = &localdb;
 
 	if (pkgdbfile) {
+		/* TODO open read-only */
 		if (!zpm_open(&pkgdb, pkgdbfile)) {
 			fprintf(stderr, "can't open src db %s\n", localdbfile);
 			exit(EXIT_FAILURE);