[PATCH 1/1] mount.nfs: strip of extra slashes in device name

[Steve Dickson <steved@redhat.com>]

The kernel strips off extra '/' when the  device is entered
into /proc/mounts. So that umounts can this devices, strip off
any extra '/' before storing the device in the mtab.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/mount/mount.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index eea00af..eb63f50 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -485,6 +485,24 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 	/*
+	 * The kernel strips off extra '/' when the device is entered 
+	 * into /proc/mounts. So that umounts can this devices, strip off
+	 * any extra '/' before storing the device in the mtab.
+	 */
+	if (strstr(spec, "//") != NULL) {
+		char *colen, *slash;
+
+		if ((colen = strchr(spec, ':'))) {
+			slash = (colen + 1);
+			while (*slash && *(slash+1) == '/')
+				slash++;
+			while (*slash)
+				*(++colen) = *(slash++);
+			*(colen+1) = '\0';
+		}
+	}
+
+	/*
 	 * Concatenate mount options from the configuration file
 	 */
 	mount_opts = mount_config_opts(spec, mount_point, mount_opts);
-- 
1.7.1