2 files changed, 35 insertions, 32 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 6882e03..0babbf1 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -2761,6 +2761,8 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
   main_blklru_list_init (& lru_list);
   main_blklru_list_init (& lru_free);
 
+  IF_DEBUG1 (DP(RINT "[main_set_source] %s\n", sfile->filename));
+
   /* Open it, check for seekability, set required xd3_source fields. */
   if (allow_fake_source)
     {
@@ -2795,9 +2797,9 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
           seekable = 0;
           source_size_known = 0;
 
-          if (option_verbose) 
+          if (option_verbose > 1) 
             {
-              XPR(NT "source not seekable\n");
+              XPR(NT "source not seekable: %s\n", xd3_mainerror (stat_val));
             }
         }
     }
@@ -2827,6 +2829,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
       XPR(NT XD3_LIB_ERRMSG (stream, ret));
       goto error;
     }
+  XD3_ASSERT (stream->src == source);
 
   lru_size = (option_srcwinsz + source->blksize - 1) / source->blksize;
   option_srcwinsz = lru_size * source->blksize;
@@ -2835,7 +2838,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
     {
       static char buf[32];
 
-      XPR(NT "source %s winsize %s\n",
+      XPR(NT "source %s: winsize %s\n",
           sfile->filename, main_format_bcnt(option_srcwinsz, buf));
     }
 
@@ -2864,7 +2867,10 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
       main_blklru_list_push_back (& lru_free, & lru[i]);
     }
 
+  return 0;
+
  error:
+  IF_DEBUG1 (DP(RINT "[main_set_source] error %s\n", xd3_strerror (ret)));
   if (tmp_buf != NULL)
     {
       main_free (tmp_buf);
@@ -3224,17 +3230,6 @@ main_input (xd3_cmd     cmd,
       return EXIT_FAILURE;
     }
 
-  if (IS_ENCODE (cmd))
-    {
-      /* When encoding, open the source file, possibly decompress it.
-       * The decoder delays this step until XD3_GOTHEADER. */
-      if (sfile->filename != NULL &&
-          (ret = main_set_source (& stream, cmd, sfile, & source)))
-        {
-          return EXIT_FAILURE;
-        }
-    }
-
   config.winsize = winsize;
   config.srcwin_maxsz = option_srcwinsz;
   config.getblk = main_getblk_func;
@@ -3256,6 +3251,21 @@ main_input (xd3_cmd     cmd,
     }
 #endif
 
+  if (cmd != CMD_DECODE)
+    {
+      /* When not decoding, set source now.  The decoder delays this
+       * step until XD3_GOTHEADER. */
+      if (sfile->filename != NULL) 
+        {
+          if ((ret = main_set_source (& stream, cmd, sfile, & source)))
+            {
+              return EXIT_FAILURE;
+            }
+
+          XD3_ASSERT(stream.src != NULL);
+        }
+    }
+
   /* This times each window. */
   get_millisecs_since ();
 
@@ -3329,18 +3339,6 @@ main_input (xd3_cmd     cmd,
                     return EXIT_FAILURE;
                   }
               }
-            else if (cmd == CMD_PRINTHDR ||
-                     cmd == CMD_PRINTHDRS ||
-                     cmd == CMD_PRINTDELTA ||
-                     cmd == CMD_RECODE)
-              {
-                if (sfile->filename == NULL)
-                  {
-                    allow_fake_source = 1;
-                    sfile->filename = "<placeholder>";
-                    main_set_source (& stream, cmd, sfile, & source);
-                  }
-              }
           }
         /* FALLTHROUGH */
         case XD3_WINSTART:
@@ -3397,6 +3395,7 @@ main_input (xd3_cmd     cmd,
                             "no source copies\n",
                             stream.current_window * winsize,
                             (stream.current_window+1) * winsize);
+                        XD3_ASSERT (stream.src != NULL);
                       }
 
                     /* Limited i-buffer size affects source copies */
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 1ca1e32..515b083 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -2516,7 +2516,7 @@ xd3_getblk (xd3_stream *stream, xoff_t blkno)
         }
       
       ret = stream->getblk (stream, source, blkno);
-
+      IF_DEBUG1 (DP(RINT "[getblk] func ret %d\n", ret));
       if (ret != 0) 
         {
           stream->msg = "getblk failed";
@@ -2579,9 +2579,6 @@ xd3_set_source (xd3_stream *stream,
 {
   usize_t shiftby;
 
-  IF_DEBUG2 (DP(RINT "[set source] %s\n", 
-                stream->getblk == NULL ? "async" : "sync"));
-
   stream->src = src;
   src->srclen  = 0;
   src->srcbase = 0;
@@ -3776,6 +3773,8 @@ xd3_encode_input (xd3_stream *stream)
       return XD3_WINSTART;
 
     case ENC_SEARCH:
+      IF_DEBUG1 (DP(RINT "[SEARCH] match_state %d avail_in %u %s\n", 
+                    stream->match_state, stream->avail_in, stream->src ? "source" : "no source"));
 
       /* Reentrant matching. */
       if (stream->src != NULL)
@@ -3793,7 +3792,7 @@ xd3_encode_input (xd3_stream *stream)
               if (stream->avail_in > 0)
                 {
                   /* This call can't fail because the source window is
-                     unrestricted. */
+                   * unrestricted. */
                   ret = xd3_source_match_setup (stream, stream->match_srcpos);
                   XD3_ASSERT (ret == 0);
                   stream->match_state = MATCH_FORWARD;
@@ -4336,6 +4335,7 @@ xd3_source_match_setup (xd3_stream *stream, xoff_t srcpos)
    * TestNonBlockingProgress test! */
   if (srcpos != 0 && srcpos == stream->match_last_srcpos)
     {
+      IF_DEBUG1(DP(RINT "[match_setup] looping failure\n"));
       goto bad;
     }
 
@@ -4402,6 +4402,7 @@ xd3_source_match_setup (xd3_stream *stream, xoff_t srcpos)
   /* Restricted case: fail if the srcpos lies outside the source window */
   if ((srcpos < src->srcbase) || (srcpos > (src->srcbase + (xoff_t) src->srclen)))
     {
+      IF_DEBUG1(DP(RINT "[match_setup] restricted source window failure\n"));
       goto bad;
     }
   else
@@ -4513,6 +4514,9 @@ xd3_source_extend_match (xd3_stream *stream)
   usize_t tryrem;    /* tryrem is the number of matchable bytes */
   usize_t matched;
 
+  IF_DEBUG1(DP(RINT "[extend match] srcpos %"Q"u\n", 
+               stream->match_srcpos));
+
   XD3_ASSERT (src != NULL);
 
   /* Does it make sense to compute backward match AFTER forward match? */
@@ -5302,7 +5306,7 @@ XD3_TEMPLATE(xd3_string_match_) (xd3_stream *stream)
           /* Maybe output a COPY instruction */
           if (match_length >= stream->min_match)
             {
-              IF_DEBUG1 ({
+              IF_DEBUG2 ({
                 static int x = 0;
                 DP(RINT "[target match:%d] <inp %u %u>  <cpy %u %u> "
                    "(-%d) [ %u bytes ]\n",