X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/6c39ec6d05467457c590ec93ad98c179be6618af..164c2063204d266072153bfaf499540d0df2c647:/dump-runlisp-image.c

diff --git a/dump-runlisp-image.c b/dump-runlisp-image.c
index 7bd9eba..7d1d88f 100644
--- a/dump-runlisp-image.c
+++ b/dump-runlisp-image.c
@@ -982,6 +982,9 @@ static void finish_job(struct job *job)
        * job, because the chances are good that it failed to produce the
        * image properly.
        */
+      if (verbose >= 3)
+	moan("rename completed Lisp `%s' image `%s' to `%s'",
+	     JOB_NAME(job), job->imgnew, job->imghash);
       if (rename(job->imgnew, job->imghash)) {
 	fprintf(job->log, "%-13s > failed to rename Lisp `%s' "
 			  "output image `%s' to `%s': %s",
@@ -1001,6 +1004,9 @@ static void finish_job(struct job *job)
 	    JOB_NAME(job), job->imgnewlink, strerror(errno));
 	break;
       }
+      if (verbose >= 3)
+	moan("establish Lisp `%s' image link `%s' referring to `%s'",
+	     JOB_NAME(job), job->imglink, job->imghash);
       if (symlink(p, job->imgnewlink)) {
 	bad("failed to create Lisp `%s' image link `%s': %s",
 	    JOB_NAME(job), job->imgnewlink, strerror(errno));
@@ -1011,11 +1017,15 @@ static void finish_job(struct job *job)
 	    JOB_NAME(job), job->imgnewlink, job->imglink, strerror(errno));
 	break;
       }
-      if (job->oldimg && STRCMP(job->oldimg, !=, job->imghash) &&
-	  unlink(job->oldimg) && errno != ENOENT) {
-	if (verbose >= 1)
-	  moan("failed to delete old Lisp `%s' image `%s': %s",
-	       JOB_NAME(job), job->oldimg, strerror(errno));
+      if (job->oldimg && STRCMP(job->oldimg, !=, job->imghash)) {
+	if (verbose >= 3)
+	  moan("remove old Lisp `%s' image `%s'",
+	       JOB_NAME(job), job->oldimg);
+	if (unlink(job->oldimg) && errno != ENOENT) {
+	  if (verbose >= 1)
+	    moan("failed to delete old Lisp `%s' image `%s': %s",
+		 JOB_NAME(job), job->oldimg, strerror(errno));
+	}
       }
 
       /* I think we're all done. */
@@ -1318,7 +1328,7 @@ static void version(FILE *fp)
 static void usage(FILE *fp)
 {
   fprintf(fp, "\
-usage: %s [-RUadfinqrv] [+RUdfinr] [-c CONF] [-o [SECT:]VAR=VAL]\n\
+usage: %s [-RUafinqrv] [+RUfinr] [-c CONF] [-o [SECT:]VAR=VAL]\n\
 	[-O FILE|DIR] [-j NJOBS] [LISP ...]\n",
 	  progname);
 }
@@ -1345,7 +1355,6 @@ Image dumping:\n\
   -R, --remove-other		Delete image files for other Lisp systems.\n\
   -U, --remove-unknown		Delete unrecognized files in image dir.\n\
   -a, --all-configured		Select all configured implementations.\n\
-  -d, --cleanup			Delete images which are no longer wanted.\n\
   -f, --force			Dump images even if they already exist.\n\
   -i, --check-installed		Check Lisp systems exist before dumping.\n\
   -j, --jobs=NJOBS		Run up to NJOBS jobs in parallel.\n\
@@ -1408,6 +1417,7 @@ int main(int argc, char *argv[])
   /* Initial setup. */
   set_progname(argv[0]);
   init_config();
+  srand(time(0));
 
   /* Parse the options. */
   optprog = (/*unconst*/ char *)progname;
@@ -1421,7 +1431,7 @@ int main(int argc, char *argv[])
     break
 
   for (;;) {
-    i = mdwopt(argc - 1, argv + 1, "hVO:R+U+ac:d+f+i+j:n+o:qr+v", opts, 0, 0,
+    i = mdwopt(argc - 1, argv + 1, "hVO:R+U+ac:f+i+j:n+o:qr+v", opts, 0, 0,
 	       OPTF_NEGATION | OPTF_NOPROGNAME);
     if (i < 0) break;
     switch (i) {
@@ -1648,7 +1658,7 @@ int main(int argc, char *argv[])
 	     JOB_NAME(job), job->oldimg);
     } else {
       if (verbose >= 2)
-	moan("deleting `%s' image `%s' (dry run)",
+	moan("deleting `%s' image `%s'",
 	     JOB_NAME(job), job->imglink);
       if (unlink(job->imglink) && errno != ENOENT)
 	bad("failed to delete `%s' image link `%s': %s",