X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fnew.c;h=5bc71366b42aa8c9e5946161ba654ec9092fa2f4;hp=90e2da710673743564b4b2326001cc677108fc87;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/new.c b/uip/new.c
index 90e2da7..5bc7136 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -55,7 +55,7 @@ count_messages(char *field)
 	int j, k;
 	char *cp, **ap;
 
-	field = getcpy(field);
+	field = mh_xstrdup(field);
 
 	/* copied from seq_read.c:seq_init */
 	for (ap = brkstring(field, " ", "\n"); *ap; ap++) {
@@ -68,7 +68,7 @@ count_messages(char *field)
 		}
 	}
 
-	free(field);
+	mh_free0(&field);
 
 	return total;
 }
@@ -113,9 +113,8 @@ get_msgnums(char *folder, char *sequences[])
 				fp)) {
 		case FLD:
 		case FLDPLUS:
-		case FLDEOF:
 			if (state == FLDPLUS) {
-				cp = getcpy(field);
+				cp = mh_xstrdup(field);
 				while (state == FLDPLUS) {
 					state = m_getfld(state, name, field,
 							sizeof(field), fp);
@@ -135,11 +134,11 @@ get_msgnums(char *folder, char *sequences[])
 					} else {
 						old_msgnums = msgnums;
 						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
-						free(old_msgnums);
-						free(this_msgnums);
+						mh_free0(&old_msgnums);
+						mh_free0(&this_msgnums);
 					}
 				}
-				free(cp);
+				mh_free0(&cp);
 			} else {
 				/* and here */
 				if (seq_in_list(name, sequences)) {
@@ -149,18 +148,15 @@ get_msgnums(char *folder, char *sequences[])
 					} else {
 						old_msgnums = msgnums;
 						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
-						free(old_msgnums);
-						free(this_msgnums);
+						mh_free0(&old_msgnums);
+						mh_free0(&this_msgnums);
 					}
 				}
 			}
 
-			if (state == FLDEOF)
-				break;
 			continue;
 
 		case BODY:
-		case BODYEOF:
 			adios(EX_DATAERR, NULL, "no blank lines are permitted in %s",
 					seqfile);
 			/* fall */
@@ -191,9 +187,9 @@ check_folder(char *folder, size_t len, struct list_state *b)
 
 	if (is_cur || msgnums != NULL) {
 		if (*b->first == NULL) {
-			*b->first = b->node = mh_xmalloc(sizeof(*b->node));
+			*b->first = b->node = mh_xcalloc(1, sizeof(*b->node));
 		} else {
-			b->node->n_next = mh_xmalloc(sizeof(*b->node));
+			b->node->n_next = mh_xcalloc(1, sizeof(*b->node));
 			b->node = b->node->n_next;
 		}
 		b->node->n_name = folder;
@@ -262,7 +258,7 @@ check_folders(struct node **first, struct node **last,
 		while (vfgets(fp, &line) == OK) {
 			len = strlen(line) - 1;
 			line[len] = '\0';
-			check_folder(getcpy(line), len, &b);
+			check_folder(mh_xstrdup(line), len, &b);
 		}
 		fclose(fp);
 	}
@@ -284,7 +280,7 @@ join_sequences(char *sequences[])
 	for (i = 0; sequences[i] != NULL; i++) {
 		len += strlen(sequences[i]) + 1;
 	}
-	result = mh_xmalloc(len + 1);
+	result = mh_xcalloc(len + 1, sizeof(char));
 
 	for (i = 0, cp = result; sequences[i] != NULL; i++, cp += len + 1) {
 		len = strlen(sequences[i]);
@@ -518,7 +514,7 @@ main(int argc, char **argv)
 		} else {
 			unseen = seq_unseen;  /* use default */
 		}
-		dp = getcpy(unseen);
+		dp = mh_xstrdup(unseen);
 		for (ap = brkstring(dp, " ", "\n"); *ap; ap++) {
 			sequences[i++] = *ap;
 		}