Changeset 1205:df3a6ad8d9d5

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:

• Makefile.am (modified) (1 diff)
• Muttrc (modified) (8 diffs)
• NEWS (modified) (1 diff)
• README.SECURITY (modified) (1 diff)
• browser.c (modified) (15 diffs)
• browser.h (modified) (2 diffs)
• commands.c (modified) (5 diffs)
• copy.c (modified) (4 diffs)
• curs_main.c (modified) (2 diffs)
• doc/Makefile.in (modified) (4 diffs)
• doc/manual.sgml (modified) (8 diffs)
• doc/muttrc.man (modified) (7 diffs)
• globals.h (modified) (1 diff)
• init.c (modified) (1 diff)
• init.h (modified) (6 diffs)
• main.c (modified) (1 diff)
• mutt.h (modified) (3 diffs)
• mx.c (modified) (1 diff)
• pgp.c (modified) (10 diffs)
• pgp.h (modified) (2 diffs)
• pgpinvoke.c (modified) (1 diff)
• prepare (modified) (1 diff)
• send.c (modified) (9 diffs)

Makefile.am

@@ -151 +151 @@
 
 stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
-        cpp -D_MAKEDOC -C -I. -I $(srcdir) -include config.h    \
-                $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - \
+        cpp $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
+                -include config.h $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - \
                 > Muttrc
         touch stamp-doc-rc

Muttrc

@@ -426 +426 @@
 # 
 # 
-# set dotlock_program="BINDIR/mutt_dotlock"
+# set delete_untag=yes
+#
+# Name: delete_untag
+# Type: boolean
+# Default: yes
+# 
+# 
+# If this option is set, mutt will untag messages when marking them
+# for deletion.  This applies when you either explicitly delete a message,
+# or when you save it to another folder.
+# 
+# 
+# set dotlock_program="/usr/local/bin/mutt_dotlock"
 #
 # Name: dotlock_program
 # Type: path
-# Default: "BINDIR/mutt_dotlock"
+# Default: "/usr/local/bin/mutt_dotlock"
 # 
 # 
@@ -561 +573 @@
 # 
 # 
-# set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
+# set folder_format="%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f"
 #
 # Name: folder_format
 # Type: string
-# Default: "%N %F %2l %-8.8u %-8.8g %8s %d %f"
+# Default: "%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f"
 # 
 # 
@@ -572 +584 @@
 # its own set of printf()-like sequences:
 # 
+# %C      current file number
 # %d      date/time folder was last modified
 # %f      filename
@@ -579 +592 @@
 # %N      N if folder has new mail, blank otherwise
 # %s      size in bytes
+# %t      * if the file is tagged, blank otherwise
 # %u      owner name (or numeric uid, if missing)
 # %>X     right justify the rest of the string and pad 
@@ -795 +809 @@
 # list.
 # 
+# 
+# set imap_checkinterval=0
+#
+# Name: imap_checkinterval
+# Type: number
+# Default: 0
+# 
+# 
+# This variable configures how often (in seconds) IMAP should look for
+# new mail.
+# 
+# 
+# set imap_list_subscribed=no
+#
+# Name: imap_list_subscribed
+# Type: boolean
+# Default: no
+# 
+# 
+# This variable configures whether IMAP folder browsing will look for
+# only subscribed folders or all folders.  This can be toggled in the
+# IMAP browser with the toggle-subscribed command.
+# 
+# 
+# set imap_user=""
+#
+# Name: imap_user
+# Type: string
+# Default: ""
+# 
+# 
+# Your login name on the IMAP server.
+# 
+# This variable defaults to your user name on the local machine.
+# 
+# 
+# set imap_pass=""
+#
+# Name: imap_pass
+# Type: string
+# Default: ""
+# 
+# 
+# Specifies the password for your IMAP account.  If unset, Mutt will
+# prompt you for your password when you invoke the fetch-mail function.
+# Warning: you should only use this option when you are on a
+# fairly secure machine, because the superuser can read your muttrc even
+# if you are the only one who can read the file.
+# 
+# 
+# set imap_passive=yes
+#
+# Name: imap_passive
+# Type: boolean
+# Default: yes
+# 
+# 
+# When set, mutt will not open new IMAP connections to check for new
+# mail.  Mutt will only check for new mail over existing IMAP
+# connections.  This is useful if you don't want to be prompted to
+# user/password pairs on mutt invocation, or if opening the connection
+# is slow.
+# 
+# 
+# set imap_home_namespace=""
+#
+# Name: imap_home_namespace
+# Type: string
+# Default: ""
 # 
 # set implicit_autoview=no
@@ -1461 +1544 @@
 # 
 # 
+# set pgp_create_traditional=no
+#
+# Name: pgp_create_traditional
+# Type: quadoption
+# Default: no
+# 
+# 
+# This option controls whether Mutt generates old-style PGP encrypted
+# or signed messages under certain circumstances.
+# 
+# Note that PGP/MIME will be used automatically for messages which have
+# a character set different from us-ascii, or which consist of more than
+# a single MIME part.
+# 
+# Also note that using the old-style PGP message format is strongly
+# deprecated.
+# 
+# 
 # set pgp_decode_command=""
 #
@@ -1523 +1624 @@
 # 
 # 
+# set pgp_clearsign_command=""
+#
+# Name: pgp_clearsign_command
+# Type: string
+# Default: ""
+# 
+# 
+# This format is used to create a "clearsigned" old-style PGP attachment.
+# Note that the use of this format is strongly deprecated.
+# 
+# 
 # set pgp_sign_command=""
 #
@@ -1667 +1779 @@
 # The separator to add between messages when piping a list of tagged
 # messages to an external Unix command.
+# 
+# 
+# set pop_delete=no
+#
+# Name: pop_delete
+# Type: boolean
+# Default: no
+# 
+# 
+# If set, Mutt will delete successfully downloaded messages from the POP
+# server when using the fetch-mail function.  When unset, Mutt will
+# download messages but also leave them on the POP server.
+# 
+# 
+# set pop_host=""
+#
+# Name: pop_host
+# Type: string
+# Default: ""
+# 
+# 
+# The name or address of your POP3 server.
+# 
+# 
+# set pop_port=110
+#
+# Name: pop_port
+# Type: number
+# Default: 110
+# 
+# 
+# This variable specifies which port your POP server is listening on.
+# 
+# 
+# set pop_last=no
+#
+# Name: pop_last
+# Type: boolean
+# Default: no
+# 
+# 
+# If this variable is set, mutt will try to use the "LAST" POP command
+# for retrieving only unread messages from the POP server.
+# 
+# 
+# set pop_user=""
+#
+# Name: pop_user
+# Type: string
+# Default: ""
+# 
+# 
+# Your login name on the POP3 server.
+# 
+# Defaults to your login name on the local system.
+# 
+# 
+# set pop_pass=""
+#
+# Name: pop_pass
+# Type: string
+# Default: ""
+# 
+# 
+# Your password on the POP3 server.
 # 
 # 

NEWS

@@ -1 +1 @@
 Major changes since 0.96.3
 --------------------------
+
+- There is a new option $delete_untag.  Former mutt versions used to
+  untag messages when you save them, but leave them tagged whe you
+  mark them for deletion.  $delete_untag controls _both_ cases,
+  leading to more uniform behaviour.
+
+- The $weed option applies to the decode-save and decode-copy
+  functions.  Think of these functions as something along the lines
+  of "save to file".
 
 - The master source of the configuration option reference has been

README.SECURITY

@@ -57 +57 @@
 
 > text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} \
->         && test "`echo $charset | tr '[A-Z]' '[a-z]'`" != iso-8859-1
+>         && test "`echo \"$charset\" | tr '[A-Z]' '[a-z]'`" != iso-8859-1
 
-The "charset=%{charset}" assignment is risk-free since mutt performs
-the necessary quoting steps here.  Using it inside the backtick
-expansion is safe, too, since the variable's value is not itself
-subject to any further expansion (but note that it _is_ subject to
-word splitting). 

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);
 }
 

browser.h

@@ -24 +24 @@
 {
   mode_t mode;
+  off_t size;
   time_t mtime;
-  off_t size;
+  struct stat *st;
+
   char *name;
   char *desc;
@@ -32 +34 @@
 #endif
   unsigned tagged : 1;
+  unsigned is_new : 1;
 };
 

commands.c

@@ -478 +478 @@
 }
 
-static void set_copy_flags(HEADER *hdr, int decode, int decrypt, int *cmflags, int *chflags)
+static void set_copy_flags (HEADER *hdr, int decode, int decrypt, int *cmflags, int *chflags)
 {
   *cmflags = 0;
@@ -496 +496 @@
 #endif
 
-  if(decode)
+  if (decode)
   {
     *chflags = CH_XMIT | CH_MIME | CH_TXTPLAIN;
@@ -502 +502 @@
   }
 
+  /* respect $weed only if decode doesn't kick in
+   * for decrypt.
+   */
+
+  if (decode && !decrypt && option (OPTWEED))
+  {
+    *chflags |= CH_WEED;
+    *cmflags |= M_CM_WEED;
+  }
 }
 
@@ -508 +517 @@
   int cmflags, chflags;
   
-  set_copy_flags(h, decode, decrypt, &cmflags, &chflags);
-
-  if (decode  || decrypt)
+  set_copy_flags (h, decode, decrypt, &cmflags, &chflags);
+
+  if (decode || decrypt)
     mutt_parse_mime_message (Context, h);
 
@@ -516 +525 @@
   {
     mutt_set_flag (Context, h, M_DELETE, 1);
-    mutt_set_flag (Context, h, M_TAG, 0);
+    if (option (OPTDELETEUNTAG))
+      mutt_set_flag (Context, h, M_TAG, 0);
   }
 }

copy.c

@@ -46 +46 @@
 {
   int from = 0;
+  int this_is_from;
   int ignore = 0;
   char buf[STRING]; /* should be long enough to get most fields in one pass */
@@ -137 +138 @@
     {
       ignore = 1;
+      this_is_from = 0;
       if (!from && mutt_strncmp ("From ", buf, 5) == 0)
       {
         if ((flags & CH_FROM) == 0)
           continue;
-        from = 1;
+        this_is_from = from = 1;
       }
       else if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n'))
         break; /* end of header */
 
-      if ((flags & CH_WEED) && 
+      /* note: CH_FROM takes precedence over header weeding. */
+      if (!((flags & CH_FROM) && (flags & CH_FORCE_FROM) && this_is_from) &&
+          (flags & CH_WEED) &&
           mutt_matches_ignore (buf, Ignore) &&
           !mutt_matches_ignore (buf, UnIgnore))
@@ -263 +267 @@
         CH_DECODE       RFC2047 header decoding
         CH_FROM         retain the "From " message separator
+        CH_FORCE_FROM   give CH_FROM precedence over CH_WEED
         CH_MIME         ignore MIME fields
         CH_NOLEN        don't write Content-Length: and Lines:
@@ -607 +612 @@
     return -1;
   if (dest->magic == M_MBOX || dest->magic == M_MMDF || dest->magic == M_KENDRA)
-    chflags |= CH_FROM;
+    chflags |= CH_FROM | CH_FORCE_FROM;
   chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
   r = _mutt_copy_message (msg->fp, fpin, hdr, body, flags, chflags);

curs_main.c

@@ -1441 +1441 @@
         {
           mutt_tag_set_flag (M_DELETE, 1);
+          if (option (OPTDELETEUNTAG))
+            mutt_tag_set_flag (M_TAG, 0);
           menu->redraw = REDRAW_INDEX;
         }