diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-03-02 10:47:04 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-03-02 10:47:04 +0000 |
| commit | 8262e64256c78033641dd1ce6b68452adc2b647f (patch) | |
| tree | 8be736220aeafe5e7c5e03c99642c3629633475f | |
| parent | 753a03bf8e01cd738885a11922618ef6401a9f92 (diff) | |
| download | cygnal-8262e64256c78033641dd1ce6b68452adc2b647f.tar.gz cygnal-8262e64256c78033641dd1ce6b68452adc2b647f.tar.bz2 cygnal-8262e64256c78033641dd1ce6b68452adc2b647f.zip | |
* mount.cc (mount_entries): Handle a "/" cygdrive prefix correctly.
Add comments.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/mount.cc | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 9ebc5f802..696b194ab 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2009-03-02 Corinna Vinschen <corinna@vinschen.de> + + * mount.cc (mount_entries): Handle a "/" cygdrive prefix correctly. + Add comments. + 2009-02-23 Sjors Gielen <mailinglist@dazjorz.com> * Makefile.in: Add DESTDIR functionality. diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index 464240f75..fd2d6c539 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -386,9 +386,15 @@ mount_entries (void) char opts[strlen (p->mnt_opts) + 1]; convert_spaces (dirname, p->mnt_dir); + // remove trailing slash char *ls = strrchr (dirname, '/'); - if (ls && ls > dirname) - *ls = '\0'; + if (ls) + { + // last slash == leading slash? cygdrive prefix == "/" + if (ls == dirname) + ++ls; + *ls = '\0'; + } *stpncpy (opts, p->mnt_opts, noumount - p->mnt_opts) = '\0'; printf (format_cyg, dirname, opts); break; |