Strip directory from #include when it's not needed.

[nmh] / uip / mhpath.c

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 23ca5428582556902a7b7c739b0dd350f21c6a26..2450089ffda2f279db09ef87fcb5d2646002b3ac 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -1,22 +1,27 @@
-
-/*
- * mhpath.c -- print full pathnames of nmh messages and folders
+/* mhpath.c -- print full pathnames of nmh messages and folders

  *
  * 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.
  */
 
  *
  * 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/utils.h>
+#include "h/mh.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+
+#define MHPATH_SWITCHES \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHPATH);
+#undef X

 
 

-static struct swit switches[] = {
-#define VERSIONSW 0
-    { "version", 0 },
-#define        HELPSW  1
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHPATH, switches);
+#undef X

 
 int
 main(int argc, char **argv)
 
 int
 main(int argc, char **argv)


@@ -28,13 +33,7 @@ main(int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 

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

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


@@ -49,23 +48,22 @@ 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]",
                        invo_name);
                    print_help (buf, switches, 1);
 
                case HELPSW: 
                    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);

            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

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

        } else
                app_msgarg(&msgs, cp);
     }
        } else
                app_msgarg(&msgs, cp);
     }


@@ -79,7 +77,7 @@ main(int argc, char **argv)
 
     /* If no messages are given, print folder pathname */
     if (!msgs.size) {
 
     /* If no messages are given, print folder pathname */
     if (!msgs.size) {

-       printf ("%s\n", maildir);
+       puts(maildir);

        done (0);
     }
 
        done (0);
     }
 


@@ -87,8 +85,8 @@ 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)))
-       adios (NULL, "unable to read folder %s", folder);
+    if (!(mp = folder_read (folder, 1)))
+       die("unable to read folder %s", folder);

 
     /*
      * We need to make sure there is message status space
 
     /*
      * We need to make sure there is message status space


@@ -98,10 +96,10 @@ main(int argc, char **argv)
      */
     if (mp->hghmsg >= mp->hghoff) {
        if (!(mp = folder_realloc (mp, 1, mp->hghmsg + 10)))
      */
     if (mp->hghmsg >= mp->hghoff) {
        if (!(mp = folder_realloc (mp, 1, mp->hghmsg + 10)))

-           adios (NULL, "unable to allocate folder storage");
+           die("unable to allocate folder storage");

     } else if (mp->lowoff > 1) {
        if (!(mp = folder_realloc (mp, 1, mp->hghoff)))
     } else if (mp->lowoff > 1) {
        if (!(mp = folder_realloc (mp, 1, mp->hghoff)))

-           adios (NULL, "unable to allocate folder storage");
+           die("unable to allocate folder storage");

     }
 
     mp->msgflags |= ALLOW_NEW; /* allow the "new" sequence */
     }
 
     mp->msgflags |= ALLOW_NEW; /* allow the "new" sequence */