aliasbr.c: Remove duplicate prototypes. Others in aliasbr.h.

[nmh] / uip / mhpath.c

diff --git a/uip/mhpath.c b/uip/mhpath.c
index b9506d7383cc96efe8818bf9d6172be2acdecb1d..1b5fd3b1f23e042f7cad719624a5f89e8c514e06 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -1,6 +1,4 @@
-
-/*
- * 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -9,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

+#include "../sbr/m_maildir.h"

 
 #define MHPATH_SWITCHES \
     X("version", 0, VERSIONSW) \
 
 #define MHPATH_SWITCHES \
     X("version", 0, VERSIONSW) \


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

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

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


@@ -62,8 +61,7 @@ main(int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

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


@@ -77,7 +75,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);
     }