X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fnew.c;fp=uip%2Fnew.c;h=4335892e0497b636421449498e882f67ddc741bf;hp=5bc71366b42aa8c9e5946161ba654ec9092fa2f4;hb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee;hpb=bd02210b2be64956a952f925a2dcd35fb42f6136

diff --git a/uip/new.c b/uip/new.c
index 5bc7136..4335892 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -95,11 +95,10 @@ seq_in_list(char *name, char *sequences[])
 static char *
 get_msgnums(char *folder, char *sequences[])
 {
+	enum state state;
+	struct field f = {{0}};
 	char *seqfile = concat(toabsdir(folder), "/", mh_seq, (void *)NULL);
 	FILE *fp = fopen(seqfile, "r");
-	int state;
-	char name[NAMESZ], field[BUFSIZ];
-	char *cp;
 	char *msgnums = NULL, *this_msgnums, *old_msgnums;
 
 	/* no sequences file -> no messages */
@@ -107,67 +106,39 @@ get_msgnums(char *folder, char *sequences[])
 		return NULL;
 	}
 
-	/* copied from seq_read.c:seq_public */
-	for (state = FLD;;) {
-		switch (state = m_getfld(state, name, field, sizeof(field),
-				fp)) {
-		case FLD:
-		case FLDPLUS:
-			if (state == FLDPLUS) {
-				cp = mh_xstrdup(field);
-				while (state == FLDPLUS) {
-					state = m_getfld(state, name, field,
-							sizeof(field), fp);
-					cp = add(field, cp);
-				}
-
-				/*
-				** Here's where we differ from
-				** seq_public: if it's in a
-				** sequence we want, save the list
-				** of messages.
-				*/
-				if (seq_in_list(name, sequences)) {
-					this_msgnums = trimcpy(cp);
-					if (msgnums == NULL) {
-						msgnums = this_msgnums;
-					} else {
-						old_msgnums = msgnums;
-						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
-						mh_free0(&old_msgnums);
-						mh_free0(&this_msgnums);
-					}
-				}
-				mh_free0(&cp);
-			} else {
-				/* and here */
-				if (seq_in_list(name, sequences)) {
-					this_msgnums = trimcpy(field);
-					if (msgnums == NULL) {
-						msgnums = this_msgnums;
-					} else {
-						old_msgnums = msgnums;
-						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
-						mh_free0(&old_msgnums);
-						mh_free0(&this_msgnums);
-					}
+	for (state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, fp)) {
+		case FLD2:
+			/*
+			** if it's in a sequence we want,
+			** save the list of messages.
+			*/
+			if (seq_in_list(f.name, sequences)) {
+				this_msgnums = trimcpy(f.value);
+				if (msgnums == NULL) {
+					msgnums = this_msgnums;
+				} else {
+					old_msgnums = msgnums;
+					msgnums = concat(old_msgnums, " ",
+							this_msgnums,
+							NULL);
+					mh_free0(&old_msgnums);
+					mh_free0(&this_msgnums);
 				}
 			}
-
 			continue;
 
-		case BODY:
-			adios(EX_DATAERR, NULL, "no blank lines are permitted in %s",
-					seqfile);
-			/* fall */
+		case BODY2:
+			adios(EX_DATAERR, NULL, "no blank lines are permitted in %s", seqfile);
+			/* FALL */
 
-		case FILEEOF:
+		case FILEEOF2:
 			break;
 
 		default:
 			adios(EX_SOFTWARE, NULL, "%s is poorly formatted", seqfile);
 		}
-		break;  /* break from for loop */
+		break;
 	}
 
 	fclose(fp);