Fixed extra and missing trailing commas in SEE ALSO sections of man pages.

[nmh] / sbr / m_maildir.c

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index a4f2af57b9424922608be0fc0a06fc911938ecee..0f9584b6c38f5352d54a225c9175bb3364d5cff9 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -1,6 +1,4 @@
-
-/*
- * m_maildir.c -- get the path for the mail directory
+/* m_maildir.c -- get the path for the mail directory

  *
  * 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 "m_maildir.h"

 
 #define        CWD     "./"
 #define        DOT     "."
 
 #define        CWD     "./"
 #define        DOT     "."


@@ -44,10 +43,10 @@ m_mailpath (char *folder)
     char maildir[BUFSIZ];
 
     if (*folder != '/'
     char maildir[BUFSIZ];
 
     if (*folder != '/'

-           && !HasPrefix(folder, CWD)
+           && !has_prefix(folder, CWD)

            && strcmp (folder, DOT)
            && strcmp (folder, DOTDOT)
            && strcmp (folder, DOT)
            && strcmp (folder, DOTDOT)

-           && !HasPrefix(folder, PWD)) {
+           && !has_prefix(folder, PWD)) {

        strncpy (maildir, mailfold, sizeof(maildir));   /* preserve... */
        cp = getcpy (m_maildir (folder));
        strncpy (mailfold, maildir, sizeof(mailfold));
        strncpy (maildir, mailfold, sizeof(maildir));   /* preserve... */
        cp = getcpy (m_maildir (folder));
        strncpy (mailfold, maildir, sizeof(mailfold));


@@ -69,10 +68,10 @@ exmaildir (char *folder)
        folder = getfolder(1);
 
     if (!(*folder != '/'
        folder = getfolder(1);
 
     if (!(*folder != '/'

-           && !HasPrefix(folder, CWD)
+           && !has_prefix(folder, CWD)

            && strcmp (folder, DOT)
            && strcmp (folder, DOTDOT)
            && strcmp (folder, DOT)
            && strcmp (folder, DOTDOT)

-           && !HasPrefix(folder, PWD))) {
+           && !has_prefix(folder, PWD))) {

        strncpy (mailfold, folder, sizeof(mailfold));
        return mailfold;
     }
        strncpy (mailfold, folder, sizeof(mailfold));
        return mailfold;
     }


@@ -83,9 +82,9 @@ exmaildir (char *folder)
            snprintf(cp, sizeof mailfold, "%s/", mypath);
            cp += strlen (cp);
        }
            snprintf(cp, sizeof mailfold, "%s/", mypath);
            cp += strlen (cp);
        }

-       cp = copy (pp, cp);
+       cp = stpcpy(cp, pp);

     } else {
     } else {

-       cp = copy (path ("./", TFOLDER), cp);
+       cp = stpcpy(cp, path("./", TFOLDER));

     }
     if (cp[-1] != '/')
        *cp++ = '/';
     }
     if (cp[-1] != '/')
        *cp++ = '/';