Changeset 2224:8d5f6aa1cda8 for browser.c

Timestamp:

2000-12-31 03:24:18 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Make browser behaviour more consistent with expectations.

Files:

• browser.c (modified) (15 diffs)

browser.c

@@ -52 +52 @@
 
 static char LastDir[_POSIX_PATH_MAX] = "";
+static char LastDirBackup[_POSIX_PATH_MAX] = "";
 
 /* Frees up the memory allocated for the local-global variables.  */
@@ -519 +520 @@
 }
 
-void _mutt_select_file (char *f, size_t flen, int buffy,
-                       int multiple, char ***files, int *numfiles)
+void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *numfiles)
 {
   char buf[_POSIX_PATH_MAX];
@@ -530 +530 @@
   struct stat st;
   int i, killPrefix = 0;
-
+  int multiple = (flags & M_SEL_MULTI)  ? 1 : 0;
+  int folder   = (flags & M_SEL_FOLDER) ? 1 : 0;
+  int buffy    = (flags & M_SEL_BUFFY)  ? 1 : 0;
+
+  buffy = buffy && folder;
+  
   memset (&state, 0, sizeof (struct browser_state));
+
+  if (!folder)
+    strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup));
 
   if (*f)
@@ -582 +590 @@
   else 
   {
-    if (!LastDir[0])
+    if (!folder)
+      getcwd (LastDir, sizeof (LastDir));
+    else if (!LastDir[0])
       strfcpy (LastDir, NONULL(Maildir), sizeof (LastDir));
+    
 #ifdef USE_IMAP
     if (!buffy && mx_is_imap (LastDir))
@@ -599 +610 @@
   {
     if (examine_mailboxes (NULL, &state) == -1)
-      return;
+      goto bail;
   }
   else
@@ -606 +617 @@
 #endif
   if (examine_directory (NULL, &state, LastDir, prefix) == -1)
-    return;
+    goto bail;
 
   menu = mutt_new_menu ();
@@ -743 +754 @@
               {
                 strfcpy (LastDir, NONULL(Homedir), sizeof (LastDir));
-                return;
+                goto bail;
               }
             }
@@ -803 +814 @@
         destroy_state (&state);
         mutt_menuDestroy (&menu);
-        return;
+        goto bail;
 
       case OP_BROWSER_TELL:
@@ -937 +948 @@
                 destroy_state (&state);
                 mutt_menuDestroy (&menu);
-                return;
+                goto bail;
               }
             }
@@ -1003 +1014 @@
               mutt_error _("Error scanning directory.");
               mutt_menuDestroy (&menu);
-              return;
+              goto bail;
             }
             killPrefix = 0;
@@ -1069 +1080 @@
         {
           if (examine_mailboxes (menu, &state) == -1)
-            return;
+            goto bail;
         }
 #ifdef USE_IMAP
@@ -1081 +1092 @@
 #endif
         else if (examine_directory (menu, &state, LastDir, prefix) == -1)
-          return;
+          goto bail;
         init_menu (&state, menu, title, sizeof (title), buffy);
         break;
@@ -1093 +1104 @@
           destroy_state (&state);
           mutt_menuDestroy (&menu);
-          return;
+          goto bail;
         }
         MAYBE_REDRAW (menu->redraw);
@@ -1111 +1122 @@
           destroy_state (&state);
           mutt_menuDestroy (&menu);
-          return;
+          goto bail;
         }
         else
@@ -1141 +1152 @@
     }
   }
-  /* not reached */
-}
+  
+  bail:
+  
+  if (!folder)
+    strfcpy (LastDir, LastDirBackup, sizeof (LastDir));
+  
+}