Changeset 5209:964658b145df for browser.c

Timestamp:

2007-09-05 00:16:36 (15 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Interpret relative paths in browser relative to shown dir, not working
dir (closes #2471).

Files:

• browser.c (modified) (1 diff)

browser.c

@@ -990 +990 @@
           else
 #endif
-          if (stat (buf, &st) == 0)
-          {
-            if (S_ISDIR (st.st_mode))
+          {
+            if (*buf != '/')
             {
-              destroy_state (&state);
-              if (examine_directory (menu, &state, buf, prefix) == 0)
-                strfcpy (LastDir, buf, sizeof (LastDir));
+              /* in case dir is relative, make it relative to LastDir,
+               * not current working dir */
+              char tmp[_POSIX_PATH_MAX];
+              mutt_concat_path (tmp, LastDir, buf, sizeof (tmp));
+              strfcpy (buf, tmp, sizeof (buf));
+            }
+            if (stat (buf, &st) == 0)
+            {
+              if (S_ISDIR (st.st_mode))
+              {
+                destroy_state (&state);
+                if (examine_directory (menu, &state, buf, prefix) == 0)
+                  strfcpy (LastDir, buf, sizeof (LastDir));
+                else
+                {
+                  mutt_error _("Error scanning directory.");
+                  if (examine_directory (menu, &state, LastDir, prefix) == -1)
+                  {
+                    mutt_menuDestroy (&menu);
+                    goto bail;
+                  }
+                }
+                menu->current = 0;
+                menu->top = 0;
+                init_menu (&state, menu, title, sizeof (title), buffy);
+              }
               else
-              {
-                mutt_error _("Error scanning directory.");
-                if (examine_directory (menu, &state, LastDir, prefix) == -1)
-                {
-                  mutt_menuDestroy (&menu);
-                  goto bail;
-                }
-              }
-              menu->current = 0; 
-              menu->top = 0; 
-              init_menu (&state, menu, title, sizeof (title), buffy);
+                mutt_error (_("%s is not a directory."), buf);
             }
             else
-              mutt_error (_("%s is not a directory."), buf);
-          }
-          else
-            mutt_perror (buf);
+              mutt_perror (buf);
+          }
         }
         MAYBE_REDRAW (menu->redraw);