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

guess.

1 files changed, 11 insertions, 4 deletions

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";