X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0a032eea07f6d77ac6ea4d5a39c9491c34358058..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 1dfa6974..a99b53cf 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -1,5 +1,4 @@
-/*
- * rmf.c -- remove a folder
+/* rmf.c -- remove a folder
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -8,6 +7,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
@@ -36,6 +37,7 @@ main (int argc, char **argv)
     int defolder = 0, interactive = -1;
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;
+    char *fp;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
@@ -71,8 +73,7 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    adios (NULL, "usage: %s [+folder] [switches]", invo_name);
 	}
@@ -84,8 +85,10 @@ main (int argc, char **argv)
 	folder = getfolder (1);
 	defolder++;
     }
-    if (strcmp (m_mailpath (folder), pwd ()) == 0)
+    fp = m_mailpath(folder);
+    if (!strcmp(fp, pwd()))
 	adios (NULL, "sorry, you can't remove the current working directory");
+    free(fp);
 
     if (interactive == -1)
 	interactive = defolder;
@@ -124,6 +127,7 @@ static int
 rmf (char *folder)
 {
     int i, others;
+    char *fp;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
@@ -136,8 +140,9 @@ rmf (char *folder)
 	    /* FALLTHRU */
 
 	case NOTOK: 
-	    snprintf (cur, sizeof(cur), "atr-%s-%s",
-			current, m_mailpath (folder));
+            fp = m_mailpath(folder);
+	    snprintf (cur, sizeof(cur), "atr-%s-%s", current, fp);
+            free(fp);
 	    if (!context_del (cur)) {
 		printf ("[+%s de-referenced]\n", folder);
 		return OK;
@@ -163,7 +168,7 @@ rmf (char *folder)
 		if (strcmp (dp->d_name, ".") == 0
 			|| strcmp (dp->d_name, "..") == 0)
 		    continue;
-		/* FALLTHRU */
+		break;
 
 	    case ',': 
 		break;
@@ -243,4 +248,6 @@ rma (char *folder)
 	    pp = np;
 	}
     }
+
+    free(cp);
 }