Move the opening brace of a C function to its own line.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index f070f48d81bfe9cf2730348b44ec643275ae6c07..8022e38aa1d9eb0d3810363273d4cb0ae4bdb8ad 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


@@ -10,7 +8,9 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>

+#include "h/done.h"

 #include <h/utils.h>
 #include <h/utils.h>

+#include "sbr/m_maildir.h"

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


@@ -29,7 +29,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;
 


@@ -46,15 +45,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], true, true)) { return 1; }

 
 

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

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


@@ -69,7 +62,7 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",


@@ -82,24 +75,22 @@ main (int argc, char **argv)
 
                case FILESW: 
                    if (file)
 
                case FILESW: 
                    if (file)

-                       adios (NULL, "only one file at a time!");
+                       die("only one file at a time!");

                    if (!(file = *argp++) || *file == '-')
                    if (!(file = *argp++) || *file == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;
                    continue;
 
                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)
                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
+               die("only one folder at a time!");

            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);


@@ -117,7 +108,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,11 +129,11 @@ main (int argc, char **argv)
 
     /* read folder and create message structure */
     if (!(mp = folder_read (folder, 1)))
 
     /* read folder and create message structure */
     if (!(mp = folder_read (folder, 1)))

-       adios (NULL, "unable to read folder %s", folder);
+       die("unable to read folder %s", folder);

 
     /* check for empty folder */
     if (mp->nummsg == 0)
 
     /* check for empty folder */
     if (mp->nummsg == 0)

-       adios (NULL, "no messages in %s", folder);
+       die("no messages in %s", folder);

 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)


@@ -162,7 +153,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);


@@ -181,7 +172,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);