X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_read.c;h=041f632786e66ce8e53ef7b4c97a4bbb54a58595;hp=1ceb42163e912b36c9ff8f3def6bee3496259aa0;hb=e917512db8efcbf3b5b5baeb64b6d345fd3686db;hpb=d4c34b4439a9dbd89664de460ed37ecddc260fb1

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 1ceb421..041f632 100644
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -32,7 +32,7 @@ seq_read(struct msgs *mp)
 	** Initialize the list of sequence names.  Go ahead and
 	** add the cur sequence to the list of sequences.
 	*/
-	mp->msgattrs[0] = getcpy(seq_cur);
+	mp->msgattrs[0] = mh_xstrdup(seq_cur);
 	mp->msgattrs[1] = NULL;
 	make_all_public(mp);  /* initially, make all public */
 
@@ -55,9 +55,9 @@ seq_read(struct msgs *mp)
 static void
 seq_public(struct msgs *mp)
 {
-	int state;
-	char *cp, seqfile[PATH_MAX];
-	char name[NAMESZ], field[BUFSIZ];
+	enum state state;
+	struct field f = {{0}};
+	char seqfile[PATH_MAX];
 	FILE *fp;
 
 	/*
@@ -74,37 +74,27 @@ seq_public(struct msgs *mp)
 		return;
 
 	/* Use m_getfld to scan sequence file */
-	for (state = FLD;;) {
-		switch (state = m_getfld(state, name, field, sizeof(field),
-				fp)) {
-		case FLD:
-		case FLDPLUS:
-			if (state == FLDPLUS) {
-				cp = getcpy(field);
-				while (state == FLDPLUS) {
-					state = m_getfld(state, name, field,
-							sizeof(field), fp);
-					cp = add(field, cp);
-				}
-				seq_init(mp, getcpy(name), trimcpy(cp));
-				mh_free0(&cp);
-			} else {
-				seq_init(mp, getcpy(name), trimcpy(field));
-			}
+	for (state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, fp)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
+		case FLD2:
+			seq_init(mp, mh_xstrdup(f.name), trimcpy(f.value));
 			continue;
 
-		case BODY:
+		case BODY2:
 			adios(EX_CONFIG, NULL, "no blank lines are permitted in %s",
 					seqfile);
-			/* fall */
+			/* FALL */
 
-		case FILEEOF:
+		case FILEEOF2:
 			break;
 
 		default:
 			adios(EX_CONFIG, NULL, "%s is poorly formatted", seqfile);
 		}
-		break;  /* break from for loop */
+		break;
 	}
 
 	lkfclose(fp, seqfile);
@@ -133,9 +123,9 @@ seq_private(struct msgs *mp)
 				(j = strlen(np->n_name) - plen) > alen &&
 				*(np->n_name + j) == '-' &&
 				strcmp(mp->foldpath, np->n_name + j + 1)==0) {
-			cp = getcpy(np->n_name + alen);
+			cp = mh_xstrdup(np->n_name + alen);
 			*(cp + j - alen) = '\0';
-			if ((i = seq_init(mp, cp, getcpy(np->n_field))) != -1)
+			if ((i = seq_init(mp, cp, mh_xstrdup(np->n_field))) != -1)
 				make_seq_private(mp, i);
 		}
 	}