===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.shar,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** www/anoncvs.shar	2003/07/30 20:27:32	1.16
--- www/anoncvs.shar	2005/01/19 21:08:09	1.17
***************
*** 425,446 ****
  X#include <unistd.h>
  X#include <sys/types.h>
  X
- X#ifndef __CONCAT
- X#if defined(__STDC__) || defined(__cplusplus)
- X#define __CONCAT(x,y)		x ## y
- X#else
- X#define __CONCAT(x,y)		x/**/y
- X#endif
- X#endif
- X
- X#ifndef __CONCAT3
- X#if defined(__STDC__) || defined(__cplusplus)
- X#define __CONCAT3(x,y,z)	x ## y ## z
- X#else
- X#define __CONCAT3(x,y,z)	x/**/y/**/z
- X#endif
- X#endif
- X
  X#ifndef __P
  X#if defined(__STDC__) || defined(__cplusplus)
  X#define	__P(protos)	protos		/* full-blown ANSI C */
--- 425,430 ----
***************
*** 484,490 ****
  X * $CVSROOT is created based on HOSTNAME and LOCALROOT above
  X */
  X#ifndef CVSROOT
! X#define	CVSROOT		__CONCAT3(HOSTNAME,":",LOCALROOT)
  X#endif
  X
  X/*
--- 468,474 ----
  X * $CVSROOT is created based on HOSTNAME and LOCALROOT above
  X */
  X#ifndef CVSROOT
! X#define	CVSROOT		HOSTNAME ":"LOCALROOT
  X#endif
  X
  X/*
***************
*** 519,527 ****
  Xint main __P((int, char *[]));
  X
  Xchar * const env[] = {
! X	__CONCAT("PATH=",_PATH_DEFPATH),
! X	__CONCAT("SHELL=",_PATH_BSHELL),
! X	__CONCAT("CVSROOT=",LOCALROOT),
  X	"HOME=/",
  X	"CVSREADONLYFS=1",
  X	NULL
--- 503,511 ----
  Xint main __P((int, char *[]));
  X
  Xchar * const env[] = {
! X	"PATH="_PATH_DEFPATH,
! X	"SHELL="_PATH_BSHELL,
! X	"CVSROOT="LOCALROOT,
  X	"HOME=/",
  X	"CVSREADONLYFS=1",
  X	NULL
***************
*** 615,621 ****
  X		       us, ntohs(my_sa.sin_port));
  X#endif /* USE_SYSLOG */
  X		execle("/usr/bin/cvs", "cvs",
! X		    __CONCAT("--allow-root=",LOCALROOT), "pserver", (char *)NULL, env);
  X		perror("execle: cvs");
  X		fprintf(stderr, "unable to exec CVS pserver!\n");
  X		exit(1);
--- 599,605 ----
  X		       us, ntohs(my_sa.sin_port));
  X#endif /* USE_SYSLOG */
  X		execle("/usr/bin/cvs", "cvs",
! X		    "--allow-root="LOCALROOT, "pserver", (char *)NULL, env);
  X		perror("execle: cvs");
  X		fprintf(stderr, "unable to exec CVS pserver!\n");
  X		exit(1);
***************
*** 627,633 ****
  X		strcmp("anoncvssh",  argv[0]) != 0 ||
  X		strcmp("-c",         argv[1]) != 0 ||
  X		(strcmp("cvs server", argv[2]) != 0 &&
! X		 strcmp(__CONCAT3("cvs -d ",LOCALROOT," server"), argv[2]) != 0)) {
  X		fprintf(stderr, "\nTo use anonymous CVS install the latest ");
  X		fprintf(stderr,"version of CVS on your local machine.\n");
  X		fprintf(stderr,"Then set your CVSROOT environment variable ");
--- 611,617 ----
  X		strcmp("anoncvssh",  argv[0]) != 0 ||
  X		strcmp("-c",         argv[1]) != 0 ||
  X		(strcmp("cvs server", argv[2]) != 0 &&
! X		 strcmp("cvs -d "LOCALROOT" server", argv[2]) != 0)) {
  X		fprintf(stderr, "\nTo use anonymous CVS install the latest ");
  X		fprintf(stderr,"version of CVS on your local machine.\n");
  X		fprintf(stderr,"Then set your CVSROOT environment variable ");