Fix a simple xfs_io error-handling botch; from the Debian folks.

diff --git a/VERSION b/VERSION
index 348001d4500f2111a1183a35b2fe549515781736..fb2036caeb9518bef8c4bcf5eaadcca059c26bc2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=6
-PKG_REVISION=19
+PKG_REVISION=20
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index 195c6ade403d7af71b0077735b3f195d05318468..c68db453e8e09882d7e773ccb2b4f9c75973393e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfsprogs (2.6.20-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix xfs_io segfault on non-XFS files.  (closes: #260470)
+
+ -- Nathan Scott <nathans@debian.org>  Wed, 28 Jul 2004 21:11:38 +1000
+
 xfsprogs (2.6.19-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/doc/CHANGES b/doc/CHANGES
index 23a47c98eaa1c5895414c1893dabea3bc540d167..53cbe14e451e713ed19fea0938db6582bdbbc7b5 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.6.20 (28 July 2004)
+       - Fix a segfault on xfs_io open error path for non-XFS
+         files.  Thanks to Steinar H. Gunderson for this fix.
+
 xfsprogs-2.6.19 (16 July 2004)
        - Fix two byte count size wraps in xfs_copy.
        - Minor man page fixes from Eric Raymond.

diff --git a/io/open.c b/io/open.c
index 206174733409b68bce19cd87bdc508de0ada42da..86b12aba0ae416824cf81bbb757ed1e4876273e0 100644 (file)
--- a/io/open.c
+++ b/io/open.c
@@ -199,7 +199,7 @@ openfile(
        if (!platform_test_xfs_fd(fd)) {
                fprintf(stderr, _("%s: specified file "
                        "[\"%s\"] is not on an XFS filesystem\n"),
-                       progname, file->name);
+                       progname, path);
                close(fd);
                return -1;
        }