gid_t gid;
char *dest;
char *path;
- char *hash;
+ char *hash, *ohash;
+ char *mds, *omds;
char *target;
+ char *pkglist; /* space separated */
time_t mtime;
mode_t mode;
int ftype;
+ int configuration;
struct timespec times[2];
};
struct config *conf = f;
char *dest;
struct stat st;
+ int flags = 0;
dest = COL("dest");
if (!dest) return seterror(conf,"no file dest");
}
if (S_ISDIR(st.st_mode)) {
- if (conf->verbose) {
- fprintf(stderr, "rmdir(%s)\n", dest);
- }
- rmdir(dest);
- } else if (S_ISREG(st.st_mode)) {
- /* TODO conf to import before removal */
- if (conf->verbose) {
- fprintf(stderr, "unlink(%s)\n", dest);
- }
- if (unlink(dest) == -1) {
- return seterror(conf, "can't unlink");
- }
- } else {
- if (unlink(dest) == -1) {
- return seterror(conf, "can't unlink");
+ flags = AT_REMOVEDIR;
+ }
+ /* TODO check that expected filetype matches actual filetype */
+
+ if (conf->verbose) {
+ fprintf(stderr, "%s(%s)\n", flags ? "rmdir" : "unlink", dest);
+ }
+
+ errno = 0;
+
+ if (unlinkat(AT_FDCWD, dest, flags) == -1) {
+ switch (errno) {
+ case ENOENT:
+ break;
+ default:
+ return seterror(conf, "can't unlink");
}
}
#define D_GID 0x80
#define D_MODE 0x100
#define D_MTIME 0x200
+#define D_OHASH 0x400
#define D_ERROR 0x1000
#define D_STATERROR 0x2000
#define D_RLERROR 0x4000
if (strcmp(n->hash, ehash) != 0) {
diff |= D_HASH;
}
+ if (n->ohash && strcmp(n->ohash, ehash) != 0) {
+ diff |= D_OHASH;
+ }
}
if (n->hash && etype == S_IFLNK && stat_type == S_IFLNK) {
lsize = readlink(n->dest, link, sizeof link);
n->mode = strtoul(val, NULL, 8);
+ val = COL("configuration");
+ if (!val) {
+ seterror(conf, "can't determine config status");
+ return 0;
+ }
+ n->configuration = strtoul(val, NULL, 10);
+
val = COL("filetype");
if (!val || strlen(val) == 0) {
seterror(conf, "can't determine file type");
}
n->ftype = *val;
+ /* 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");
if (!n->hash) {
/* flags: 1 = set md, 2 = create leading dirs, 4 = unlink existing file,
* 8 = rmdir existing dir, 16 = return true/false
*/
+#define INS_MD 0x1
+#define INS_CLD 0x2
+#define INS_UNLINK 0x4
+#define INS_RMDIR 0x8
+#define INS_RTF 0x10
+#define INS_ZPMNEW 0x20
static int install(struct config *conf, struct nitem *item, unsigned int flags) {
int rv = 1;
struct zpm *source;
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 (conf->verbose) {
+ 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 */
+ /* We don't have the information as to which
+ * package this is a config file for, so
+ * we'll need to look it up.
+ */
+ if (diffs & D_OHASH) {
+ zpm_note_add(conf->log, nitem.pkglist,
+ nitem.path, nitem.hash,
+ "default config file update installed as %s.zpmnew", nitem.dest);
+
+ 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;
+ }
+ }
+
/* 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;
}
/* no point in running it if we're just going to
* overwrite everything
*/
- if ((conf.overwrite == 0 || conf.absorb == 0) && !conf.dryrun) {
+ if (!conf.overwrite && !conf.absorb && !conf.dryrun) {
runstage(&conf, "new", check_existing);
}