lib.c (subst): Refer to the correct variable.

[runlisp] / dump-runlisp-image.c

diff --git a/dump-runlisp-image.c b/dump-runlisp-image.c
index 9dc6a2a70e63902a1d803b718fee1970a01fff95..9ed578d73861d2cd28281a7a2852aecd8646ee6f 100644 (file)
--- a/dump-runlisp-image.c
+++ b/dump-runlisp-image.c
@@ -547,6 +547,7 @@ static void notice_filename(const char *p, size_t sz)
   if (!node) {
     node = xmalloc(sizeof(*node));
     treap_insert(&good, &path, node, p, sz);
   if (!node) {
     node = xmalloc(sizeof(*node));
     treap_insert(&good, &path, node, p, sz);

+    if (verbose >= 3) moan("noticed non-junk file `%.*s'", (int)sz, p);

   }
 }
 
   }
 }
 


@@ -918,7 +919,7 @@ static void finish_job(struct job *job)
            job->exit);
 
   /* What happens next depends on the state of the job.  This is the main
            job->exit);
 
   /* What happens next depends on the state of the job.  This is the main

-   * place which advanced the job state machine.
+   * place which advances the job state machine.

    */
   if (ok) switch (job->st) {
 
    */
   if (ok) switch (job->st) {
 


@@ -996,6 +997,12 @@ static void finish_job(struct job *job)
        ok = 0; break;
       }
 
        ok = 0; break;
       }
 

+      /* Notice the image so that it doesn't get junked. */
+      if (flags&AF_JUNK) {
+       p = strrchr(job->imghash, '/'); if (p) p++; else p = job->imghash;
+       notice_filename(p, strlen(p));
+      }
+

       /* Determine the basename of the final image. */
       p = strrchr(job->imghash, '/'); if (p) p++; else p = job->imghash;
 
       /* Determine the basename of the final image. */
       p = strrchr(job->imghash, '/'); if (p) p++; else p = job->imghash;