Fix in the return code of dump when using the size estimate option.

diff --git a/CHANGES b/CHANGES
index 0e679b3e5af121fcb4650564a0cd954fb91f7448..f808b459aaa00099a0316ce9829456e0dd2c0748 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.25 1999/12/06 21:37:47 tiniou Exp $
+$Id: CHANGES,v 1.26 1999/12/17 10:14:27 tiniou Exp $

 
 Changes between versions 0.4b11 and 0.4b12 (released ????????????????)
 ======================================================================
 
 Changes between versions 0.4b11 and 0.4b12 (released ????????????????)
 ======================================================================


@@ -6,6 +6,10 @@ Changes between versions 0.4b11 and 0.4b12 (released ????????????????)
 1.     Small fix in the dump man page. Thanks to Thorsten Kukuk 
        <kukuk@suse.de> for submitting the patch.
 
 1.     Small fix in the dump man page. Thanks to Thorsten Kukuk 
        <kukuk@suse.de> for submitting the patch.
 

+2.     Fix for the exit code when using the size estimate option of
+       dump. Thanks to Matti Taskinen <mkt@rni.helsinki.fi> for
+       submitting the patch.
+

 Changes between versions 0.4b10 and 0.4b11 (released December 5, 1999)
 ======================================================================
 
 Changes between versions 0.4b10 and 0.4b11 (released December 5, 1999)
 ======================================================================
 


@@ -25,8 +29,8 @@ Changes between versions 0.4b10 and 0.4b11 (released December 5, 1999)
        asking to enter a new tape each time.
 
 4.     Fixed a memory leak which was causing dump to grow very big
        asking to enter a new tape each time.
 
 4.     Fixed a memory leak which was causing dump to grow very big

-       (270MB when dumping a 10GB filesystem...). Thanks to Zaphod 
-       Beeblebrox <zaphod@netrider.org.au> for reporting the bug.
+       (270MB when dumping a 10GB filesystem...). Thanks to Jason 
+       Fearon <jasonf@netrider.org.au> for reporting the bug.

 
 Changes between versions 0.4b9 and 0.4b10 (released November 21, 1999)
 ======================================================================
 
 Changes between versions 0.4b9 and 0.4b10 (released November 21, 1999)
 ======================================================================

diff --git a/THANKS b/THANKS
index 08094fdc6a78a55e6384edebbcdd4ac3bb893e63..ff5f9624c218f5f19282df76b99303ab69207223 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.13 1999/12/06 21:37:47 tiniou Exp $
+$Id: THANKS,v 1.14 1999/12/17 10:14:27 tiniou Exp $

 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.


@@ -22,10 +22,10 @@ Thanks to people who reported problems with the port, sent patches, and
 suggested various improvements.
 Here is a partial list of them (if I have forgotten someone, please complain):
 
 suggested various improvements.
 Here is a partial list of them (if I have forgotten someone, please complain):
 

-Zaphod Beeblebrox      zaphod@netrider.org.au

 Stephen Carr           sgcarr@civeng.adelaide.edu.au
 Rob Cermak             cermak@ahab.rutgers.edu
 Abhijit Dasgupta       abhijit@ans.net
 Stephen Carr           sgcarr@civeng.adelaide.edu.au
 Rob Cermak             cermak@ahab.rutgers.edu
 Abhijit Dasgupta       abhijit@ans.net

+Jason Fearon           jasonf@netrider.org.au

 Jeremy Fitzhardinge    jeremy@goop.org
 Eirik Fuller           eirik@netcom.com
 Henry Katz             hkatz@hkatz.dialup.access.net
 Jeremy Fitzhardinge    jeremy@goop.org
 Eirik Fuller           eirik@netcom.com
 Henry Katz             hkatz@hkatz.dialup.access.net


@@ -43,6 +43,7 @@ Brent Olson           night@halcyon.com
 Bernhard Sadlowski     sadlowsk@Mathematik.Uni-Bielefeld.DE
 Chris Siebenmann       cks@utcc.utoronto.ca
 Bob Snyder             rsnyder@janet.advsys.com
 Bernhard Sadlowski     sadlowsk@Mathematik.Uni-Bielefeld.DE
 Chris Siebenmann       cks@utcc.utoronto.ca
 Bob Snyder             rsnyder@janet.advsys.com

+Matti Taskinen         mkt@rni.helsinki.fi

 Theodore Y. Ts'o       tytso@mit.edu
 Stephen Tweedie                sct@dcs.ed.ac.uk
 Daniel Veillard                Daniel.Veillard@imag.fr
 Theodore Y. Ts'o       tytso@mit.edu
 Stephen Tweedie                sct@dcs.ed.ac.uk
 Daniel Veillard                Daniel.Veillard@imag.fr

diff --git a/dump/main.c b/dump/main.c
index 263945a2543d05c692ed274d4d1a321c592cf88c..3c56b84cfb43a82330b7539c445d873b393cef8c 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: main.c,v 1.9 1999/11/22 19:08:50 tiniou Exp $";
+       "$Id: main.c,v 1.10 1999/12/17 10:14:59 tiniou Exp $";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -515,7 +515,7 @@ main(int argc, char *argv[])
 
        if (sizest) {
                printf("%ld\n", tapesize + 10);
 
        if (sizest) {
                printf("%ld\n", tapesize + 10);

-               exit(X_STARTUP);
+               exit(X_FINOK);

        } /* stop here for size estimate */
 
        if (pipeout || unlimited) {
        } /* stop here for size estimate */
 
        if (pipeout || unlimited) {