X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpick.c;h=5df2861a2c19b6ca03f4c483a4fe9cb70342d561;hb=b16c039dc21faa0d68a0ba45eab857895e82439b;hp=3ac9e1101e7d3cb25a47c09038bf79a11398ab80;hpb=1e99819ed105950cd584c71fa4b2e36b038be102;p=mmh

diff --git a/uip/pick.c b/uip/pick.c
index 3ac9e11..5df2861 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);
 	}
@@ -274,7 +274,6 @@ main(int argc, char **argv)
 			} else {
 				/* if it doesn't match, then unselect it */
 				unset_selected(mp, msgnum);
-				mp->numsel--;
 			}
 			if (fp)
 				fclose(fp);
@@ -732,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:
@@ -769,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;
@@ -1253,10 +1251,9 @@ plist
 		switch (state = m_getfld2(state, &f, fp)) {
 		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;
 			}
@@ -1264,15 +1261,13 @@ plist
 
 		case LENERR2:
 		case FMTERR2:
-		case ERR2:
+		case IOERR2:
 			advise(NULL, "format error in message %d", msgnum);
 			/* FALL */
 
 		case BODY2:
 		case FILEEOF2:
-			if (bp) {
-				free(bp);
-			}
+			mh_free0(&bp);
 			return 0;
 
 		default:
@@ -1289,6 +1284,6 @@ plist
 			: (twsort(tw, &n->n_tws) < 0);
 
 	if (bp != NULL)
-		free(bp);
+		mh_free0(&bp);
 	return state;
 }