Changeset 221 for branches/samba-3.3.x/source/client/umount.cifs.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/client/umount.cifs.c (modified) (3 diffs)

branches/samba-3.3.x/source/client/umount.cifs.c

@@ -34 +34 @@
 #include <string.h>
 #include <mntent.h>
+#include <limits.h>
 #include "mount.h"
 
@@ -232 +233 @@
 }
 
+/* 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;
+
+        if (path == NULL) {
+                return NULL;
+        }
+
+        if (strlen(path) > PATH_MAX) {
+                fprintf(stderr, "Mount point string too long\n");
+                return NULL;
+        }
+
+        canonical = (char *)malloc (PATH_MAX + 1);
+
+        if (!canonical) {
+                fprintf(stderr, "Error! Not enough memory!\n");
+                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)
 {
@@ -305 +340 @@
         argc -= optind;
 
-        mountpoint = argv[0];
+        mountpoint = canonicalize(argv[0]);
 
         if((argc < 1) || (argv[0] == NULL)) {