char *dest;
char *path;
char *hash, *ohash;
+ char *mds, *omds;
char *target;
+ char *pkglist; /* space separated */
time_t mtime;
mode_t mode;
int ftype;
- int configuration;
+ int configuration, oldwasconf;
struct timespec times[2];
};
#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 */
}
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) {
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 };
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) {
}
n->ftype = *val;
- n->ohash = COL("hash");
+ /* these can be null */
+ n->ohash = COL("ohash");
+ n->mds = COL("mds");
+ n->omds = COL("omds");
+ n->pkglist = COL("pkglist");
if (n->ftype == 'r') {
n->hash = COL("hash");
}
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;
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);
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;
}
}
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;
}
return success;
}
+/*
+ * 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 (!n->oldwasconf) {
+ return 0;
+ }
+
+ /* 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 (!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, "dry-run: would replace config file %s with non-config file\n", n->dest);
+ }
+ return 0;
+ }
+
+ int sametype = (!(diffs & D_TYPE));
+ int isdir = (diffs & D_ISDIR);
+ int eisdir = (diffs & D_EISDIR);
+
+ /* both old and new are config files */
+ if (isdir && sametype) {
+ /* 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;
+ }
+
+ if (isdir) {
+ char hash[ZPM_HASH_STRLEN+1];
+
+ /* replacing old file with new directory */
+ /* absorb, make note */
+ 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, "dry-run: would replace config file %s with config directory\n", n->dest);
+ }
+ return 0;
+ }
+
+ if (eisdir) {
+ /* replacing old conf directory with a conf file.
+ * nothing needs to be done, if the directory
+ * is empty, it's ok to remove. if it's not empty,
+ * the install will fail
+ */
+ return 0;
+ }
+
+ /* 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;
+ }
+
+ /* new is different than on disk, and disk different than old */
+ /* log */
+ 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;
+
+}
+
static int install_files(void *f, int ncols, char **vals, char **cols) {
struct config *conf = f;
struct nitem nitem;
struct stat existing;
int update = 0;
- char dest[4096];
/* TODO put the result row in a hash table. May not actually
* be faster
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);
return install(conf, &nitem, 3);
}
- if (nitem.configuration) {
- /* ohash == nhash, not an update */
- /* fhash == ohash, just update */
- /* fhash != ohash, install as dest.zpmnew, warn */
- /* TODO handle replacing config file
- * with config directory */
- if (diffs & D_OHASH) {
- if (strlen(nitem.dest) > sizeof dest - 8) {
- return seterror(conf,"config file path too long for install as %s.zpmnew", nitem.dest);
- }
- fprintf(stderr, "installing as .zpmnew\n");
- sprintf(dest, "%s.zpmnew", nitem.dest);
- nitem.dest = dest;
- }
+ switch (adjust_for_config(conf, &nitem, diffs)) {
+ case -1: return conf->errabort; break;
+ case 1:
+ fprintf(stderr, "skipping changed default config file: %s\n", nitem.dest);
+ return 0; break;
+ default: break;
}
/* file exists in filesystem */
if (sametype) {
if (mdsame && hashsame) {
- fprintf(stderr, "%s should not be an update", nitem.dest);
- /* warn, bug in logic. This shouldn't
- * occur, because if there is nothing
- * to do, it shouldn't be listed
- * as an update
+ /* warn, bug in logic. This shouldn't occur,
+ * because if there is nothing to do, it
+ * shouldn't be listed as an update
*/
+ /* could be an update. We're checking against
+ * what's actually on disk, not what was
+ * expected to have been on disk. So, if
+ * the admin has modified the file, or if
+ * it had been installed ignoring the user
+ * and group, it might be correct on disk
+ * but not as in the local database
+ */
+ /* TODO detect whether this a logic bug or
+ * an on-disk difference
+ */
+#if 0
+ fprintf(stderr, "%s should not be an update\n", nitem.dest);
+ fprintf(stderr, "old hash: %s\n", nitem.ohash);
+ fprintf(stderr, "new hash: %s\n", nitem.hash);
+ fprintf(stderr, "old mds: %s\n", nitem.omds);
+ fprintf(stderr, "new mds: %s\n", nitem.mds);
+#endif
/* do nothing */
return 0;
}
return install(conf, &nitem, 7);
}
/* error, should not be possible, assert(0)? */
+ fprintf(stderr,"impossible state: %s:%d\n", __func__, __LINE__);
}
if (installing) {
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 */
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);
projects / zpackage / blobdiff