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

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index c1ac9fa..041f632 100644
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -7,6 +7,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/utils.h>
 
@@ -31,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 */
 
@@ -54,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;
 
 	/*
@@ -73,41 +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:
-		case FLDEOF:
-			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));
-				free(cp);
-			} else {
-				seq_init(mp, getcpy(name), trimcpy(field));
-			}
-			if (state == FLDEOF)
-				break;
+	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 BODYEOF:
-			adios(NULL, "no blank lines are permitted in %s",
+		case BODY2:
+			adios(EX_CONFIG, NULL, "no blank lines are permitted in %s",
 					seqfile);
-			/* fall */
+			/* FALL */
 
-		case FILEEOF:
+		case FILEEOF2:
 			break;
 
 		default:
-			adios(NULL, "%s is poorly formatted", seqfile);
+			adios(EX_CONFIG, NULL, "%s is poorly formatted", seqfile);
 		}
-		break;  /* break from for loop */
+		break;
 	}
 
 	lkfclose(fp, seqfile);
@@ -132,14 +119,13 @@ seq_private(struct msgs *mp)
 	plen = strlen(mp->foldpath) + 1;
 
 	for (np = m_defs; np; np = np->n_next) {
-		if (isprefix("atr-", np->n_name)
-				&& (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);
+		if (strncmp(np->n_name, "atr-", alen)==0 &&
+				(j = strlen(np->n_name) - plen) > alen &&
+				*(np->n_name + j) == '-' &&
+				strcmp(mp->foldpath, np->n_name + j + 1)==0) {
+			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);
 		}
 	}
@@ -159,14 +145,15 @@ seq_private(struct msgs *mp)
 static int
 seq_init(struct msgs *mp, char *name, char *field)
 {
-	int i, j, k, is_current;
+	unsigned int i;
+	int j, k, is_current;
 	char *cp, **ap;
 
 	/*
 	** Check if this is the cur sequence,
 	** so we can do some special things.
 	*/
-	is_current = !strcmp(seq_cur, name);
+	is_current = (strcmp(seq_cur, name)==0);
 
 	/*
 	** Search for this sequence name to see if we've seen
@@ -175,7 +162,7 @@ seq_init(struct msgs *mp, char *name, char *field)
 	** mesages in this folder.
 	*/
 	for (i = 0; mp->msgattrs[i]; i++) {
-		if (!strcmp(mp->msgattrs[i], name)) {
+		if (strcmp(mp->msgattrs[i], name)==0) {
 			for (j = mp->lowmsg; j <= mp->hghmsg; j++)
 				clear_sequence(mp, i, j);
 			break;
@@ -184,8 +171,8 @@ seq_init(struct msgs *mp, char *name, char *field)
 
 	/* Return error, if too many sequences */
 	if (i >= NUMATTRS) {
-		free(name);
-		free(field);
+		mh_free0(&name);
+		mh_free0(&field);
 		return -1;
 	}
 
@@ -194,7 +181,7 @@ seq_init(struct msgs *mp, char *name, char *field)
 	** name string.  Else add it to the list of sequence names.
 	*/
 	if (mp->msgattrs[i]) {
-		free(name);
+		mh_free0(&name);
 	} else {
 		mp->msgattrs[i] = name;
 		mp->msgattrs[i + 1] = NULL;
@@ -231,6 +218,6 @@ seq_init(struct msgs *mp, char *name, char *field)
 		}
 	}
 
-	free(field);  /* free string containing message ranges */
+	mh_free0(&field);  /* free string containing message ranges */
 	return i;
 }