Use macros in advertise() to simplify source.

[nmh] / sbr / m_maildir.c

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 11c6ee3e041e4fec7fa9b5de722628c1ece4cb99..13bea0897a0fd97d1d537862c35d839ba7c95ab8 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -2,7 +2,9 @@
 /*
  * m_maildir.c -- get the path for the mail directory
  *
- * $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>
@@ -25,7 +27,7 @@ static char *exmaildir (char *);
 char *
 m_maildir (char *folder)
 {
-    register char *cp, *ep;
+    char *cp, *ep;
 
     if ((cp = exmaildir (folder))
            && (ep = cp + strlen (cp) - 1) > cp
@@ -39,7 +41,7 @@ m_maildir (char *folder)
 char *
 m_mailpath (char *folder)
 {
-    register char *cp;
+    char *cp;
     char maildir[BUFSIZ];
 
     if (*folder != '/'
@@ -61,7 +63,7 @@ m_mailpath (char *folder)
 static char *
 exmaildir (char *folder)
 {
-    register char *cp, *pp;
+    char *cp, *pp;
 
     /* use current folder if none is specified */
     if (folder == NULL)
@@ -79,7 +81,7 @@ exmaildir (char *folder)
     cp = mailfold;
     if ((pp = context_find ("path")) && *pp) {
        if (*pp != '/') {
-           sprintf (cp, "%s/", mypath);
+           snprintf(cp, sizeof mailfold, "%s/", mypath);
            cp += strlen (cp);
        }
        cp = copy (pp, cp);