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 53e696afb78f69233a72311b9e1cf8f6c5ee84b8..94a18eff2697d0930f0493fccb9f7efba862c9d9 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -1,6 +1,4 @@
-
-/*
- * packf.c -- pack a nmh folder into a file
+/* 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


@@ -11,7 +9,7 @@
 #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"

 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \


@@ -30,7 +28,6 @@ DEFINE_SWITCH_ARRAY(PACKF, switches);
 
 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;
 
 
 static void mbxclose_done(int) NORETURN;
 


@@ -47,15 +44,9 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
     struct msgs *mp;
     struct stat st;
 

-    done=mbxclose_done;
-
-#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;


@@ -90,11 +81,9 @@ 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;
            }
        }
                    continue;
            }
        }


@@ -118,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);
     }


@@ -138,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 */


@@ -163,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);


@@ -182,7 +171,7 @@ main (int argc, char **argv)
     return 1;
 }
 
     return 1;
 }
 

-static void
+static void NORETURN

 mbxclose_done (int status)
 {
     mbx_close (file, md);
 mbxclose_done (int status)
 {
     mbx_close (file, md);