===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/util.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -c -r1.76 -r1.77
*** src/usr.bin/cvs/util.c	2006/03/29 09:16:53	1.76
--- src/usr.bin/cvs/util.c	2006/04/05 01:38:56	1.77
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.76 2006/03/29 09:16:53 ray Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.77 2006/04/05 01:38:56 ray Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
***************
*** 380,394 ****
  {
  	int i, ret;
  	char *argv[1024], **copy;
- 	size_t size;
  
  	ret = cvs_getargv(line, argv, 1024);
  	if (ret == -1)
  		return (NULL);
  
! 	size = (ret + 1) * sizeof(char *);
! 	copy = (char **)xmalloc(size);
! 	memset(copy, 0, size);
  
  	for (i = 0; i < ret; i++)
  		copy[i] = argv[i];
--- 380,391 ----
  {
  	int i, ret;
  	char *argv[1024], **copy;
  
  	ret = cvs_getargv(line, argv, 1024);
  	if (ret == -1)
  		return (NULL);
  
! 	copy = xcalloc(ret + 1, sizeof(char *));
  
  	for (i = 0; i < ret; i++)
  		copy[i] = argv[i];
***************
*** 945,962 ****
  	struct cvs_lines *lines;
  	struct cvs_line *lp;
  
! 	lines = (struct cvs_lines *)xmalloc(sizeof(*lines));
  	TAILQ_INIT(&(lines->l_lines));
  	lines->l_nblines = 0;
  	lines->l_data = xstrdup(fcont);
  
! 	lp = (struct cvs_line *)xmalloc(sizeof(*lp));
  	lp->l_line = NULL;
  	lp->l_lineno = 0;
  	TAILQ_INSERT_TAIL(&(lines->l_lines), lp, l_list);
  
  	for (dcp = lines->l_data; *dcp != '\0';) {
! 		lp = (struct cvs_line *)xmalloc(sizeof(*lp));
  		lp->l_line = dcp;
  		lp->l_lineno = ++(lines->l_nblines);
  		TAILQ_INSERT_TAIL(&(lines->l_lines), lp, l_list);
--- 942,959 ----
  	struct cvs_lines *lines;
  	struct cvs_line *lp;
  
! 	lines = xmalloc(sizeof(*lines));
  	TAILQ_INIT(&(lines->l_lines));
  	lines->l_nblines = 0;
  	lines->l_data = xstrdup(fcont);
  
! 	lp = xmalloc(sizeof(*lp));
  	lp->l_line = NULL;
  	lp->l_lineno = 0;
  	TAILQ_INSERT_TAIL(&(lines->l_lines), lp, l_list);
  
  	for (dcp = lines->l_data; *dcp != '\0';) {
! 		lp = xmalloc(sizeof(*lp));
  		lp->l_line = dcp;
  		lp->l_lineno = ++(lines->l_nblines);
  		TAILQ_INSERT_TAIL(&(lines->l_lines), lp, l_list);
***************
*** 1061,1074 ****
  	char *cp, *p;
  
  	cp = xstrdup(str);
! 	av = xmalloc(sizeof(struct cvs_argvector));
  	av->str = cp;
! 	av->argv = (char **)xcalloc(i + 1, sizeof(char *));
  
  	while ((p = strsep(&cp, sep)) != NULL) {
  		av->argv[i++] = p;
! 		nargv = (char **)xrealloc((void *)av->argv,
! 		    i + 1, sizeof(char *));
  		av->argv = nargv;
  	}
  	av->argv[i] = NULL;
--- 1058,1071 ----
  	char *cp, *p;
  
  	cp = xstrdup(str);
! 	av = xmalloc(sizeof(*av));
  	av->str = cp;
! 	av->argv = xcalloc(i + 1, sizeof(*(av->argv)));
  
  	while ((p = strsep(&cp, sep)) != NULL) {
  		av->argv[i++] = p;
! 		nargv = xrealloc(av->argv,
! 		    i + 1, sizeof(*(av->argv)));
  		av->argv = nargv;
  	}
  	av->argv[i] = NULL;