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

[nmh] / uip / rcvpack.c

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f5b1c0545c7542b31429ff8dad5120bcfcbf4dba..7fc7602fe454e43d49f3a61622f1ccf8c93b8c6a 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -1,27 +1,30 @@
-
-/*
- * rcvpack.c -- append message to a file
+/* rcvpack.c -- append message to a file

  *
  *

- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.

  */
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
  */
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>

-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
-
-static struct swit switches[] = {
-#define MBOXSW       0
-    { "mbox", 0 },
-#define MMDFSW       1
-    { "mmdf", 0 },
-#define VERSIONSW    2
-    { "version", 0 },
-#define        HELPSW       3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#include <h/tws.h>
+#include <h/mts.h>
+#include <h/utils.h>
+
+#define RCVPACK_SWITCHES \
+    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(RCVPACK);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RCVPACK, switches);
+#undef X

 
 /*
  * default format in which to save messages
 
 /*
  * default format in which to save messages


@@ -36,15 +39,9 @@ main (int argc, char **argv)
     char *cp, *file = NULL, buf[BUFSIZ];
     char **argp, **arguments;
 
     char *cp, *file = NULL, buf[BUFSIZ];
     char **argp, **arguments;
 

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

 
 

-    mts_init (invo_name);
+    mts_init ();

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


@@ -61,10 +58,10 @@ main (int argc, char **argv)
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
                    print_help (buf, switches, 1);
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] file", 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 MBOXSW:
                    mbx_style = MBOX_FORMAT;
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;


@@ -76,8 +73,7 @@ main (int argc, char **argv)
        }
        if (file)
            adios (NULL, "only one file at a time!");
        }
        if (file)
            adios (NULL, "only one file at a time!");

-       else
-           file = cp;
+        file = cp;

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


@@ -90,7 +86,7 @@ main (int argc, char **argv)
        done (RCV_MBX);
 
     /* append the message */
        done (RCV_MBX);
 
     /* append the message */

-    if (mbx_copy (file, mbx_style, md, fileno(stdin), 1, NULL, 0) == NOTOK) {
+    if (mbx_copy (file, mbx_style, md, fileno(stdin), NULL) == NOTOK) {

        mbx_close (file, md);
        done (RCV_MBX);
     }
        mbx_close (file, md);
        done (RCV_MBX);
     }


@@ -99,5 +95,6 @@ main (int argc, char **argv)
     if (mbx_close (file, md) == NOTOK)
        done (RCV_MBX);
 
     if (mbx_close (file, md) == NOTOK)
        done (RCV_MBX);
 

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

 }
 }