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

diff --git a/uip/sortm.c b/uip/sortm.c
index 470fa8b..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);
 	}
@@ -265,8 +267,8 @@ main(int argc, char **argv)
 			}
 		}
 		*fp = 0;
-		free(slist);
-		free(dlist);
+		mh_free0(&slist);
+		mh_free0(&dlist);
 		dlist = flist;
 	}
 
@@ -317,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;
@@ -328,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);
 
@@ -432,7 +429,7 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 	}
 	fclose(in);
 	if (datecomp)
-		free(datecomp);
+		mh_free0(&datecomp);
 
 	return (1);
 }