X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=c56a40190be02ffc95addb58b31b092f0aebb1c0;hp=5d15ed68d40099dec990e1cf9dc9b97994646aa4;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=7a13a5266a14f1c6a13752db9292cd40c1211fba

diff --git a/uip/sortm.c b/uip/sortm.c
index 5d15ed6..c56a401 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -41,6 +41,8 @@ static struct swit switches[] = {
 	 { NULL, 0 }
 };
 
+char *version=VERSION;
+
 struct smsg {
 	int s_msg;
 	time_t s_clock;
@@ -161,7 +163,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);
 	}
@@ -197,7 +199,7 @@ main(int argc, char **argv)
 	/*
 	** sort a list of pointers to our "messages to be sorted".
 	*/
-	dlist = (struct smsg **) mh_xcalloc((size_t) (nmsgs+1), sizeof(*dlist));
+	dlist = mh_xcalloc(nmsgs+1, sizeof(*dlist));
 	for (i = 0; i < nmsgs; i++)
 		dlist[i] = &smsgs[i];
 	dlist[nmsgs] = 0;
@@ -224,8 +226,7 @@ main(int argc, char **argv)
 		struct smsg **slist, **flist;
 		struct smsg ***il, **fp, **dp;
 
-		slist = (struct smsg **)
-				mh_xmalloc((nmsgs+1) * sizeof(*slist));
+		slist = mh_xcalloc(nmsgs+1, sizeof(*slist));
 		memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));
 		qsort((char *)slist, nmsgs, sizeof(*slist),
 				(qsort_comp) subsort);
@@ -235,7 +236,7 @@ main(int argc, char **argv)
 		** the collection of messages with the same subj
 		** given a message number.
 		*/
-		il = (struct smsg ***) mh_xcalloc(mp->hghsel+1, sizeof(*il));
+		il = mh_xcalloc(mp->hghsel+1, sizeof(*il));
 		if (! il)
 			adios(EX_OSERR, NULL, "couldn't allocate msg list");
 		for (i = 0; i < nmsgs; i++)
@@ -244,8 +245,7 @@ main(int argc, char **argv)
 		** make up the final list, chronological but with
 		** all the same subjects grouped together.
 		*/
-		flist = (struct smsg **)
-				mh_xmalloc((nmsgs+1) * sizeof(*flist));
+		flist = mh_xcalloc(nmsgs+1, sizeof(*flist));
 		fp = flist;
 		for (dp = dlist; *dp;) {
 			struct smsg **s = il[(*dp++)->s_msg];
@@ -267,8 +267,8 @@ main(int argc, char **argv)
 			}
 		}
 		*fp = 0;
-		free(slist);
-		free(dlist);
+		mh_free0(&slist);
+		mh_free0(&dlist);
 		dlist = flist;
 	}
 
@@ -295,8 +295,7 @@ read_hdrs(struct msgs *mp, char *datesw)
 
 	twscopy(&tb, dlocaltimenow());
 
-	smsgs = (struct smsg *) mh_xcalloc((size_t) (mp->hghsel - mp->lowsel + 2),
-			sizeof(*smsgs));
+	smsgs = mh_xcalloc(mp->hghsel - mp->lowsel + 2, sizeof(*smsgs));
 
 	s = smsgs;
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -320,9 +319,10 @@ read_hdrs(struct msgs *mp, char *datesw)
 static int
 get_fields(char *datesw, int msg, struct smsg *smsg)
 {
-	int state;
+	enum state state;
+	struct field f = {{0}};
 	int compnum;
-	char *msgnam, buf[BUFSIZ], nam[NAMESZ];
+	char *msgnam;
 	struct tws *tw;
 	char *datecomp = NULL, *subjcomp = NULL;
 	FILE *in;
@@ -331,49 +331,43 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 		admonish(msgnam, "unable to read message");
 		return (0);
 	}
-	for (compnum = 1, state = FLD;;) {
-		switch (state = m_getfld(state, nam, buf, sizeof(buf), in)) {
-		case FLD:
-		case FLDPLUS:
-			compnum++;
-			if (!mh_strcasecmp(nam, datesw)) {
-				datecomp = add(buf, datecomp);
-				while (state == FLDPLUS) {
-					state = m_getfld(state, nam, buf,
-							sizeof(buf), in);
-					datecomp = add(buf, datecomp);
-				}
-				if (!subjsort || subjcomp)
+	for (compnum = 1, state = FLD2;; compnum++) {
+		switch (state = m_getfld2(state, &f, in)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
+		case FLD2:
+			if (mh_strcasecmp(f.name, datesw)==0) {
+				datecomp = mh_xstrdup(f.value);
+				if (!subjsort || subjcomp) {
 					break;
-			} else if (subjsort && !mh_strcasecmp(nam, subjsort)) {
-				subjcomp = add(buf, subjcomp);
-				while (state == FLDPLUS) {
-					state = m_getfld(state, nam, buf,
-							sizeof(buf), in);
-					subjcomp = add(buf, subjcomp);
 				}
-				if (datecomp)
+			} else if (subjsort && mh_strcasecmp(f.name,
+					subjsort)==0) {
+				subjcomp = mh_xstrdup(f.value);
+				if (datecomp) {
 					break;
-			} else {
-				/* just flush this guy */
-				while (state == FLDPLUS)
-					state = m_getfld(state, nam, buf,
-							sizeof(buf), in);
+				}
 			}
 			continue;
 
-		case BODY:
-		case FILEEOF:
+		case BODY2:
+		case FILEEOF2:
 			break;
 
-		case LENERR:
-		case FMTERR:
-			if (state == LENERR || state == FMTERR)
-				admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
-			if (datecomp)
-				free(datecomp);
-			if (subjcomp)
-				free(subjcomp);
+		case FMTERR2:
+			admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
+			state = FLD2;
+			continue;
+
+		case IOERR2:
+			admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
+			if (datecomp) {
+				mh_free0(&datecomp);
+			}
+			if (subjcomp) {
+				mh_free0(&subjcomp);
+			}
 			fclose(in);
 			return (0);
 
@@ -435,7 +429,7 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 	}
 	fclose(in);
 	if (datecomp)
-		free(datecomp);
+		mh_free0(&datecomp);
 
 	return (1);
 }