lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 9f71b927df4151dc1cd6c4e8d642edbd4838c7d9..94a18eff2697d0930f0493fccb9f7efba862c9d9 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -1,8 +1,4 @@
-
-/*
- * packf.c -- pack a nmh folder into a file
- *
- * $Id$
+/* packf.c -- pack a nmh folder into a file

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -13,32 +9,27 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>

-#include <errno.h>
+#include "sbr/m_maildir.h"

 
 

-/*
- * We allocate space for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
-
-static struct swit switches[] = {
-#define FILESW         0
-    { "file name", 0 },
-#define MBOXSW         1
-    { "mbox", 0 },
-#define MMDFSW         2
-    { "mmdf", 0 },
-#define VERSIONSW      3
-    { "version", 0 },
-#define        HELPSW         4
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define PACKF_SWITCHES \
+    X("file name", 0, FILESW) \
+    X("mbox", 0, MBOXSW) \
+    X("mmdf", 0, MMDFSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(PACKF);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(PACKF, switches);
+#undef X

 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;

-static int mapping = 0;
+
+static void mbxclose_done(int) NORETURN;

 
 char *file = NULL;
 
 
 char *file = NULL;
 


@@ -46,30 +37,20 @@ char *file = NULL;
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int nummsgs, maxmsgs, fd, msgnum;
+    int fd, msgnum;

     char *cp, *maildir, *msgnam, *folder = NULL, buf[BUFSIZ];
     char *cp, *maildir, *msgnam, *folder = NULL, buf[BUFSIZ];

-    char **argp, **arguments, **msgs;
+    char **argp, **arguments;
+    struct msgs_array msgs = { 0, 0, NULL };

     struct msgs *mp;
     struct stat st;
 
     struct msgs *mp;
     struct stat st;
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
+    done=mbxclose_done;

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-    /* Allocate the initial space to record message
-     * names and ranges.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
-

     /*
      * Parse arguments
      */
     /*
      * Parse arguments
      */


@@ -86,10 +67,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case FILESW: 
                    if (file)
 
                case FILESW: 
                    if (file)


@@ -100,31 +81,18 @@ main (int argc, char **argv)
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;

-                   mapping = 0;

                    continue;
                case MMDFSW:
                    mbx_style = MMDF_FORMAT;
                    continue;
                case MMDFSW:
                    mbx_style = MMDF_FORMAT;

-                   mapping = 1;

                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-       } else {
-           /*
-            * Check if we need to allocate more space
-            * for message name/ranges.
-            */
-           if (nummsgs >= maxmsgs) {
-               maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                       (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
-           }
-           msgs[nummsgs++] = cp;
-       }
+           folder = pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

     }
 
     if (!file)
     }
 
     if (!file)


@@ -139,7 +107,7 @@ main (int argc, char **argv)
        if (errno != ENOENT)
            adios (file, "error on file");
        cp = concat ("Create file \"", file, "\"? ", NULL);
        if (errno != ENOENT)
            adios (file, "error on file");
        cp = concat ("Create file \"", file, "\"? ", NULL);

-       if (!getanswer (cp))
+       if (!read_yes_or_no_if_tty (cp))

            done (1);
        free (cp);
     }
            done (1);
        free (cp);
     }


@@ -148,8 +116,8 @@ main (int argc, char **argv)
        free (path ("./", TFOLDER));
 
     /* default is to pack whole folder */
        free (path ("./", TFOLDER));
 
     /* default is to pack whole folder */

-    if (!nummsgs)
-       msgs[nummsgs++] = "all";
+    if (!msgs.size)
+       app_msgarg(&msgs, "all");

 
     if (!folder)
        folder = getfolder (1);
 
     if (!folder)
        folder = getfolder (1);


@@ -159,7 +127,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to ");
 
     /* read folder and create message structure */
        adios (maildir, "unable to change directory to ");
 
     /* read folder and create message structure */

-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))

        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -167,8 +135,8 @@ main (int argc, char **argv)
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */

-    for (msgnum = 0; msgnum < nummsgs; msgnum++)
-       if (!m_convert (mp, msgs[msgnum]))
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp, msgs.msgs[msgnum]))

            done (1);
     seq_setprev (mp);  /* set the previous-sequence */
 
            done (1);
     seq_setprev (mp);  /* set the previous-sequence */
 


@@ -184,7 +152,7 @@ main (int argc, char **argv)
                break;
            }
 
                break;
            }
 

-           if (mbx_copy (file, mbx_style, md, fd, mapping, NULL, 1) == NOTOK)
+           if (mbx_copy (file, mbx_style, md, fd, NULL) == NOTOK)

                adios (file, "error writing to file");
 
            close (fd);
                adios (file, "error writing to file");
 
            close (fd);


@@ -199,13 +167,13 @@ main (int argc, char **argv)
     seq_save (mp);
     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */
     seq_save (mp);
     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */

-    return done (0);
+    done (0);
+    return 1;

 }
 
 }
 

-int
-done (int status)
+static void NORETURN
+mbxclose_done (int status)

 {
     mbx_close (file, md);
     exit (status);
 {
     mbx_close (file, md);
     exit (status);

-    return 1;  /* dead code to satisfy the compiler */

 }
 }