aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/utils/ChangeLog5
-rw-r--r--winsup/utils/cygcheck.cc15
2 files changed, 16 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 417d5a7..3245d8a 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 f943e0e..c6e5e5e 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";