X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/14c29200cb58d3c4a0830265f2433849781858d0..9ae284163f491c64de122fcd555019040e0d4da7:/browser.c

diff --git a/browser.c b/browser.c
index 0d01221..3bb396e 100644
--- a/browser.c
+++ b/browser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
+ * Copyright (C) 1996-2000,2007 Michael R. Elkins <me@mutt.org>
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -40,13 +40,14 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <locale.h>
 
 static struct mapping_t FolderHelp[] = {
   { N_("Exit"),  OP_EXIT },
   { N_("Chdir"), OP_CHANGE_DIRECTORY },
   { N_("Mask"),  OP_ENTER_MASK },
   { N_("Help"),  OP_HELP },
-  { NULL }
+  { NULL,	 0 }
 };
 
 typedef struct folder_t
@@ -161,11 +162,27 @@ folder_format_str (char *dest, size_t destlen, size_t col, char op, const char *
       break;
       
     case 'd':
+    case 'D':
       if (folder->ff->st != NULL)
       {
-	tnow = time (NULL);
-	t_fmt = tnow - folder->ff->st->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d  %Y";
+	int do_locales = TRUE;
+
+	if (op == 'D') {
+	  t_fmt = NONULL(DateFmt);
+	  if (*t_fmt == '!') {
+	    ++t_fmt;
+	    do_locales = FALSE;
+	  }
+	} else {
+	  tnow = time (NULL);
+	  t_fmt = tnow - folder->ff->st->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d  %Y";
+	}
+	if (do_locales)
+	  setlocale(LC_TIME, NONULL (Locale)); /* use environment if $locale is not set */
+	else
+	  setlocale(LC_TIME, "C");
 	strftime (date, sizeof (date), t_fmt, localtime (&folder->ff->st->st_mtime));
+
 	mutt_format_s (dest, destlen, fmt, date);
       }
       else
@@ -460,9 +477,24 @@ static int examine_mailboxes (MUTTMENU *menu, struct browser_state *state)
     if ((! S_ISREG (s.st_mode)) && (! S_ISDIR (s.st_mode)) &&
 	(! S_ISLNK (s.st_mode)))
       continue;
+
+    if (mx_is_maildir (tmp->path))
+    {
+      struct stat st2;
+      char md[_POSIX_PATH_MAX];
+
+      snprintf (md, sizeof (md), "%s/new", tmp->path);
+      if (stat (md, &s) < 0)
+	s.st_mtime = 0;
+      snprintf (md, sizeof (md), "%s/cur", tmp->path);
+      if (stat (md, &st2) < 0)
+	st2.st_mtime = 0;
+      if (st2.st_mtime > s.st_mtime)
+	s.st_mtime = st2.st_mtime;
+    }
     
     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);
   }
@@ -508,7 +540,7 @@ static void init_menu (struct browser_state *state, MUTTMENU *menu, char *title,
   else
   {
     strfcpy (path, LastDir, sizeof (path));
-    mutt_pretty_mailbox (path);
+    mutt_pretty_mailbox (path, sizeof (path));
 #ifdef USE_IMAP
   if (state->imap_browse && option (OPTIMAPLSUB))
     snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"),
@@ -645,8 +677,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
   if (examine_directory (NULL, &state, LastDir, prefix) == -1)
     goto bail;
 
-  menu = mutt_new_menu ();
-  menu->menu = MENU_FOLDER;
+  menu = mutt_new_menu (MENU_FOLDER);
   menu->make_entry = folder_entry;
   menu->search = select_file_search;
   menu->title = title;
@@ -861,22 +892,22 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
 
       case OP_BROWSER_TOGGLE_LSUB:
 	if (option (OPTIMAPLSUB))
-	{
 	  unset_option (OPTIMAPLSUB);
-	}
 	else
-	{
 	  set_option (OPTIMAPLSUB);
-	}
+
 	mutt_ungetch (0, OP_CHECK_NEW);
 	break;
 
       case OP_CREATE_MAILBOX:
 	if (!state.imap_browse)
+	{
 	  mutt_error (_("Create is only supported for IMAP mailboxes"));
-	else
+	  break;
+	}
+
+	if (!imap_mailbox_create (LastDir))
 	{
-	  imap_mailbox_create (LastDir);
 	  /* TODO: find a way to detect if the new folder would appear in
 	   *   this window, and insert it without starting over. */
 	  destroy_state (&state);
@@ -890,6 +921,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
 	  init_menu (&state, menu, title, sizeof (title), buffy);
 	  MAYBE_REDRAW (menu->redraw);
 	}
+	/* else leave error on screen */
 	break;
 
       case OP_RENAME_MAILBOX:
@@ -899,7 +931,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
 	{
 	  int nentry = menu->current;
 
-	  if (imap_mailbox_rename (state.entry[nentry].name) >= 0) {
+	  if (imap_mailbox_rename (state.entry[nentry].name) >= 0)
+	  {
 	    destroy_state (&state);
 	    init_state (&state, NULL);
 	    state.imap_browse = 1;
@@ -1052,7 +1085,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
 	  if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0)
 	  {
 	    regerror (err, rx, buf, sizeof (buf));
-	    regfree (rx);
 	    FREE (&rx);
 	    mutt_error ("%s", buf);
 	  }