X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=7d9c086994b22fecaf273054329f912ec247d3f2;hp=a1b5effd29868bf68a7a383a91236f1dfb903b15;hb=1fb6287fc4986668e8f49d7c3bdca27d53e267af;hpb=d3425f7ef7287db6f843f27df8b9fa27da695562

diff --git a/uip/pick.c b/uip/pick.c
index a1b5eff..7d9c086 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -197,7 +197,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
 			app_msgarg(&msgs, cp);
 	}
@@ -731,7 +731,7 @@ pattern: ;
 			padvise(NULL, "pattern error in %s %s", argp[-2], cp);
 			return NULL;
 		}
-		n->n_patbuf = getcpy(dp);
+		n->n_patbuf = mh_xstrdup(dp);
 		return n;
 
 	case PROTHR:
@@ -768,8 +768,7 @@ newnexus(int (*action)())
 {
 	struct nexus *p;
 
-	if ((p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p)) == NULL)
-		adios(EX_OSERR, NULL, "unable to allocate component storage");
+	p = mh_xcalloc(1, sizeof *p);
 
 	p->n_action = action;
 	return p;
@@ -1250,28 +1249,32 @@ plist
 	fseek(fp, start, SEEK_SET);
 	for (state = FLD2, bp = NULL;;) {
 		switch (state = m_getfld2(state, &f, fp)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
+
 		case FLD2:
 			if (bp) {
-				free(bp);
-				bp = NULL;
+				mh_free0(&bp);
 			}
-			bp = getcpy(f.value);
+			bp = mh_xstrdup(f.value);
 			if (mh_strcasecmp(f.name, n->n_datef)==0) {
 				break;
 			}
 			continue;
 
-		case LENERR2:
 		case FMTERR2:
-		case ERR2:
 			advise(NULL, "format error in message %d", msgnum);
+			state = FLD2;
+			continue;
+
+		case IOERR2:
+			adios(EX_IOERR, "m_getfld2", "io error on message %d", msgnum);
 			/* FALL */
 
 		case BODY2:
 		case FILEEOF2:
-			if (bp) {
-				free(bp);
-			}
+			mh_free0(&bp);
 			return 0;
 
 		default:
@@ -1288,6 +1291,6 @@ plist
 			: (twsort(tw, &n->n_tws) < 0);
 
 	if (bp != NULL)
-		free(bp);
+		mh_free0(&bp);
 	return state;
 }