upstream/548577-gpgme-1.2.patch: do not fail to open pgp signed message with libgpgme...

[software/mutt-debian.git] / main.c

diff --git a/main.c b/main.c
index 0a566daa5a7e29abaedd8b845628c87c638e344b..baea582e2c45b7dd5146e8c369f008220aff1a40 100644 (file)
--- a/main.c
+++ b/main.c
@@ -65,7 +65,7 @@ To contact the developers, please mail to <mutt-dev@mutt.org>.\n\
 To report a bug, please visit http://bugs.mutt.org/.\n");
 
 static const char *Notice = N_("\
 To report a bug, please visit http://bugs.mutt.org/.\n");
 
 static const char *Notice = N_("\

-Copyright (C) 1996-2008 Michael R. Elkins and others.\n\
+Copyright (C) 1996-2009 Michael R. Elkins and others.\n\

 Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
 under certain conditions; type `mutt -vv' for details.\n");
 Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
 under certain conditions; type `mutt -vv' for details.\n");


@@ -73,11 +73,12 @@ under certain conditions; type `mutt -vv' for details.\n");
 static const char *Copyright = N_("\
 Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n\
 Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n\
 static const char *Copyright = N_("\
 Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n\
 Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n\

-Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n\
+Copyright (C) 1997-2008 Thomas Roessler <roessler@does-not-exist.org>\n\

 Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n\
 Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n\

-Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>\n\
+Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>\n\

 Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
 Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\
 Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
 Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\

+Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n\

 \n\
 Many others not mentioned here contributed code, fixes,\n\
 and suggestions.\n");
 \n\
 Many others not mentioned here contributed code, fixes,\n\
 and suggestions.\n");


@@ -111,6 +112,7 @@ static void mutt_usage (void)
   puts _(
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n\
        mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] <addr> [...]\n\
   puts _(
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n\
        mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] <addr> [...]\n\

+       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] <addr> [...] < message\n\

        mutt [<options>] -p\n\
        mutt [<options>] -A <alias> [...]\n\
        mutt [<options>] -Q <query> [...]\n\
        mutt [<options>] -p\n\
        mutt [<options>] -A <alias> [...]\n\
        mutt [<options>] -Q <query> [...]\n\


@@ -234,8 +236,6 @@ static void show_version (void)
        "-DL_STANDALONE  "
 #endif
 
        "-DL_STANDALONE  "
 #endif
 

-       "\n"
-       

 #ifdef USE_FCNTL
        "+USE_FCNTL  "
 #else
 #ifdef USE_FCNTL
        "+USE_FCNTL  "
 #else


@@ -247,7 +247,7 @@ static void show_version (void)
 #else
        "-USE_FLOCK   "
 #endif
 #else
        "-USE_FLOCK   "
 #endif

-       );
+    );

   puts (
 #ifdef USE_POP
        "+USE_POP  "
   puts (
 #ifdef USE_POP
        "+USE_POP  "


@@ -266,13 +266,7 @@ static void show_version (void)
 #else
        "-USE_SMTP  "
 #endif
 #else
        "-USE_SMTP  "
 #endif

-
-#ifdef USE_GSS
-       "+USE_GSS  "
-#else
-       "-USE_GSS  "
-#endif
-
+       "\n"

        
 #ifdef USE_SSL_OPENSSL
        "+USE_SSL_OPENSSL  "
        
 #ifdef USE_SSL_OPENSSL
        "+USE_SSL_OPENSSL  "


@@ -291,6 +285,11 @@ static void show_version (void)
 #else
        "-USE_SASL  "
 #endif
 #else
        "-USE_SASL  "
 #endif

+#ifdef USE_GSS
+       "+USE_GSS  "
+#else
+       "-USE_GSS  "
+#endif

 
 #if HAVE_GETADDRINFO
        "+HAVE_GETADDRINFO  "
 
 #if HAVE_GETADDRINFO
        "+HAVE_GETADDRINFO  "


@@ -544,7 +543,7 @@ int main (int argc, char **argv)
   int dump_variables = 0;
   extern char *optarg;
   extern int optind;
   int dump_variables = 0;
   extern char *optarg;
   extern int optind;

-  int attach_sep = 0;
+  int double_dash = argc, nargc = 1;

 
   /* sanity check against stupid administrators */
   
 
   /* sanity check against stupid administrators */
   


@@ -572,16 +571,32 @@ int main (int argc, char **argv)
   memset (Options, 0, sizeof (Options));
   memset (QuadOptions, 0, sizeof (QuadOptions));
 
   memset (Options, 0, sizeof (Options));
   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++)

     {
     {

-      attach_sep = i;
-      break;
+      if (argv[optind][0] == '-' && argv[optind][1] != '\0')
+      {
+        if (argv[optind][1] == '-' && argv[optind][2] == '\0')
+          double_dash = optind; /* quit outer loop after getopt */
+        break;                  /* drop through to getopt */
+      }
+
+      /* non-option, either an attachment or address */
+      if (attach)
+        attach = mutt_add_list (attach, argv[optind]);
+      else
+        argv[nargc++] = argv[optind];

     }
 
     }
 

-  while ((i = getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
-    switch (i)
-    {
+    if ((i = getopt (argc, argv, "+A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
+      switch (i)
+      {

       case 'A':
         alias_queries = mutt_add_list (alias_queries, optarg);
         break;
       case 'A':
         alias_queries = mutt_add_list (alias_queries, optarg);
         break;


@@ -616,7 +631,11 @@ int main (int argc, char **argv)
 
       case 'd':
 #ifdef DEBUG
 
       case 'd':
 #ifdef DEBUG

-       debuglevel = atoi (optarg);
+       if (mutt_atoi (optarg, &debuglevel) < 0 || debuglevel <= 0)
+       {
+         fprintf (stderr, _("Error: value '%s' is invalid for -d.\n"), optarg);
+         return 1;
+       }

        printf (_("Debugging at level %d.\n"), debuglevel);
 #else
        printf _("DEBUG was not defined during compilation.  Ignored.\n");
        printf (_("Debugging at level %d.\n"), debuglevel);
 #else
        printf _("DEBUG was not defined during compilation.  Ignored.\n");


@@ -682,7 +701,14 @@ int main (int argc, char **argv)
 
       default:
        mutt_usage ();
 
       default:
        mutt_usage ();

-    }
+      }
+  }
+
+  /* collapse remaining argv */
+  while (optind < argc)
+    argv[nargc++] = argv[optind++];
+  optind = 1;
+  argc = nargc;

 
   switch (version)
   {
 
   switch (version)
   {


@@ -719,6 +745,9 @@ int main (int argc, char **argv)
   /* Initialize crypto backends.  */
   crypt_init ();
 
   /* Initialize crypto backends.  */
   crypt_init ();
 

+  if (newMagic)
+    mx_set_magic (newMagic);
+

   if (queries)
   {
     for (; optind < argc; optind++)
   if (queries)
   {
     for (; optind < argc; optind++)


@@ -751,14 +780,6 @@ int main (int argc, char **argv)
     return rv;
   }
 
     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)
-    mx_set_magic (newMagic);
-

   if (!option (OPTNOCURSES))
   {
     SETCOLOR (MT_COLOR_NORMAL);
   if (!option (OPTNOCURSES))
   {
     SETCOLOR (MT_COLOR_NORMAL);


@@ -892,7 +913,7 @@ int main (int argc, char **argv)
          if (!option (OPTNOCURSES))
            mutt_endwin (NULL);
          perror (tempfile);
          if (!option (OPTNOCURSES))
            mutt_endwin (NULL);
          perror (tempfile);

-         fclose (fin);
+         safe_fclose (&fin);

          FREE (&tempfile);
          exit (1);
        }
          FREE (&tempfile);
          exit (1);
        }


@@ -900,9 +921,9 @@ int main (int argc, char **argv)
          mutt_copy_stream (fin, fout);
        else if (bodytext)
          fputs (bodytext, fout);
          mutt_copy_stream (fin, fout);
        else if (bodytext)
          fputs (bodytext, fout);

-       fclose (fout);
+       safe_fclose (&fout);

        if (fin && fin != stdin)
        if (fin && fin != stdin)

-         fclose (fin);
+         safe_fclose (&fin);

       }
     }
 
       }
     }