===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/cmd2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/mail/cmd2.c	1997/07/13 21:21:09	1.3
--- src/usr.bin/mail/cmd2.c	1997/07/13 23:53:57	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: cmd2.c,v 1.3 1997/07/13 21:21:09 millert Exp $	*/
  /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: cmd2.c,v 1.4 1997/07/13 23:53:57 millert Exp $	*/
  /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: cmd2.c,v 1.3 1997/07/13 21:21:09 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: cmd2.c,v 1.4 1997/07/13 23:53:57 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 176,182 ****
  	int f, *msgvec;
  	FILE *obuf;
  
! 	msgvec = (int *) salloc((msgCount + 2) * sizeof(*msgvec));
  	if ((file = snarf(str, &f)) == NOSTR)
  		return(1);
  	if (!f) {
--- 176,182 ----
  	int f, *msgvec;
  	FILE *obuf;
  
! 	msgvec = (int *)salloc((msgCount + 2) * sizeof(*msgvec));
  	if ((file = snarf(str, &f)) == NOSTR)
  		return(1);
  	if (!f) {
***************
*** 500,508 ****
  		if (member(field, tab))
  			continue;
  		h = hash(field);
! 		igp = (struct ignore *) calloc(1, sizeof(struct ignore));
! 		igp->i_field = calloc((unsigned) strlen(field) + 1,
! 			sizeof(char));
  		strcpy(igp->i_field, field);
  		igp->i_link = tab->i_head[h];
  		tab->i_head[h] = igp;
--- 500,507 ----
  		if (member(field, tab))
  			continue;
  		h = hash(field);
! 		igp = (struct ignore *)calloc(1, sizeof(struct ignore));
! 		igp->i_field = (char *)calloc(strlen(field) + 1, sizeof(char));
  		strcpy(igp->i_field, field);
  		igp->i_link = tab->i_head[h];
  		tab->i_head[h] = igp;
***************
*** 527,533 ****
  		printf("No fields currently being %s.\n", which);
  		return(0);
  	}
! 	ring = (char **) salloc((tab->i_count + 1) * sizeof(char *));
  	ap = ring;
  	for (h = 0; h < HSHSIZE; h++)
  		for (igp = tab->i_head[h]; igp != 0; igp = igp->i_link)
--- 526,532 ----
  		printf("No fields currently being %s.\n", which);
  		return(0);
  	}
! 	ring = (char **)salloc((tab->i_count + 1) * sizeof(char *));
  	ap = ring;
  	for (h = 0; h < HSHSIZE; h++)
  		for (igp = tab->i_head[h]; igp != 0; igp = igp->i_link)