Changeset 5443:8b783c916893

Timestamp:

2008-07-02 02:19:14 (3 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:

• ChangeLog (modified) (1 diff)
• browser.c (modified) (2 diffs)
• buffy.c (modified) (3 diffs)
• commands.c (modified) (1 diff)
• compose.c (modified) (6 diffs)
• curs_main.c (modified) (1 diff)
• enter.c (modified) (1 diff)
• headers.c (modified) (2 diffs)
• hook.c (modified) (1 diff)
• imap/imap.c (modified) (1 diff)
• init.c (modified) (2 diffs)
• mbox.c (modified) (1 diff)
• muttlib.c (modified) (2 diffs)
• postpone.c (modified) (1 diff)
• protos.h (modified) (1 diff)
• recvattach.c (modified) (1 diff)
• send.c (modified) (1 diff)
• status.c (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-07-02 10:06 +0200  Rocco Rutte  <pdmef@gmx.net>  (cc2334fdf126)
+
+        * hash.c: Use casts to avoid triggering integer overflow detection in
+        hash function
+
+2008-07-01 20:06 -0700  Vincent Lefevre  <vincent@vinc17.org>  (fb0df4ae0836)
+
+        * ChangeLog, curs_lib.c: Clamp timeval math to unsigned int to match
+        progress timestamps. This is fine since only relative differences
+        matter. Closes #3018.
+
 2008-07-01 18:29 -0700  Brendan Cully  <brendan@kublai.com>  (f9af0501d2dd)
 

browser.c

@@ -463 +463 @@
     
     strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
-    mutt_pretty_mailbox (buffer);
+    mutt_pretty_mailbox (buffer, sizeof (buffer));
 
     add_folder (menu, state, buffer, &s, tmp->new);
@@ -509 +509 @@
   {
     strfcpy (path, LastDir, sizeof (path));
-    mutt_pretty_mailbox (path);
+    mutt_pretty_mailbox (path, sizeof (path));
 #ifdef USE_IMAP
   if (state->imap_browse && option (OPTIMAPLSUB))

buffy.c

@@ -430 +430 @@
 
     strfcpy (path, tmp->path, sizeof (path));
-    mutt_pretty_mailbox (path);
+    mutt_pretty_mailbox (path, sizeof (path));
     
     if (!first && pos + strlen (path) >= COLS - 7)
@@ -503 +503 @@
     }
     strfcpy (s, tmp->path, slen);
-    mutt_pretty_mailbox (s);
+    mutt_pretty_mailbox (s, slen);
     break;
 
@@ -529 +529 @@
     }
     strfcpy (s, tmp->path, slen);
-    mutt_pretty_mailbox (s);
+    mutt_pretty_mailbox (s, slen);
     break;
   }

commands.c

@@ -759 +759 @@
   }
 
-  mutt_pretty_mailbox (buf);
+  mutt_pretty_mailbox (buf, sizeof (buf));
   if (mutt_enter_fname (prompt, buf, sizeof (buf), redraw, 0) == -1)
     return (-1);

compose.c

@@ -218 +218 @@
     if(stat(idx[i]->content->filename, &st) != 0)
     {
-      mutt_pretty_mailbox(pretty);
+      mutt_pretty_mailbox(pretty, sizeof (pretty));
       mutt_error(_("%s [#%d] no longer exists!"),
                  pretty, i+1);
@@ -226 +226 @@
     if(idx[i]->content->stamp < st.st_mtime)
     {
-      mutt_pretty_mailbox(pretty);
+      mutt_pretty_mailbox(pretty, sizeof (pretty));
       snprintf(msg, sizeof(msg), _("%s [#%d] modified. Update encoding?"),
                pretty, i+1);
@@ -569 +569 @@
         if (mutt_get_field ("Fcc: ", buf, sizeof (buf), M_FILE | M_CLEAR) == 0)
         {
-          strfcpy (fcc, buf, _POSIX_PATH_MAX);
-          mutt_pretty_mailbox (fcc);
+          strfcpy (fcc, buf, fcclen);
+          mutt_pretty_mailbox (fcc, fcclen);
           move (HDR_FCC, HDR_XOFFSET);
           mutt_paddstr (W, fcc);
@@ -718 +718 @@
           {
             strfcpy (fname, NONULL (Context->path), sizeof (fname));
-            mutt_pretty_mailbox (fname);
+            mutt_pretty_mailbox (fname, sizeof (fname));
           }
 
@@ -1006 +1006 @@
         CHECK_COUNT;
         strfcpy (fname, idx[menu->current]->content->filename, sizeof (fname));
-        mutt_pretty_mailbox (fname);
+        mutt_pretty_mailbox (fname, sizeof (fname));
         if (mutt_get_field (_("Rename to: "), fname, sizeof (fname), M_FILE)
                                                         == 0 && fname[0])
@@ -1195 +1195 @@
        {
          strfcpy (fname, NONULL (Context->path), sizeof (fname));
-         mutt_pretty_mailbox (fname);
+         mutt_pretty_mailbox (fname, sizeof (fname));
        }
        if (idxlen)

curs_main.c

@@ -1072 +1072 @@
         {
           strfcpy (buf, Context->path, sizeof (buf));
-          mutt_pretty_mailbox (buf);
+          mutt_pretty_mailbox (buf, sizeof (buf));
           mutt_buffy (buf, sizeof (buf));
           if (!buf[0])

enter.c

@@ -573 +573 @@
               if (*buf)
               {
-                mutt_pretty_mailbox (buf);
+                mutt_pretty_mailbox (buf, buflen);
                 if (!pass)
                   mutt_history_add (hclass, buf, 1);

headers.c

@@ -144 +144 @@
       {
         strfcpy (fcc, p, fcclen);
-        mutt_pretty_mailbox (fcc);
+        mutt_pretty_mailbox (fcc, fcclen);
       }
       keep = 0;
@@ -174 +174 @@
         else
         {
-          mutt_pretty_mailbox (path);
+          mutt_pretty_mailbox (path, sizeof (path));
           mutt_error (_("%s: unable to attach file"), path);
         }

hook.c

@@ -427 +427 @@
       strfcpy (path, NONULL (Outbox), pathlen);
   }
-  mutt_pretty_mailbox (path);
+  mutt_pretty_mailbox (path, pathlen);
 }
 

imap/imap.c

@@ -1991 +1991 @@
     /* reformat output */
     imap_qualify_path (dest, dlen, &mx, completion);
-    mutt_pretty_mailbox (dest);
+    mutt_pretty_mailbox (dest, dlen);
 
     FREE (&mx.mbox);

init.c

@@ -1857 +1857 @@
           _tmp[0] = '\0';
           strfcpy (_tmp, NONULL(*((char **) MuttVars[idx].data)), sizeof (_tmp));
-          mutt_pretty_mailbox (_tmp);
+          mutt_pretty_mailbox (_tmp, sizeof (_tmp));
           val = _tmp;
         }
@@ -2619 +2619 @@
     strfcpy (tmp, NONULL (*((char **) MuttVars[idx].data)), sizeof (tmp));
     if (DTYPE (MuttVars[idx].type) == DT_PATH)
-      mutt_pretty_mailbox (tmp);
+      mutt_pretty_mailbox (tmp, sizeof (tmp));
   }
   else if (DTYPE (MuttVars[idx].type) == DT_ADDR)

mbox.c

@@ -957 +957 @@
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);
-    mutt_pretty_mailbox (savefile);
+    mutt_pretty_mailbox (savefile, sizeof (savefile));
     mutt_error (_("Write failed!  Saved partial mailbox to %s"), savefile);
     mutt_sleep (5);

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 &&

postpone.c

@@ -323 +323 @@
       SKIPWS (p);
       strfcpy (fcc, p, fcclen);
-      mutt_pretty_mailbox (fcc);
+      mutt_pretty_mailbox (fcc, fcclen);
 
       /* remove the X-Mutt-Fcc: header field */

protos.h

@@ -231 +231 @@
 void mutt_prepare_envelope (ENVELOPE *, int);
 void mutt_unprepare_envelope (ENVELOPE *);
-void mutt_pretty_mailbox (char *);
+void mutt_pretty_mailbox (char *, size_t);
 void mutt_pretty_size (char *, size_t, LOFF_T);
 void mutt_pipe_message (HEADER *);

recvattach.c

@@ -255 +255 @@
           
           strfcpy (path, aptr->content->filename, sizeof (path));
-          mutt_pretty_mailbox (path);
+          mutt_pretty_mailbox (path, sizeof (path));
           mutt_format_s (dest, destlen, prefix, path);
         }

send.c

@@ -1506 +1506 @@
 
     fcc_error = 0; /* reset value since we may have failed before */
-    mutt_pretty_mailbox (fcc);
+    mutt_pretty_mailbox (fcc, sizeof (fcc));
     i = mutt_compose_menu (msg, fcc, sizeof (fcc), cur);
     if (i == -1)

status.c

@@ -100 +100 @@
       {
         strfcpy (tmp, Context->path, sizeof (tmp));
-        mutt_pretty_mailbox (tmp);
+        mutt_pretty_mailbox (tmp, sizeof (tmp));
       }
       else