Changeset 1205:df3a6ad8d9d5 for browser.c

Timestamp:

1999-08-15 04:43:03 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Various changes added over the last week:

- $delete_untag
- creation of "application/pgp" messages
- an attempt to fix prepare.
- Browser format changes

Files:

• browser.c (modified) (15 diffs)

browser.c

@@ -48 +48 @@
 typedef struct folder_t
 {
-  const char *name;
-  const struct stat *f;
-  int new;
+  struct folder_file *ff;
+  int num;
 } FOLDER;
 
@@ -64 +63 @@
     safe_free ((void **) &((state->entry)[c].name));
     safe_free ((void **) &((state->entry)[c].desc));
+    safe_free ((void **) &((state->entry)[c].st));
   }
 #ifdef USE_IMAP
@@ -147 +147 @@
   switch (op)
   {
+    case 'C':
+      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+      snprintf (dest, destlen, tmp, folder->num + 1);
+      break;
+      
     case 'd':
-      if (folder->f != NULL)
+      if (folder->ff->st != NULL)
       {
         tnow = time (NULL);
-        t_fmt = tnow - folder->f->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d  %Y";
-        strftime (date, sizeof (date), t_fmt, localtime (&folder->f->st_mtime));
+        t_fmt = tnow - folder->ff->st->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d  %Y";
+        strftime (date, sizeof (date), t_fmt, localtime (&folder->ff->st->st_mtime));
         snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
         snprintf (dest, destlen, tmp, date);
@@ -162 +167 @@
       }
       break;
+      
     case 'f':
-      strfcpy (fn, folder->name, sizeof(fn));
-      if (folder->f != NULL)
-      {
-        strcat (fn, S_ISLNK (folder->f->st_mode) ? "@" : 
-                (S_ISDIR (folder->f->st_mode) ? "/" : 
-                 ((folder->f->st_mode & S_IXUSR) != 0 ? "*" : "")));
+      strfcpy (fn, folder->ff->name, sizeof(fn));
+      if (folder->ff->st != NULL)
+      {
+        strcat (fn, S_ISLNK (folder->ff->st->st_mode) ? "@" : 
+                (S_ISDIR (folder->ff->st->st_mode) ? "/" : 
+                 ((folder->ff->st->st_mode & S_IXUSR) != 0 ? "*" : "")));
       }
       snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
       snprintf (dest, destlen, tmp, fn);
       break;
+      
     case 'F':
-      if (folder->f != NULL)
+      if (folder->ff->st != NULL)
       {
         sprintf (permission, "%c%c%c%c%c%c%c%c%c%c",
-                 S_ISDIR(folder->f->st_mode) ? 'd' : (S_ISLNK(folder->f->st_mode) ? 'l' : '-'),
-                 (folder->f->st_mode & S_IRUSR) != 0 ? 'r': '-',
-                 (folder->f->st_mode & S_IWUSR) != 0 ? 'w' : '-',
-                 (folder->f->st_mode & S_ISUID) != 0 ? 's' : (folder->f->st_mode & S_IXUSR) != 0 ? 'x': '-',
-                 (folder->f->st_mode & S_IRGRP) != 0 ? 'r' : '-',
-                 (folder->f->st_mode & S_IWGRP) != 0 ? 'w' : '-',
-                 (folder->f->st_mode & S_ISGID) != 0 ? 's' : (folder->f->st_mode & S_IXGRP) != 0 ? 'x': '-',
-                 (folder->f->st_mode & S_IROTH) != 0 ? 'r' : '-',
-                 (folder->f->st_mode & S_IWOTH) != 0 ? 'w' : '-',
-                 (folder->f->st_mode & S_ISVTX) != 0 ? 't' : (folder->f->st_mode & S_IXOTH) != 0 ? 'x': '-');
+            S_ISDIR(folder->ff->st->st_mode) ? 'd' : (S_ISLNK(folder->ff->st->st_mode) ? 'l' : '-'),
+            (folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r': '-',
+            (folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
+            (folder->ff->st->st_mode & S_ISUID) != 0 ? 's' : (folder->ff->st->st_mode & S_IXUSR) != 0 ? 'x': '-',
+            (folder->ff->st->st_mode & S_IRGRP) != 0 ? 'r' : '-',
+            (folder->ff->st->st_mode & S_IWGRP) != 0 ? 'w' : '-',
+            (folder->ff->st->st_mode & S_ISGID) != 0 ? 's' : (folder->ff->st->st_mode & S_IXGRP) != 0 ? 'x': '-',
+            (folder->ff->st->st_mode & S_IROTH) != 0 ? 'r' : '-',
+            (folder->ff->st->st_mode & S_IWOTH) != 0 ? 'w' : '-',
+            (folder->ff->st->st_mode & S_ISVTX) != 0 ? 't' : (folder->ff->st->st_mode & S_IXOTH) != 0 ? 'x': '-');
         snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
         snprintf (dest, destlen, tmp, permission);
@@ -193 +200 @@
       {
 #ifdef USE_IMAP
-        if (strchr(folder->name, '{'))
+        if (strchr(folder->ff->name, '{'))
         {
           snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
@@ -201 +208 @@
       }
       break;
+      
     case 'g':
-      if (folder->f != NULL)
-      {
-        if ((gr = getgrgid (folder->f->st_gid)))
+      if (folder->ff->st != NULL)
+      {
+        if ((gr = getgrgid (folder->ff->st->st_gid)))
         {
           snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
@@ -212 +220 @@
         {
           snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-          snprintf (dest, destlen, tmp, folder->f->st_gid);
+          snprintf (dest, destlen, tmp, folder->ff->st->st_gid);
         }
       }
@@ -221 +229 @@
       }
       break;
+      
     case 'l':
-      if (folder->f != NULL)
+      if (folder->ff->st != NULL)
       {
         snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-        snprintf (dest, destlen, tmp, folder->f->st_nlink);
+        snprintf (dest, destlen, tmp, folder->ff->st->st_nlink);
       }
       else
@@ -233 +242 @@
       }
       break;
+      
     case 'N':
       snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
-      snprintf (dest, destlen, tmp, folder->new ? 'N' : ' ');
-      break;
+      snprintf (dest, destlen, tmp, folder->ff->is_new ? 'N' : ' ');
+      break;
+      
     case 's':
-      if (folder->f != NULL)
+      if (folder->ff->st != NULL)
       {
         snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-        snprintf (dest, destlen, tmp, (long) folder->f->st_size);
+        snprintf (dest, destlen, tmp, (long) folder->ff->st->st_size);
       }
       else
@@ -249 +260 @@
       }
       break;
+      
+    case 't':
+      snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
+      snprintf (dest, destlen, tmp, folder->ff->tagged ? '*' : ' ');
+      break;
+      
     case 'u':
-      if (folder->f != NULL)
-      {
-        if ((pw = getpwuid (folder->f->st_uid)))
+      if (folder->ff->st != NULL)
+      {
+        if ((pw = getpwuid (folder->ff->st->st_uid)))
         {
           snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
@@ -260 +277 @@
         {
           snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-          snprintf (dest, destlen, tmp, folder->f->st_uid);
+          snprintf (dest, destlen, tmp, folder->ff->st->st_uid);
         }
       }
@@ -269 +286 @@
       }
       break;
+      
+    default:
+      snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
+      snprintf (dest, destlen, tmp, op);
+      break;
   }
   return (src);
@@ -277 +299 @@
 {
   char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-  FOLDER folder;
-
-  folder.name = name;
-  folder.f = s;
-  folder.new = new;
-  mutt_FormatString (buffer, sizeof (buffer), NONULL(FolderFormat),
-                     folder_format_str, (unsigned long) &folder,
-                     M_FORMAT_ARROWCURSOR);
 
   if (state->entrylen == state->entrymax)
@@ -297 +311 @@
   if (s != NULL)
   {
-  (state->entry)[state->entrylen].mode = s->st_mode;
-  (state->entry)[state->entrylen].mtime = s->st_mtime;
-  (state->entry)[state->entrylen].size = s->st_size;
-  }
+    (state->entry)[state->entrylen].mode = s->st_mode;
+    (state->entry)[state->entrylen].mtime = s->st_mtime;
+    (state->entry)[state->entrylen].size = s->st_size;
+    
+    (state->entry)[state->entrylen].st = safe_malloc (sizeof (struct stat));
+    memcpy ((state->entry)[state->entrylen].st, s, sizeof (struct stat));
+  }
+
+  (state->entry)[state->entrylen].is_new = new;
   (state->entry)[state->entrylen].name = safe_strdup (name);
   (state->entry)[state->entrylen].desc = safe_strdup (buffer);
@@ -424 +443 @@
 void folder_entry (char *s, size_t slen, MUTTMENU *menu, int num)
 {
-  snprintf (s, slen, "%2d %c %s", 
-            num + 1, 
-            ((struct folder_file *) menu->data)[num].tagged ? '*' : ' ',
-            ((struct folder_file *) menu->data)[num].desc);
+  FOLDER folder;
+
+  folder.ff = &((struct folder_file *) menu->data)[num];
+  folder.num = num;
+  
+  mutt_FormatString (s, slen, NONULL(FolderFormat), folder_format_str, 
+      (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
 }