Fixes spurious warning from printhdr.

2 files changed, 6 insertions, 23 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 6374361..7932039 100755
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -2178,6 +2178,7 @@ main_input (xd3_cmd     cmd,
   xoff_t     last_total_out = 0;
   long       start_time;
   xoff_t     input_size = 0;
+  int        stdout_only = 0;
 
   int (*input_func) (xd3_stream*);
   int (*output_func) (xd3_stream*, main_file *);
@@ -2202,6 +2203,7 @@ main_input (xd3_cmd     cmd,
       input_func    = xd3_decode_input;
       output_func   = main_print_func;
       stream_flags |= XD3_ADLER32_NOVER;
+      stdout_only   = 1;
       break;
 #endif
 #if XD3_ENCODER
@@ -2546,10 +2548,10 @@ done:
   /* If output file is not open yet because of delayed-open, it means we never encountered
    * a window in the delta, but it could have had a VCDIFF header?  TODO: solve this
    * elsewhere.  For now, it prints "nothing to output" below, but the check doesn't
-   * happen in case of option_no_output. */
+   * happen in case of option_no_output.  */
   if (! option_no_output)
     {
-      if (! main_file_isopen (ofile))
+      if (!stdout_only && ! main_file_isopen (ofile))
         {
           XPR(NT "nothing to output: %s\n", ifile->filename);
           return EXIT_FAILURE;
diff --git a/xdelta3/xdelta3-regtest.py b/xdelta3/xdelta3-regtest.py
index 6590792..5e947be 100755
--- a/xdelta3/xdelta3-regtest.py
+++ b/xdelta3/xdelta3-regtest.py
@@ -439,33 +439,14 @@ class GzipInfo:
         
 class Xdelta3Info:
     def __init__(self,target,delta):
-        self.extcomp = 0  # @@@
-        self.hdrsize = 0
+        self.extcomp = 0  # TODO: I removed some code that called printhdr
+        self.hdrsize = 0  # to compute these, but printhdr uses stdout (now)
         self.tgtsize = os.stat(target).st_size
         self.dsize   = os.stat(delta).st_size
         if self.tgtsize > 0:
             self.ideal = 100.0 * self.dsize / self.tgtsize;
         else:
             self.ideal = 0.0
-#         RunXdelta3(['printhdr',
-#                     '-f',
-#                     delta,
-#                     HFILE])
-#         o = open(HFILE, "r")
-#         l = o.readline()
-#         while l:
-#             #print l.strip()
-#             m = RE_HDRSZ.match(l)
-#             if m:
-#                 self.hdrsize = int(m.group(1))
-#             m = RE_EXTCOMP.match(l)
-#             if m:
-#                 #print 'EXTCOMP', m.group(0)
-#                 self.extcomp = 1
-#             l = o.readline()
-#         if self.hdrsize == 0:
-#             raise CommandError(cmd, 'no hdrsize')
-#         o.close()
 
 class Xdelta3Pair:
     def __init__(self):