===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/import.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -c -r1.101 -r1.102
*** src/usr.bin/cvs/import.c	2009/06/27 16:55:31	1.101
--- src/usr.bin/cvs/import.c	2010/07/23 21:46:05	1.102
***************
*** 1,4 ****
! /*	$OpenBSD: import.c,v 1.101 2009/06/27 16:55:31 martynas Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: import.c,v 1.102 2010/07/23 21:46:05 ray Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 183,189 ****
  		import_printf("\nNo conflicts created by this import.\n\n");
  	}
  
! 	loginfo = cvs_buf_release(logbuf);
  	logbuf = NULL;
  
  	line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, import_repository);
--- 183,189 ----
  		import_printf("\nNo conflicts created by this import.\n\n");
  	}
  
! 	loginfo = buf_release(logbuf);
  	logbuf = NULL;
  
  	line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, import_repository);
***************
*** 209,215 ****
  	va_end(vap);
  
  	cvs_printf("%s", str);
! 	cvs_buf_puts(logbuf, str);
  
  	xfree(str);
  }
--- 209,215 ----
  	va_end(vap);
  
  	cvs_printf("%s", str);
! 	buf_puts(logbuf, str);
  
  	xfree(str);
  }
***************
*** 265,293 ****
  	if (getcwd(pwd, sizeof(pwd)) == NULL)
  		fatal("Can't get working directory");
  
! 	logbuf = cvs_buf_alloc(1024);
  	cvs_trigger_loginfo_header(logbuf, repo);
  
! 	cvs_buf_puts(logbuf, "Log Message:\n");
! 	cvs_buf_puts(logbuf, logmsg);
  	if (logmsg[0] != '\0' && logmsg[strlen(logmsg) - 1] != '\n')
! 		cvs_buf_putc(logbuf, '\n');
! 	cvs_buf_putc(logbuf, '\n');
  
! 	cvs_buf_puts(logbuf, "Status:\n\n");
  
! 	cvs_buf_puts(logbuf, "Vendor Tag:\t");
! 	cvs_buf_puts(logbuf, vendor_tag);
! 	cvs_buf_putc(logbuf, '\n');
! 	cvs_buf_puts(logbuf, "Release Tags:\t");
  
  	for (i = 0; i < tagcount ; i++) {
! 		cvs_buf_puts(logbuf, "\t\t");
! 		cvs_buf_puts(logbuf, release_tags[i]);
! 		cvs_buf_putc(logbuf, '\n');
  	}
! 	cvs_buf_putc(logbuf, '\n');
! 	cvs_buf_putc(logbuf, '\n');
  }
  
  static void
--- 265,293 ----
  	if (getcwd(pwd, sizeof(pwd)) == NULL)
  		fatal("Can't get working directory");
  
! 	logbuf = buf_alloc(1024);
  	cvs_trigger_loginfo_header(logbuf, repo);
  
! 	buf_puts(logbuf, "Log Message:\n");
! 	buf_puts(logbuf, logmsg);
  	if (logmsg[0] != '\0' && logmsg[strlen(logmsg) - 1] != '\n')
! 		buf_putc(logbuf, '\n');
! 	buf_putc(logbuf, '\n');
  
! 	buf_puts(logbuf, "Status:\n\n");
  
! 	buf_puts(logbuf, "Vendor Tag:\t");
! 	buf_puts(logbuf, vendor_tag);
! 	buf_putc(logbuf, '\n');
! 	buf_puts(logbuf, "Release Tags:\t");
  
  	for (i = 0; i < tagcount ; i++) {
! 		buf_puts(logbuf, "\t\t");
! 		buf_puts(logbuf, release_tags[i]);
! 		buf_putc(logbuf, '\n');
  	}
! 	buf_putc(logbuf, '\n');
! 	buf_putc(logbuf, '\n');
  }
  
  static void
***************
*** 322,328 ****
  	if ((branch = rcsnum_parse(import_branch)) == NULL)
  		fatal("import_new: failed to parse branch");
  
! 	bp = cvs_buf_load_fd(cf->fd);
  
  	if ((brev = rcsnum_brtorev(branch)) == NULL)
  		fatal("import_new: failed to get first branch revision");
--- 322,328 ----
  	if ((branch = rcsnum_parse(import_branch)) == NULL)
  		fatal("import_new: failed to parse branch");
  
! 	bp = buf_load_fd(cf->fd);
  
  	if ((brev = rcsnum_brtorev(branch)) == NULL)
  		fatal("import_new: failed to get first branch revision");
***************
*** 397,407 ****
  		fatal("import_update: rcsnum_parse failed");
  
  	b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE);
! 	b2 = cvs_buf_load_fd(cf->fd);
  
! 	ret = cvs_buf_differ(b1, b2);
! 	cvs_buf_free(b1);
! 	cvs_buf_free(b2);
  	if (ret == 0) {
  		import_tag(cf, brev, rev);
  		rcsnum_free(brev);
--- 397,407 ----
  		fatal("import_update: rcsnum_parse failed");
  
  	b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE);
! 	b2 = buf_load_fd(cf->fd);
  
! 	ret = buf_differ(b1, b2);
! 	buf_free(b1);
! 	buf_free(b2);
  	if (ret == 0) {
  		import_tag(cf, brev, rev);
  		rcsnum_free(brev);
***************
*** 463,475 ****
  	BUF *b1, *b2;
  	int fd1, fd2;
  
! 	b2 = cvs_buf_alloc(128);
  
! 	b1 = cvs_buf_load_fd(cf->fd);
  
  	(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
! 	fd1 = cvs_buf_write_stmp(b1, p1, NULL);
! 	cvs_buf_free(b1);
  
  	(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
  	fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
--- 463,475 ----
  	BUF *b1, *b2;
  	int fd1, fd2;
  
! 	b2 = buf_alloc(128);
  
! 	b1 = buf_load_fd(cf->fd);
  
  	(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
! 	fd1 = buf_write_stmp(b1, p1, NULL);
! 	buf_free(b1);
  
  	(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
  	fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);