X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=e435a276892449e84b2aafa718b3671c8f877e1c;hp=f2460042503dc320953400f8cca287447f7525fd;hb=18591f8e001ecedbee48a51c1d1f08ebaa1c15c8;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/rmf.c b/uip/rmf.c
index f246004..e435a27 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <locale.h>
@@ -76,7 +77,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else {
 			adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
 					invo_name);
@@ -110,7 +111,7 @@ main(int argc, char **argv)
 		cp = concat("Remove folder \"", folder, "\"? ", NULL);
 		if (!getanswer(cp))
 			exit(EX_OK);
-		free(cp);
+		mh_free0(&cp);
 	}
 
 	if (rmf(folder) == OK) {
@@ -129,10 +130,10 @@ static int
 rmf(char *folder)
 {
 	int i, others;
-	register char *maildir;
+	char *maildir;
 	char cur[BUFSIZ];
-	register struct dirent *dp;
-	register DIR *dd;
+	struct dirent *dp;
+	DIR *dd;
 
 	switch (i = chdir(maildir = toabsdir(folder))) {
 	case OK:
@@ -218,12 +219,12 @@ rmf(char *folder)
 static void
 rma(char *folder)
 {
-	register int alen, j, plen;
-	register char *cp;
-	register struct node *np, *pp;
+	int alen, j, plen;
+	char *cp;
+	struct node *np, *pp;
 
 	alen = strlen("atr-");
-	plen = strlen(cp = getcpy(toabsdir(folder))) + 1;
+	plen = strlen(cp = mh_xstrdup(toabsdir(folder))) + 1;
 
 	/*
 	** Search context list for keys that look like
@@ -248,5 +249,5 @@ rma(char *folder)
 			pp = np;
 		}
 	}
-	free(cp);
+	mh_free0(&cp);
 }