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

diff --git a/uip/new.c b/uip/new.c
index 9774729..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;
 }
@@ -114,7 +114,7 @@ get_msgnums(char *folder, char *sequences[])
 		case FLD:
 		case FLDPLUS:
 			if (state == FLDPLUS) {
-				cp = getcpy(field);
+				cp = mh_xstrdup(field);
 				while (state == FLDPLUS) {
 					state = m_getfld(state, name, field,
 							sizeof(field), fp);
@@ -134,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)) {
@@ -148,8 +148,8 @@ 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);
 					}
 				}
 			}
@@ -258,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);
 	}
@@ -514,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;
 		}