===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -c -r1.129 -r1.130
*** src/usr.bin/cvs/cvs.c	2007/08/06 19:16:06	1.129
--- src/usr.bin/cvs/cvs.c	2007/09/02 12:13:00	1.130
***************
*** 1,4 ****
! /*	$OpenBSD: cvs.c,v 1.129 2007/08/06 19:16:06 sobrado Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: cvs.c,v 1.130 2007/09/02 12:13:00 tobias Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 132,138 ****
  	struct passwd *pw;
  	struct stat st;
  	char fpath[MAXPATHLEN];
- 	char *root, *rootp;
  
  	tzset();
  
--- 132,137 ----
***************
*** 241,258 ****
  	cvs_file_init();
  
  	if (cvs_cmdop == CVS_OP_SERVER) {
! 		if (cmd_argc > 1)
! 			fatal("server does not take any extra arguments");
! 
! 		setvbuf(stdin, NULL, _IOLBF, 0);
! 		setvbuf(stdout, NULL, _IOLBF, 0);
! 
! 		cvs_server_active = 1;
! 		root = cvs_remote_input();
! 		if ((rootp = strchr(root, ' ')) == NULL)
! 			fatal("bad Root request");
! 		cvs_rootstr = xstrdup(rootp + 1);
! 		xfree(root);
  	}
  
  	if ((current_cvsroot = cvsroot_get(".")) == NULL) {
--- 240,248 ----
  	cvs_file_init();
  
  	if (cvs_cmdop == CVS_OP_SERVER) {
! 		cmdp->cmd(cmd_argc, cmd_argv);
! 		cvs_cleanup();
! 		return (0);
  	}
  
  	if ((current_cvsroot = cvsroot_get(".")) == NULL) {