Off by one miscalculation (dumping a one letter directory).

diff --git a/CHANGES b/CHANGES
index 635146b623778ad4a02c7e85baa4d81c9672eda1..7fd7c007ca19a0a1ea1a2bfc0d683875eec41184 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.71 2000/08/19 22:39:35 stelian Exp $
+$Id: CHANGES,v 1.72 2000/08/19 23:15:38 stelian Exp $
 
 Changes between versions 0.4b17 and 0.4b19 (released ?????????????)
 ===================================================================
@@ -14,6 +14,11 @@ Changes between versions 0.4b17 and 0.4b19 (released ?????????????)
        or warnings. Thanks to Stephen Atwell 
        <satwell@urbana.css.mot.com> for the suggestion.
 
+4.     Corrected an off by one calculation which prevented
+       dumping a directory having a 1 character name length.
+       Thanks to Bernhard Erdmann <bernhard.erdmann@gmx.de>
+       for reporting the bug.
+
 Changes between versions 0.4b17 and 0.4b18 (released June 30, 2000)
 ===================================================================
 

diff --git a/THANKS b/THANKS
index 78268635b72a46cfd4bf6813e6650fbcbc700d44..e35c14c42e8618e8e04d23b8ba4089a6f943cc56 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.32 2000/08/19 22:39:35 stelian Exp $
+$Id: THANKS,v 1.33 2000/08/19 23:15:38 stelian Exp $
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
@@ -30,6 +30,7 @@ Rainer Clasen         bj@ncc.cicely.de
 W. Reilly Cooley       wcooley@nakedape.cc
 Abhijit Dasgupta       abhijit@ans.net
 Andreas Dilger         adilger@home.com
+Bernhard Erdmann       bernhard.erdmann@gmx.de
 Jason Fearon           jasonf@netrider.org.au
 Jeremy Fitzhardinge    jeremy@goop.org
 Eirik Fuller           eirik@netcom.com

diff --git a/dump/optr.c b/dump/optr.c
index de1d6f6fde171a16b6d19494c8f5ee1b3b4d6955..410253762486f27aecdf72920fe6663dd115fd8d 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: optr.c,v 1.10 2000/02/10 09:42:32 stelian Exp $";
+       "$Id: optr.c,v 1.11 2000/08/19 23:15:38 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -529,7 +529,7 @@ fstabsearchdir(const char *key, char *directory)
        for (pf = table; pf != NULL; pf = pf->pf_next) {
                fs = pf->pf_fstab;
                if (strlen(fs->fs_file) > size &&
-                   strlen(key) > strlen(fs->fs_file) + 2 &&
+                   strlen(key) > strlen(fs->fs_file) + 1 &&
                    strncmp(fs->fs_file, key, strlen(fs->fs_file)) == 0 &&
                    (key[strlen(fs->fs_file)] == '/' ||
                     fs->fs_file[strlen(fs->fs_file) - 1] == '/')) {