From: Nathan Scott <nathans@sgi.com>
Date: Wed, 28 Jul 2004 10:20:52 +0000 (+0000)
Subject: Fix a simple xfs_io error-handling botch; from the Debian folks.
X-Git-Tag: v2.7.0~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5a335bf24859295588116e4ce0b1db301713bd6;p=thirdparty%2Fxfsprogs-dev.git

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

diff --git a/VERSION b/VERSION
index 348001d45..fb2036cae 100644
--- 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 195c6ade4..c68db453e 100644
--- 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 23a47c98e..53cbe14e4 100644
--- 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 206174733..86b12aba0 100644
--- 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;
 	}