[linux-cifs-client] clean-up entries in /etc/mtab after unmounting a cifs filesystem
diff mbox

Message ID 4a4634330902020852s729a613fp1890ecd045bc82b8@mail.gmail.com
State New, archived
Headers show

Commit Message

Shirish Pargaonkar Feb. 2, 2009, 4:52 p.m. UTC
Two different patches for the same functionality, to remove the
remaining entry in /etc/mtab
after a filesystem is unmounted by canonicalizing the supplied
mountpoint on the command line.

Please refer to bug 4370 in samba bugzilla.

Regards,

Shirish
--- client.orig/umount.cifs.c	2009-02-02 04:35:20.000000000 -0600
+++ client/umount.cifs.c	2009-02-02 05:29:11.000000000 -0600
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <string.h>
 #include <mntent.h>
+#include <limits.h>
 #include "mount.h"
 
 #define UNMOUNT_CIFS_VERSION_MAJOR "0"
@@ -231,6 +232,37 @@ static int remove_from_mtab(char * mount
 	return rc;
 }
 
+/* Make a canonical pathname from PATH.  Returns a freshly malloced string.
+   It is up the *caller* to ensure that the PATH is sensible.  i.e.
+   canonicalize ("/dev/fd0/.") returns "/dev/fd0" even though ``/dev/fd0/.''
+   is not a legal pathname for ``/dev/fd0''  Anything we cannot parse
+   we return unmodified.   */
+static char *
+canonicalize (char *path)
+{
+	char *canonical = malloc (PATH_MAX + 1);
+
+	if (!canonical) {
+		fprintf(stderr, "Error! Not enough memory!\n");
+		return NULL;
+	}
+
+	if (strlen(path) > PATH_MAX) {
+		fprintf(stderr, "Mount point string too long\n");
+		return NULL;
+	}
+
+	if (path == NULL)
+		return NULL;
+
+	if (realpath (path, canonical))
+		return canonical;
+
+	strncpy (canonical, path, PATH_MAX);
+	canonical[PATH_MAX] = '\0';
+	return canonical;
+}
+
 int main(int argc, char ** argv)
 {
 	int c;
@@ -304,7 +336,7 @@ int main(int argc, char ** argv)
 	argv += optind;
 	argc -= optind;
 
-	mountpoint = argv[0];
+	mountpoint = canonicalize(argv[0]);
 
 	if((argc < 1) || (argv[0] == NULL)) {
 		printf("\nMissing name of unmount directory\n");

Patch
diff mbox

--- client.orig/umount.cifs.c	2009-02-02 04:35:20.000000000 -0600
+++ client/umount.cifs.c	2009-02-02 04:49:20.000000000 -0600
@@ -304,7 +304,7 @@  int main(int argc, char ** argv)
 	argv += optind;
 	argc -= optind;
 
-	mountpoint = argv[0];
+	mountpoint = canonicalize(argv[0]);
 
 	if((argc < 1) || (argv[0] == NULL)) {
 		printf("\nMissing name of unmount directory\n");