From: Christopher Faylor <me@cgf.cx>
Date: Thu, 5 Jan 2006 18:31:26 +0000 (+0000)
Subject: * cygcheck.cc (dump_sysinfo): Report the failing drive to prevent having to
X-Git-Tag: gdb-csl-20060226-branchpoint~193
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2ea1dced21310b3d419a5e2adfe3d5afdccd489b;p=newlib-cygwin.git

* cygcheck.cc (dump_sysinfo): Report the failing drive to prevent having to
guess.
---

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 417d5a7c7..3245d8ad4 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-05  Christopher Faylor  <cgf@timesys.com>
+
+	* cygcheck.cc (dump_sysinfo): Report the failing drive to prevent
+	having to guess.
+
 2005-12-29  Christopher Faylor  <cgf@timesys.com>
 
 	* strace.cc (nprocesses): Make static global.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index f943e0ee5..c6e5e5eca 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1275,10 +1275,17 @@ dump_sysinfo ()
       /* Report all errors, except if the Volume is ERROR_NOT_READY.
 	 ERROR_NOT_READY is returned when removeable media drives are empty
 	 (CD, floppy, etc.) */
-      if (!GetVolumeInformation
-	  (drive, name, sizeof (name), &serno, &maxnamelen, &flags, fsname,
-	   sizeof (fsname)) && GetLastError () != ERROR_NOT_READY)
-	display_error ("dump_sysinfo: GetVolumeInformation()");
+      if (!GetVolumeInformation (drive, name, sizeof (name), &serno,
+				 &maxnamelen, &flags, fsname,
+				 sizeof (fsname))
+	  && GetLastError () != ERROR_NOT_READY)
+	{
+#	  define FMT "dump_sysinfo: GetVolumeInformation() for drive %c:"
+	  char buf[sizeof (FMT)];
+	  sprintf (buf, FMT, 'A' + i);
+	  display_error (buf);
+#	  undef FMT
+	}
 
       int dtype = GetDriveType (drive);
       char drive_type[4] = "unk";