===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/trigger.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/cvs/trigger.c	2009/03/19 09:55:19	1.17
--- src/usr.bin/cvs/trigger.c	2010/07/23 21:46:05	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: trigger.c,v 1.17 2009/03/19 09:55:19 joris Exp $	*/
  /*
   * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2008 Jonathan Armani <dbd@asystant.net>
--- 1,4 ----
! /*	$OpenBSD: trigger.c,v 1.18 2010/07/23 21:46:05 ray Exp $	*/
  /*
   * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2008 Jonathan Armani <dbd@asystant.net>
***************
*** 71,80 ****
  		}
  	}
  	if (quote)
! 		cvs_buf_putc(buf, '"');
  	if (oldstyle) {
! 		cvs_buf_puts(buf, repo);
! 		cvs_buf_putc(buf, ' ');
  	}
  
  	if (*format == '\0')
--- 71,80 ----
  		}
  	}
  	if (quote)
! 		buf_putc(buf, '"');
  	if (oldstyle) {
! 		buf_puts(buf, repo);
! 		buf_putc(buf, ' ');
  	}
  
  	if (*format == '\0')
***************
*** 84,99 ****
  	 * check like this, add only uses loginfo for directories anyway
  	 */
  	if (cvs_cmdop == CVS_OP_ADD) {
! 		cvs_buf_puts(buf, "- New directory");
  		if (quote)
! 			cvs_buf_putc(buf, '"');
  		return (0);
  	}
  
  	if (cvs_cmdop == CVS_OP_IMPORT) {
! 		cvs_buf_puts(buf, "- Imported sources");
  		if (quote)
! 			cvs_buf_putc(buf, '"');
  		return (0);
  	}
  
--- 84,99 ----
  	 * check like this, add only uses loginfo for directories anyway
  	 */
  	if (cvs_cmdop == CVS_OP_ADD) {
! 		buf_puts(buf, "- New directory");
  		if (quote)
! 			buf_putc(buf, '"');
  		return (0);
  	}
  
  	if (cvs_cmdop == CVS_OP_IMPORT) {
! 		buf_puts(buf, "- Imported sources");
  		if (quote)
! 			buf_putc(buf, '"');
  		return (0);
  	}
  
***************
*** 155,164 ****
  			}
  
  			if (val != NULL)
! 				cvs_buf_puts(buf, val);
  
  			if (*(++p) != '\0')
! 				cvs_buf_putc(buf, ',');
  		}
  
  		if (fi != NULL)
--- 155,164 ----
  			}
  
  			if (val != NULL)
! 				buf_puts(buf, val);
  
  			if (*(++p) != '\0')
! 				buf_putc(buf, ',');
  		}
  
  		if (fi != NULL)
***************
*** 170,180 ****
  		    *format == 'p' || *format == 'r' || *format == 't'))
  			break;
  
! 		cvs_buf_putc(buf, ' ');
  	}
  
  	if (quote)
! 		cvs_buf_putc(buf, '"');
  
  	return 0;
  }
--- 170,180 ----
  		    *format == 'p' || *format == 'r' || *format == 't'))
  			break;
  
! 		buf_putc(buf, ' ');
  	}
  
  	if (quote)
! 		buf_putc(buf, '"');
  
  	return 0;
  }
***************
*** 190,203 ****
  			cvs_log(LP_ERR, "no such user variable ${=%s}", var);
  			return (1);
  		}
! 		cvs_buf_puts(buf, val);
  	} else {
  		if (strcmp(var, "CVSEDITOR") == 0 ||
  		    strcmp(var, "EDITOR") == 0 ||
  		    strcmp(var, "VISUAL") == 0)
! 			cvs_buf_puts(buf, cvs_editor);
  		else if (strcmp(var, "CVSROOT") == 0)
! 			cvs_buf_puts(buf, current_cvsroot->cr_dir);
  		else if (strcmp(var, "USER") == 0) {
  			pw = getpwuid(geteuid());
  			if (pw == NULL) {
--- 190,203 ----
  			cvs_log(LP_ERR, "no such user variable ${=%s}", var);
  			return (1);
  		}
! 		buf_puts(buf, val);
  	} else {
  		if (strcmp(var, "CVSEDITOR") == 0 ||
  		    strcmp(var, "EDITOR") == 0 ||
  		    strcmp(var, "VISUAL") == 0)
! 			buf_puts(buf, cvs_editor);
  		else if (strcmp(var, "CVSROOT") == 0)
! 			buf_puts(buf, current_cvsroot->cr_dir);
  		else if (strcmp(var, "USER") == 0) {
  			pw = getpwuid(geteuid());
  			if (pw == NULL) {
***************
*** 205,211 ****
  				    "caller ID");
  				return (1);
  			}
! 			cvs_buf_puts(buf, pw->pw_name);
  		} else if (strcmp(var, "RCSBIN") == 0) {
  			cvs_log(LP_ERR, "RCSBIN internal variable is no "
  			    "longer supported");
--- 205,211 ----
  				    "caller ID");
  				return (1);
  			}
! 			buf_puts(buf, pw->pw_name);
  		} else if (strcmp(var, "RCSBIN") == 0) {
  			cvs_log(LP_ERR, "RCSBIN internal variable is no "
  			    "longer supported");
***************
*** 261,273 ****
  	if (*p == '%')
  		return (NULL);
  
! 	buf = cvs_buf_alloc(1024);
  
  	p = cmd;
  again:
  	for (; *p != '\0'; p++) {
  		if ((pos = strcspn(p, "$%")) != 0) {
! 			cvs_buf_append(buf, p, pos);
  			p += pos;
  		}
  
--- 261,273 ----
  	if (*p == '%')
  		return (NULL);
  
! 	buf = buf_alloc(1024);
  
  	p = cmd;
  again:
  	for (; *p != '\0'; p++) {
  		if ((pos = strcspn(p, "$%")) != 0) {
! 			buf_append(buf, p, pos);
  			p += pos;
  		}
  
***************
*** 332,345 ****
  		goto again;
  	}
  
! 	cvs_buf_putc(buf, '\0');
! 	return (cvs_buf_release(buf));
  
  bad:
  	if (q != NULL)
  		xfree(q);
  	cvs_log(LP_NOTICE, "%s contains malformed command '%s'", file, cmd);
! 	cvs_buf_free(buf);
  	return (NULL);
  }
  
--- 332,345 ----
  		goto again;
  	}
  
! 	buf_putc(buf, '\0');
! 	return (buf_release(buf));
  
  bad:
  	if (q != NULL)
  		xfree(q);
  	cvs_log(LP_NOTICE, "%s contains malformed command '%s'", file, cmd);
! 	buf_free(buf);
  	return (NULL);
  }
  
***************
*** 552,570 ****
  		    strerror(errno));
  	}
  
! 	cvs_buf_puts(buf, "Update of ");
! 	cvs_buf_puts(buf, current_cvsroot->cr_dir);
! 	cvs_buf_putc(buf, '/');
! 	cvs_buf_puts(buf, repo);
! 	cvs_buf_putc(buf, '\n');
  
! 	cvs_buf_puts(buf, "In directory ");
! 	cvs_buf_puts(buf, hostname);
! 	cvs_buf_puts(buf, ":");
! 	cvs_buf_puts(buf, dirname(pwd));
! 	cvs_buf_putc(buf, '/');
! 	cvs_buf_puts(buf, repo);
! 	cvs_buf_putc(buf, '\n');
! 	cvs_buf_putc(buf, '\n');
  }
  
--- 552,570 ----
  		    strerror(errno));
  	}
  
! 	buf_puts(buf, "Update of ");
! 	buf_puts(buf, current_cvsroot->cr_dir);
! 	buf_putc(buf, '/');
! 	buf_puts(buf, repo);
! 	buf_putc(buf, '\n');
  
! 	buf_puts(buf, "In directory ");
! 	buf_puts(buf, hostname);
! 	buf_puts(buf, ":");
! 	buf_puts(buf, dirname(pwd));
! 	buf_putc(buf, '/');
! 	buf_puts(buf, repo);
! 	buf_putc(buf, '\n');
! 	buf_putc(buf, '\n');
  }