diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-02-01 17:16:14 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-02-01 17:16:14 +0000 |
| commit | 8c96f3fac27c13fa178f927753aaba3beed62209 (patch) | |
| tree | fcd6c585a8a34f245e1b7724b5d57df18b475ff7 | |
| parent | 74d8e12e16d5d5416ce37100f8767ff0affa90ec (diff) | |
| download | cygnal-8c96f3fac27c13fa178f927753aaba3beed62209.tar.gz cygnal-8c96f3fac27c13fa178f927753aaba3beed62209.tar.bz2 cygnal-8c96f3fac27c13fa178f927753aaba3beed62209.zip | |
* fhandler_proc.cc (format_proc_partitions): Remove PartitionType check since
it could skip over partitions that are actually interesting.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index de1ddc329..9bea7c38e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2005-02-01 Christopher Faylor <cgf@timesys.com> + * fhandler_proc.cc (format_proc_partitions): Remove PartitionType check + since it could skip over partitions that are actually interesting. + +2005-02-01 Christopher Faylor <cgf@timesys.com> + * cygthread.cc (cygthread::terminate_thread): Wait briefly for notification event in the event that the thread was actually in the process of exiting. diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index bd6ff03bb..e4fc918e9 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -1,6 +1,6 @@ /* fhandler_proc.cc: fhandler for /proc virtual filesystem - Copyright 2002, 2003, 2004 Red Hat, Inc. + Copyright 2002, 2003, 2004, 2005 Red Hat, Inc. This file is part of Cygwin. @@ -1012,8 +1012,7 @@ format_proc_partitions (char *destbuf, size_t maxsize) DRIVE_LAYOUT_INFORMATION *dli = (DRIVE_LAYOUT_INFORMATION *) buf; for (unsigned partition = 0; partition < dli->PartitionCount; partition++) { - if (!dli->PartitionEntry[partition].PartitionLength.QuadPart - || !dli->PartitionEntry[partition].PartitionType) + if (!dli->PartitionEntry[partition].PartitionLength.QuadPart) continue; device dev; dev.parsedisk (drive_number, partition + 1); |