int errabort, errors, verbose, dryrun, conflicts;
int setuser, setgroup;
int reverse, exitonerror;
- int overwrite, absorb;
+ int overwrite, accept, acceptdir, ignoredirmd;
+ int ops_total, ops_completed;
+ int ops_remove, ops_remove_completed;
+ int ops_update, ops_update_completed;
+ int ops_install, ops_install_completed;
+ int progress; /* type of progress meter */
};
struct nitem {
printf("usage: zpm $scriptname [-fncC] args ...\n");
}
+static void pdots(int len, int ch, int was, int now, int total) {
+ was = len * was / total;
+ if (now > total) {
+ now = total;
+ }
+ now = len * now / total;
+ while (was++ < now) {
+ putchar(ch);
+ }
+ fflush(stdout);
+}
+
static int seterror(struct config *conf, char *msgfmt, ...) {
char msg[1024];
va_list ap;
return 0;
}
-static int check_existing(void *f, int ncols, char **vals, char **cols) {
- struct config *conf = f;
- char *path;
- 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 };
+
+ *n = zero;
- path = COL("dest");
- if (!path) {
- return seterror(conf, "no path");
+ val = COL("op");
+ if (!val) {
+ seterror(conf, "can't determine op");
+ return 0;
+ }
+ n->opstr = val;
+ n->op = getop(val);
+ if (!n->op) {
+ seterror(conf, "can't determine op");
+ return 0;
}
- if (conf->dryrun) {
- printf("checkfor %s\n", path);
- fflush(stdout);
+ n->path = COL("path");
+ if (!n->path) {
+ seterror(conf, "no file path");
+ return 0;
+ }
+ if (strlen(n->path) == 0) {
+ seterror(conf, "zero length path not allowed");
return 0;
}
- if (conf->verbose) {
- fprintf(stderr, "check for existing %s\n", path);
+ /* TODO config to dishonor setuid/setgid */
+ n->dest = COL("dest");
+ if (!n->dest) {
+ seterror(conf, "no file dest");
+ return 0;
}
- if (lstat(path, &st) == 0) {
- fprintf(stderr, "%s exists\n", path);
- conf->errors++;
- } else {
- switch(errno) {
- /* not an error, file shouldn't exist*/
- case ENOENT: break;
- default:
- fprintf(stderr, "unable to check %s: %s\n",
- path, strerror(errno));
- conf->errors++;
- break;
- }
+ if (strlen(n->dest) == 0) {
+ seterror(conf, "zero length dest not allowed");
+ return 0;
}
- return 0;
-}
-static int remove_files(void *f, int ncols, char **vals, char **cols) {
- struct config *conf = f;
- char *dest;
- struct stat st;
- int flags = 0;
+ val = COL("mode");
- dest = COL("dest");
- if (!dest) return seterror(conf,"no file dest");
+ if (!val) {
+ seterror(conf, "can't determine mode");
+ return 0;
+ }
- if (conf->dryrun) {
- char *ftype = COL("filetype");
- int t = *ftype;
+ n->mode = strtoul(val, NULL, 8);
- switch(t) {
- case 'd': printf("rmdir %s\n", dest); break;
- default: printf("unlink %s\n", dest); break;
- }
- fflush(stdout);
+ val = COL("configuration");
+ if (!val) {
+ seterror(conf, "can't determine config status");
return 0;
}
+ lval = strtol(val, NULL, 10);
- if (lstat(dest, &st) == -1) {
- return seterror(conf,"can't stat");
- }
+ n->configuration = ((lval & 1) != 0);
+ n->oldwasconf = ((lval & 2) != 0);
- if (S_ISDIR(st.st_mode)) {
- flags = AT_REMOVEDIR;
+ val = COL("filetype");
+ if (!val || strlen(val) == 0) {
+ seterror(conf, "can't determine file type");
+ return 0;
}
- /* TODO check that expected filetype matches actual filetype */
+ n->ftype = *val;
- if (conf->verbose) {
- fprintf(stderr, "%s(%s)\n", flags ? "rmdir" : "unlink", dest);
+ /* 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) {
+ seterror(conf, "can't get hash");
+ return 0;
+ }
+ } else if (n->ftype == 'l') {
+ n->target = COL("target");
+ if (!n->target) {
+ seterror(conf, "can't get target");
+ return 0;
+ }
+ if (strlen(n->target) == 0) {
+ seterror(conf, "zero length target not allowed");
+ return 0;
+ }
+ n->hash = n->target;
}
- errno = 0;
+ if (conf->setuser) {
+ val = COL("username");
+ if (!val) {
+ seterror(conf, "no username");
+ return 0;
+ }
+ pw = getpwnam(val);
+ if (!pw) {
+ seterror(conf, "no passwd entry");
+ return 0;
+ }
+ n->uid = pw->pw_uid;
+ } else {
+ n->uid = geteuid();
+ }
- if (unlinkat(AT_FDCWD, dest, flags) == -1) {
- switch (errno) {
- case ENOENT:
- break;
- default:
- return seterror(conf, "can't unlink");
+ if (conf->setgroup) {
+ val = COL("groupname");
+ if (!val) {
+ seterror(conf, "no groupname");
+ return 0;
+ }
+ gr = getgrnam(val);
+ if (!gr) {
+ seterror(conf, "no group entry for %s", val);
+ return 0;
}
+ n->gid = gr->gr_gid;
+ } else {
+ n->gid = getegid();
}
-
- return 0;
-}
-#define MARK fprintf(stderr, "%s %d: mark\n", __func__, __LINE__)
+ errno = 0;
+ double mtime = strtod(COL("mtime"),NULL);
+ if (errno) {
+ mtime = (double)time(NULL);
+ }
+
+ n->mtime = (time_t)mtime;
+
+ n->times[0].tv_sec = 0;
+ n->times[0].tv_nsec = UTIME_OMIT;
+ n->times[1].tv_sec = (time_t)llrint(floor(mtime));
+ n->times[1].tv_nsec = lrint(floor(fmod(mtime,1.0)*1000000000));
+
+ return 1;
+}
/* file does not exist */
#define D_NOEXIST 0x1
return diff;
}
-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 };
- *n = zero;
+/* 0 = not acceptable
+ * 1 = accept and create/update/remove
+ * 2 = accept as is
+ * 3 = remove and overwrite
+ * 4 = update metadata
+ */
+static int acceptable(struct config *conf, unsigned int diffs, int op) {
+ int exist = (!(diffs & D_NOEXIST));
+ int sametype = (!(diffs & D_TYPE));
+ int mdsame = (!(diffs & D_MD));
+ int hashsame = (!(diffs & D_HASH));
+ int isdir = (diffs & D_ISDIR);
- val = COL("op");
- if (!val) {
- seterror(conf, "can't determine op");
- return 0;
- }
- n->opstr = val;
- n->op = getop(val);
- if (!n->op) {
- seterror(conf, "can't determine op");
- return 0;
+ if (!exist) {
+ return op == OP_REMOVE ? 2 : 1;
}
- n->path = COL("path");
- if (!n->path) {
- seterror(conf, "no file path");
- return 0;
+ if (op == OP_UPDATE) {
+ return sametype ? 4 : 3;
}
- if (strlen(n->path) == 0) {
- seterror(conf, "zero length path not allowed");
- return 0;
+
+ if (op == OP_REMOVE) {
+ return 1;
}
- /* TODO config to dishonor setuid/setgid */
- n->dest = COL("dest");
- if (!n->dest) {
- seterror(conf, "no file dest");
- return 0;
+ /* the hard cases, should be installing new, but already exists */
+
+ if (!sametype) {
+ return conf->overwrite ? 3 : 0;
}
- if (strlen(n->dest) == 0) {
- seterror(conf, "zero length dest not allowed");
- return 0;
+ if (mdsame && (conf->accept || conf->overwrite)) {
+ return 1;
}
- val = COL("mode");
+ if (isdir) {
+ if (mdsame || conf->ignoredirmd) {
+ return conf->acceptdir ? 2 : 0;
+ }
+ if (conf->overwrite) {
+ return 4;
+ }
+ }
- if (!val) {
- seterror(conf, "can't determine mode");
- return 0;
+ if (hashsame && (conf->accept || conf->overwrite)) {
+ return 1;
}
- n->mode = strtoul(val, NULL, 8);
+ return conf->overwrite ? 3 : 0;
+}
- val = COL("configuration");
- if (!val) {
- seterror(conf, "can't determine config status");
- return 0;
+static int check_existing(void *f, int ncols, char **vals, char **cols) {
+ struct config *conf = f;
+ struct stat st;
+ struct nitem nitem;
+
+ if (!read_item(conf, ncols, vals, cols, &nitem)) {
+ fprintf(stderr, "can't read item\n");
+ return conf->errabort;
}
- lval = strtol(val, NULL, 10);
- n->configuration = ((lval & 1) != 0);
- n->oldwasconf = ((lval & 2) != 0);
+ if (conf->verbose > 1) {
+ fprintf(stderr, "check for existing %s\n", nitem.path);
+ }
- val = COL("filetype");
- if (!val || strlen(val) == 0) {
- seterror(conf, "can't determine file type");
+ if (lstat(nitem.path, &st) == -1) {
+ switch(errno) {
+ /* not an error, file shouldn't exist*/
+ case ENOENT: break;
+ default:
+ fprintf(stderr, "unable to check %s: %s\n",
+ nitem.path, strerror(errno));
+ conf->errors++;
+ break;
+ }
return 0;
}
- n->ftype = *val;
- /* these can be null */
- n->ohash = COL("ohash");
- n->mds = COL("mds");
- n->omds = COL("omds");
- n->pkglist = COL("pkglist");
+ unsigned int diffs = file_compare(&nitem, &st);
+ if (diffs >= D_ERROR) {
+ return seterror(conf, "can't check %s", nitem.dest);
+ }
- if (n->ftype == 'r') {
- n->hash = COL("hash");
- if (!n->hash) {
- seterror(conf, "can't get hash");
- return 0;
- }
- } else if (n->ftype == 'l') {
- n->target = COL("target");
- if (!n->target) {
- seterror(conf, "can't get target");
- return 0;
- }
- if (strlen(n->target) == 0) {
- seterror(conf, "zero length target not allowed");
- return 0;
+ int action = acceptable(conf, diffs, nitem.op);
+ if (!action) {
+ if (conf->accept) {
+ fprintf(stderr, "%s exists and is not acceptable\n", nitem.path);
+ } else {
+ fprintf(stderr, "%s exists\n", nitem.path);
}
- n->hash = n->target;
+ conf->errors++;
}
- if (conf->setuser) {
- val = COL("username");
- if (!val) {
- seterror(conf, "no username");
- return 0;
- }
- pw = getpwnam(val);
- if (!pw) {
- seterror(conf, "no passwd entry");
- return 0;
+ return 0;
+}
+
+static int remove_files(void *f, int ncols, char **vals, char **cols) {
+ struct config *conf = f;
+ char *dest;
+ struct stat st;
+ int flags = 0;
+
+ dest = COL("dest");
+ if (!dest) return seterror(conf,"no file dest");
+
+ if (conf->dryrun) {
+ char *ftype = COL("filetype");
+ int t = *ftype;
+
+ switch(t) {
+ case 'd': printf("rmdir %s\n", dest); break;
+ default: printf("unlink %s\n", dest); break;
}
- n->uid = pw->pw_uid;
- } else {
- n->uid = geteuid();
+ fflush(stdout);
+ return 0;
}
- if (conf->setgroup) {
- val = COL("groupname");
- if (!val) {
- seterror(conf, "no groupname");
- return 0;
- }
- gr = getgrnam(val);
- if (!gr) {
- seterror(conf, "no group entry");
- return 0;
+ if (conf->verbose) {
+ if (conf->progress == 2) {
+ fprintf(stderr, "%s(%s)\n", flags ? "rmdir" : "unlink", dest);
+ } else if (conf->progress == 1) {
+ /* overwrite */
+ pdots(50, '.', conf->ops_completed, conf->ops_completed + 1, conf->ops_total);
+ conf->ops_completed++;
+ conf->ops_completed++;
+ } else {
+ pdots(50, '.', conf->ops_completed, conf->ops_completed + 1, conf->ops_total);
+ conf->ops_completed++;
}
- n->gid = gr->gr_gid;
- } else {
- n->gid = getegid();
}
errno = 0;
- double mtime = strtod(COL("mtime"),NULL);
- if (errno) {
- mtime = (double)time(NULL);
+
+ if (lstat(dest, &st) == -1) {
+ switch (errno) {
+ case ENOENT:
+ /* TODO chatter if verbose */
+ break;
+ default:
+ return seterror(conf, "can't stat %s: %s", dest, strerror(errno));
+ }
+ return 0;
}
- n->mtime = (time_t)mtime;
+ if (S_ISDIR(st.st_mode)) {
+ flags = AT_REMOVEDIR;
+ }
+ /* TODO check that expected filetype matches actual filetype */
- n->times[0].tv_sec = 0;
- n->times[0].tv_nsec = UTIME_OMIT;
- n->times[1].tv_sec = (time_t)llrint(floor(mtime));
- n->times[1].tv_nsec = lrint(floor(fmod(mtime,1.0)*1000000000));
- return 1;
+ errno = 0;
+
+ if (unlinkat(AT_FDCWD, dest, flags) == -1) {
+ switch (errno) {
+ case ENOENT:
+ break;
+ case ENOTEMPTY: /* fall through */
+ case EEXIST:
+ /* TODO chatter, or possibly require */
+ break;
+ default:
+ return seterror(conf, "can't unlink %s: %s", dest, strerror(errno));
+ }
+ }
+
+ return 0;
}
+#define MARK fprintf(stderr, "%s %d: mark\n", __func__, __LINE__)
+
+
static int remove_dir(struct config *conf, char *path) {
int rv;
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);
-
- if (rv == -1) {
- setsyserr(conf, "can't chmod %o %s", item->mode, item->dest);
- return conf->errabort;
+ if (conf->setuser && conf->setgroup) {
+ rv = lchown(item->dest, item->uid, item->gid);
+ if (rv == -1) {
+ setsyserr(conf, "can't lchown %s", item->dest);
+ return conf->errabort;
+ }
}
- if (conf->setuser && conf->setgroup) {
- rv = chown(item->dest, item->uid, item->gid);
+ /* have to chmod after the chown, setuid bits may (and will)
+ * be cleared after a chown
+ */
+ /* can't chmod a symlink */
+ if (item->ftype != 'l') {
+ rv = chmod(item->dest, item->mode);
+
if (rv == -1) {
- setsyserr(conf, "can't chown %s", item->dest);
+ setsyserr(conf, "can't chmod %o %s", item->mode, item->dest);
return conf->errabort;
}
}
+
rv = utimensat(AT_FDCWD, item->dest, item->times, AT_SYMLINK_NOFOLLOW);
if (rv == -1) {
setsyserr(conf, "can't set mtime %.0f %s", (double)item->mtime,
}
}
- if (item->ftype == 'r') {
- rv = zpm_extract(source, item->hash, item->dest, item->mode);
- if (rv == 0) {
- seterror(conf, "can't extract %s", item->dest);
- return failure;
- }
- return success;
- }
-
+ errno = 0;
switch (item->ftype) {
+ case 'r': rv = zpm_extract(source, item->hash, item->dest, item->mode);
+ if (rv == 0) rv = -1;
+ break;
case 'd': rv = mkdir(item->dest, item->mode);
break;
case 'l': rv = symlink(item->target, item->dest);
}
if (rv == -1) {
+ switch (item->ftype) {
+ case 'r':
+ seterror(conf, "can't extract %s", item->dest);
+ break;
+ case 'd':
+ setsyserr(conf, "install mkdir(\"%s\") failed", item->dest);
+ break;
+ case 'l':
+ setsyserr(conf, "install symlink(\"%s\") failed", item->dest);
+ break;
+ }
setsyserr(conf, "installing %s failed", item->dest);
return failure;
}
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);
+ if (conf->progress == 2) {
+ fprintf(stderr, "%s '%c' %s\n", nitem.opstr, nitem.ftype,
+ nitem.dest);
+ } else if (conf->progress == 1) {
+ /* overwrite */
+ pdots(50, '.', conf->ops_completed, conf->ops_completed + 1, conf->ops_total);
+ conf->ops_completed++;
+ conf->ops_completed++;
+ } else {
+ pdots(50, '.', conf->ops_completed, conf->ops_completed + 1, conf->ops_total);
+ conf->ops_completed++;
+ }
}
unsigned int diffs = file_compare(&nitem, &existing);
int hashsame = (!(diffs & D_HASH));
int isdir = (diffs & D_ISDIR);
int eisdir = (diffs & D_EISDIR);
- int accept = conf->absorb;
+ int accept = conf->accept;
int overwrite = conf->overwrite;
int installing = (nitem.op == OP_NEW);
update = (nitem.op == OP_UPDATE);
return 0;
}
+ if (mdsame && isdir && conf->acceptdir) {
+ return 0;
+ }
+
+ if (!mdsame && isdir && conf->ignoredirmd) {
+ /* TODO warn ignoring dir md */
+ return 0;
+ }
+
if (mdsame && hashsame && !(accept || overwrite)) {
/* error */
return seterror(conf, "file exists: %s", nitem.dest);
/* TODO final report function in conf var */
}
-int main(int ac, char **av){
+static void count_ops(struct config *conf) {
+ conf->ops_remove = zpm_db_int(conf->log, "select count(*) from syncinfo where op = 'remove'");
+ conf->ops_update = zpm_db_int(conf->log, "select count(*) from syncinfo where op = 'update'");
+ conf->ops_install = zpm_db_int(conf->log, "select count(*) from syncinfo where op = 'new'");
+ conf->ops_total = conf->ops_remove + conf->ops_update + conf->ops_install;
+}
+
+int main(int ac, char **av) {
struct zpm localdb;
struct zpm pkgdb;
int opt;
char *pkgdbfile = 0, *localdbfile = 0;
char *s;
- struct config conf;
+ struct config conf = { 0 };
conf.errabort = 1;
conf.errors = 0;
conf.rootdir = 0;
conf.reverse = 0;
conf.overwrite = 0;
- conf.absorb = 0;
+ conf.accept = 0;
+ conf.acceptdir = 1;
if (geteuid() != 0) {
conf.setuser = 0;
* args are pkgid triple, but will do a pkg find on the pkgdb
*/
- while ((opt = getopt(ac, av, "f:d:c:nCR:vOA")) != -1) {
+ while ((opt = getopt(ac, av, "f:d:c:nCR:vOAMDp")) != -1) {
switch (opt) {
case 'd': localdbfile = optarg; break;
case 'f': pkgdbfile = optarg; break;
case 'R': conf.rootdir = optarg; break;
case 'N': conf.setuser = 0; conf.setgroup = 0; break;
case 'O': conf.overwrite = 1; break;
- case 'A': conf.absorb = 1; break;
+ case 'A': conf.accept = 1; break;
+ case 'M': conf.ignoredirmd = 1;
+ case 'D': conf.acceptdir = 0;
+ case 'p': conf.progress++;
default:
usage();
exit(EXIT_FAILURE);
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);
/* no point in running it if we're just going to
* overwrite everything
*/
- if (!conf.overwrite && !conf.absorb && !conf.dryrun) {
+ if (!conf.overwrite && !conf.accept && !conf.dryrun) {
runstage(&conf, "new", check_existing);
}
if (!conf.errors) {
conf.exitonerror = conf.dryrun ? 0 : 1;
conf.errabort = conf.dryrun ? 0 : 1;
- conf.reverse = 1;
- if (conf.verbose) {
- fprintf(stderr, "removing old files\n");
+ count_ops(&conf);
+ fprintf(stderr, "file ops: %d\n", conf.ops_total);
+ if (conf.ops_remove > 0) {
+ if (conf.verbose) {
+ fprintf(stderr, "removing %d file%s\n", conf.ops_remove, conf.ops_remove > 0 ? "s" : "");
+ }
+ conf.reverse = 1;
+ conf.ops_completed = 0;
+ conf.ops_total = conf.ops_remove;
+ runstage(&conf, "remove", remove_files);
+ if (conf.verbose && conf.progress < 2) {
+ fprintf(stderr, " done\n");
+ fflush(stderr);
+ }
}
- runstage(&conf, "remove", remove_files);
- conf.reverse = 0;
- if (conf.verbose) {
- fprintf(stderr, "updating files\n");
+
+ if (conf.ops_update > 0) {
+ if (conf.verbose) {
+ fprintf(stderr, "updating %d file%s\n", conf.ops_update, conf.ops_update > 0 ? "s" : "");
+ }
+ conf.reverse = 0;
+ conf.ops_completed = 0;
+ conf.ops_total = conf.ops_update;
+ runstage(&conf, "update", install_files);
+ if (conf.verbose && conf.progress < 2) {
+ fprintf(stderr, " done\n");
+ fflush(stderr);
+ }
}
- runstage(&conf, "update", install_files);
- if (conf.verbose) {
- fprintf(stderr, "installing files\n");
+
+ if (conf.ops_install > 0) {
+ if (conf.verbose) {
+ fprintf(stderr, "installing %d file%s\n", conf.ops_install, conf.ops_install > 0 ? "s" : "");
+ }
+ conf.reverse = 0;
+ conf.ops_completed = 0;
+ conf.ops_total = conf.ops_install;
+ runstage(&conf, "new", install_files);
+ if (conf.verbose && conf.progress < 2) {
+ fprintf(stderr, " done\n");
+ fflush(stderr);
+ }
}
- runstage(&conf, "new", install_files);
}
}