Adds an error message for XD3_INVALID_INPUT

2 files changed, 12 insertions, 9 deletions

diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index 685a7ff..d33a79e 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -453,13 +453,13 @@ xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst)
                 if ((source->onblk != blksize) &&
                     (blkoff + take > source->onblk))
                   {
-                    XPR(NT "[srcfile] short at blkno %"Q"u onblk "
-                                 "%u blksize %u blkoff %u take %u\n",
-                                 block,
-                                 source->onblk,
-                                 blksize,
-                                 blkoff,
-                                 take);
+                    IF_DEBUG1 (XPR(NT "[srcfile] short at blkno %"Q"u onblk "
+                                   "%u blksize %u blkoff %u take %u\n",
+                                   block,
+                                   source->onblk,
+                                   blksize,
+                                   blkoff,
+                                   take));
                     stream->msg = "source file too short";
                     return XD3_INVALID_INPUT;
                   }
@@ -505,8 +505,6 @@ xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst)
 
         stream->avail_out += take;
 
-        //XPR(NT "memcpy here with take=%u\n", take);
-
         if (overlap)
           {
             /* Can't just memcpy here due to possible overlap. */
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 32295d4..986165b 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -3316,6 +3316,11 @@ main_input (xd3_cmd     cmd,
         default:
           /* input_func() error */
           XPR(NT XD3_LIB_ERRMSG (& stream, ret));
+          if (! option_quiet && ret == XD3_INVALID_INPUT)
+            {
+              XPR(NT "normally this indicates that the source file is incorrect\n");
+              XPR(NT "please verify the source file with sha1sum or equivalent\n");
+            }
           return EXIT_FAILURE;
         }
     }