X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=671509afa0959d7a654ffceaf5cc1f44244a9e50;hp=0f755ca265f38c7a5c18dee000c69ce8024e0b36;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/scan.c b/uip/scan.c
index 0f755ca..671509a 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -91,7 +91,7 @@ main(int argc, char **argv)
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				if (strcmp(file = cp, "-")!=0)
-					file = getcpy(expanddir(cp));
+					file = mh_xstrdup(expanddir(cp));
 				continue;
 			}
 		}
@@ -99,15 +99,13 @@ 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
 			app_msgarg(&msgs, cp);
 	}
 
-	/*
-	** Get new format string.  Must be before chdir().
-	*/
-	fmtstr = new_fs(form, FORMAT);
+	/* Set format string.  Must be before chdir(). */
+	fmtstr = new_fs(form, scanformat);
 
 	/*
 	** We are scanning a maildrop file
@@ -176,14 +174,14 @@ main(int argc, char **argv)
 	if (*cp) {
 		char **ap, *dp;
 
-		dp = getcpy(cp);
+		dp = mh_xstrdup(cp);
 		ap = brkstring(dp, " ", "\n");
 		for (i = 0; ap && *ap; i++, ap++) {
 			seqnum[i] = seq_getnum(mp, *ap);
 		}
 		num_unseen_seq = i;
 		if (dp) {
-			free(dp);
+			mh_free0(&dp);
 		}
 	}