X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=e75deb9f1e93d939d59c0aa65c104ca39d95b61e;hp=01f205beac7025aec2c16ae654d40388a54092c7;hb=9cf6132a6ea29968131a000bc2fb6860affac45e;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/refile.c b/uip/refile.c
index 01f205b..e75deb9 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -101,7 +101,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
@@ -110,7 +110,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				files[filep++] = getcpy(expanddir(cp));
+				files[filep++] = mh_xstrdup(expanddir(cp));
 				continue;
 			}
 		}
@@ -118,7 +118,7 @@ main(int argc, char **argv)
 			if (foldp > NFOLDERS)
 				adios(EX_USAGE, NULL, "only %d folders allowed!",
 						NFOLDERS);
-			folders[foldp++].f_name = getcpy(expandfol(cp));
+			folders[foldp++].f_name = mh_xstrdup(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -184,10 +184,10 @@ main(int argc, char **argv)
 	*/
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {
-			cp = getcpy(m_name(msgnum));
+			cp = mh_xstrdup(m_name(msgnum));
 			if (m_file(cp, folders, foldp, !linkf))
 				exit(EX_IOERR);
-			free(cp);
+			mh_free0(&cp);
 		}
 	}
 
@@ -223,8 +223,8 @@ static void
 opnfolds(struct st_fold *folders, int nfolders)
 {
 	char nmaildir[BUFSIZ];
-	register struct st_fold *fp, *ep;
-	register struct msgs *mp;
+	struct st_fold *fp, *ep;
+	struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
 		chdir(toabsdir("+"));
@@ -252,8 +252,8 @@ opnfolds(struct st_fold *folders, int nfolders)
 static void
 clsfolds(struct st_fold *folders, int nfolders)
 {
-	register struct st_fold *fp, *ep;
-	register struct msgs *mp;
+	struct st_fold *fp, *ep;
+	struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
 		mp = fp->f_mp;