Changeset 5443:8b783c916893 for muttlib.c

Timestamp:

2008-07-02 02:19:14 (5 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Use realpath() in mutt_pretty_mailbox() for paths that may need it.
This requires to add the buffer size as parameter since the result may
be longer than the original but still fit in the buffer. Closes #2948.

Files:

• muttlib.c (modified) (2 diffs)

muttlib.c

@@ -754 +754 @@
 
 /* collapse the pathname using ~ or = when possible */
-void mutt_pretty_mailbox (char *s)
+void mutt_pretty_mailbox (char *s, size_t buflen)
 {
   char *p = s, *q = s;
   size_t len;
   url_scheme_t scheme;
+  char tmp[_POSIX_PATH_MAX];
 
   scheme = url_check_scheme (s);
@@ -780 +781 @@
     p = q;
   }
-  
-  /* first attempt to collapse the pathname */
-  while (*p)
-  {
-    if (*p == '/' && p[1] == '/')
-    {
-      *q++ = '/';
-      p += 2;
-    }
-    else if (p[0] == '/' && p[1] == '.' && p[2] == '/')
-    {
-      *q++ = '/';
-      p += 3;
-    }
-    else
-      *q++ = *p++;
-  }
-  *q = 0;
+
+  /* cleanup path */
+  if (strstr (p, "//") || strstr (p, "/./"))
+  {
+    /* first attempt to collapse the pathname, this is more
+     * lightweight than realpath() and doesn't resolve links
+     */
+    while (*p)
+    {
+      if (*p == '/' && p[1] == '/')
+      {
+        *q++ = '/';
+        p += 2;
+      }
+      else if (p[0] == '/' && p[1] == '.' && p[2] == '/')
+      {
+        *q++ = '/';
+        p += 3;
+      }
+      else
+        *q++ = *p++;
+    }
+    *q = 0;
+  }
+  else if (strstr (p, "..") && 
+           (scheme == U_UNKNOWN || scheme == U_FILE) &&
+           realpath (p, tmp))
+    strfcpy (p, tmp, buflen - (p - s));
 
   if (mutt_strncmp (s, Maildir, (len = mutt_strlen (Maildir))) == 0 &&