Changeset 5488:31c9e9727d42

Timestamp:

2008-08-19 13:44:26 (4 months ago)

Author:

Aron Griffis <agriffis@…>

Branch:

HEAD

Message:

Handle -- correctly with or without -a, closes #3097

Prefix optstring with "+" to force POSIX behavior on GNU getopt, and thereby
prevent reordering argv. This allows us to correctly handle mixed addresses,
attachments, options and the double-dash to signal end-of-options.

Signed-off-by: Aron Griffis <agriffis@…>

Files:

• main.c (modified) (4 diffs)

main.c

@@ -546 +546 @@
   extern char *optarg;
   extern int optind;
-  int attach_sep = 0;
+  int double_dash = argc, nargc = 1;
 
   /* sanity check against stupid administrators */
@@ -574 +574 @@
   memset (QuadOptions, 0, sizeof (QuadOptions));
 
-  for (i = 1; i < argc; i++)
-    if (!strcmp(argv[i], "--"))
+  for (optind = 1; optind < double_dash; )
+  {
+   /* We're getopt'ing POSIXLY, so we'll be here every time getopt()
+    * encounters a non-option.  That could be a file to attach 
+    * (all non-options between -a and --) or it could be an address
+    * (which gets collapsed to the front of argv).
+    */
+   for (; optind < argc; optind++)
+   {
+    if (argv[optind][0] == '-')
     {
-      attach_sep = i;
-      break;
+      if (argv[optind][1] == '-' && argv[optind][2] == '\0')
+        double_dash = optind; /* quit outer loop after getopt */
+      break;                  /* drop through to getopt */
     }
 
-  while ((i = getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
+    /* non-option, either an attachment or address */
+    if (attach)
+      attach = mutt_add_list (attach, argv[optind]);
+    else
+      argv[nargc++] = argv[optind];
+   }
+
+   if ((i = getopt (argc, argv, "+A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
     switch (i)
     {
@@ -685 +701 @@
         mutt_usage ();
     }
+  }
+
+  /* collapse remaining argv */
+  while (optind < argc)
+    argv[nargc++] = argv[optind++];
+  optind = 1;
+  argc = nargc;
 
   switch (version)
@@ -752 +775 @@
     return rv;
   }
-
-  /* if an -a option is present, all non-option arguments before -- are considered attachments */
-  if (attach)
-    for (; optind <= attach_sep; optind++)
-      attach = mutt_add_list (attach, argv[optind]);
 
   if (newMagic)