cvsdist 38c29c3
--- rdist-6.1.5/src/gram.y.cleanup	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/gram.y	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -33,7 +33,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: gram.y,v 6.30 1998/11/10 04:10:42 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -163,7 +163,7 @@
cvsdist 38c29c3
 		;
cvsdist 38c29c3
 
cvsdist 38c29c3
 cmd:		  INSTALL options opt_namelist ';' {
cvsdist 38c29c3
-			register struct namelist *nl;
cvsdist 38c29c3
+			struct namelist *nl;
cvsdist 38c29c3
 
cvsdist 38c29c3
 			$1->sc_options = $2 | options;
cvsdist 38c29c3
 			if ($3 != NULL) {
Michal Luscon f5c9a76
@@ -233,11 +233,11 @@
cvsdist 38c29c3
 int	yylineno = 1;
cvsdist 38c29c3
 extern	FILE *fin;
cvsdist 38c29c3
 
cvsdist 38c29c3
-yylex()
cvsdist 38c29c3
+int yylex()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char yytext[INMAX];
cvsdist 38c29c3
-	register int c;
cvsdist 38c29c3
-	register char *cp1, *cp2;
cvsdist 38c29c3
+	int c;
cvsdist 38c29c3
+	char *cp1, *cp2;
cvsdist 38c29c3
 	static char quotechars[] = "[]{}*?$";
cvsdist 38c29c3
 	
cvsdist 38c29c3
 again:
Michal Luscon f5c9a76
@@ -402,8 +402,8 @@
cvsdist 38c29c3
  * some of the characters we use.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 extern int any(c, str)
cvsdist 38c29c3
-	register int c;
cvsdist 38c29c3
-	register char *str;
cvsdist 38c29c3
+	int c;
cvsdist 38c29c3
+	char *str;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	while (*str)
cvsdist 38c29c3
 		if (c == *str++)
Michal Luscon f5c9a76
@@ -414,13 +414,14 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Insert or append ARROW command to list of hosts to be updated.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+void
cvsdist 38c29c3
 insert(label, files, hosts, subcmds)
cvsdist 38c29c3
 	char *label;
cvsdist 38c29c3
 	struct namelist *files, *hosts;
cvsdist 38c29c3
 	struct subcmd *subcmds;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct cmd *c, *prev, *nc;
cvsdist 38c29c3
-	register struct namelist *h, *lasth;
cvsdist 38c29c3
+	struct cmd *c, *prev, *nc;
cvsdist 38c29c3
+	struct namelist *h, *lasth;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "insert(%s, %x, %x, %x) start, files = %s", 
cvsdist 38c29c3
 		 label == NULL ? "(null)" : label,
Michal Luscon f5c9a76
@@ -468,13 +469,14 @@
cvsdist 38c29c3
  * Append DCOLON command to the end of the command list since these are always
cvsdist 38c29c3
  * executed in the order they appear in the distfile.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+void
cvsdist 38c29c3
 append(label, files, stamp, subcmds)
cvsdist 38c29c3
 	char *label;
cvsdist 38c29c3
 	struct namelist *files;
cvsdist 38c29c3
 	char *stamp;
cvsdist 38c29c3
 	struct subcmd *subcmds;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct cmd *c;
cvsdist 38c29c3
+	struct cmd *c;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	c = ALLOC(cmd);
cvsdist 38c29c3
 	c->c_type = DCOLON;
Michal Luscon f5c9a76
@@ -494,6 +496,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Error printing routine in parser.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+void
cvsdist 38c29c3
 yyerror(s)
cvsdist 38c29c3
 	char *s;
cvsdist 38c29c3
 {
Michal Luscon f5c9a76
@@ -523,7 +526,7 @@
cvsdist 38c29c3
 makenl(name)
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *nl;
cvsdist 38c29c3
+	struct namelist *nl;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "makenl(%s)", name == NULL ? "null" : name);
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -620,7 +623,7 @@
cvsdist 38c29c3
 makesubcmd(type)
cvsdist 38c29c3
 	int type;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct subcmd *sc;
cvsdist 38c29c3
+	struct subcmd *sc;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	sc = ALLOC(subcmd);
cvsdist 38c29c3
 	sc->sc_type = type;
cvsdist 38c29c3
--- rdist-6.1.5/src/rdist.c.cleanup	1998-11-10 05:13:50.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/rdist.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: rdist.c,v 6.66 1998/11/10 04:13:49 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -74,7 +74,7 @@
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 	struct namelist **hostlist;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *ptr, *new;
cvsdist 38c29c3
+	struct namelist *ptr, *new;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!name || !hostlist)
cvsdist 38c29c3
 		return;
Michal Luscon f5c9a76
@@ -91,14 +91,15 @@
cvsdist 38c29c3
 		*hostlist = new;
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
+int
cvsdist 38c29c3
 main(argc, argv, envp)
cvsdist 38c29c3
 	int argc;
cvsdist 38c29c3
 	char *argv[];
cvsdist 38c29c3
 	char **envp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	struct namelist *hostlist = NULL;
cvsdist 38c29c3
-	register int x;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	int x;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	int cmdargs = 0;
cvsdist 38c29c3
 	int c;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -108,7 +109,7 @@
cvsdist 38c29c3
 	 */
cvsdist 38c29c3
 	setprogname(argv);
cvsdist 38c29c3
 
cvsdist 38c29c3
-	if (cp = msgparseopts(localmsglist, TRUE)) {
cvsdist 38c29c3
+	if ((cp = msgparseopts(localmsglist, TRUE))) {
cvsdist 38c29c3
 		error("Bad builtin log option (%s): %s.", 
cvsdist 38c29c3
 		      localmsglist, cp);
cvsdist 38c29c3
 		usage();
Michal Luscon f5c9a76
@@ -152,7 +153,7 @@
cvsdist 38c29c3
 	while ((c = getopt(argc, argv, optchars)) != -1)
cvsdist 38c29c3
 		switch (c) {
cvsdist 38c29c3
 		case 'l':
cvsdist 38c29c3
-			if (cp = msgparseopts(optarg, TRUE)) {
cvsdist 38c29c3
+			if ((cp = msgparseopts(optarg, TRUE))) {
cvsdist 38c29c3
 				error("Bad log option \"%s\": %s.", optarg,cp);
cvsdist 38c29c3
 				usage();
cvsdist 38c29c3
 			}
Michal Luscon f5c9a76
@@ -200,7 +201,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 		case 'D':
cvsdist 38c29c3
 			debug = DM_ALL;
cvsdist 38c29c3
-			if (cp = msgparseopts("stdout=all,debug", TRUE)) {
cvsdist 38c29c3
+			if ((cp = msgparseopts("stdout=all,debug", TRUE))) {
cvsdist 38c29c3
 				error("Enable debug messages failed: %s.", cp);
cvsdist 38c29c3
 				usage();
cvsdist 38c29c3
 			}
Michal Luscon f5c9a76
@@ -239,7 +240,7 @@
cvsdist 38c29c3
 				error("No path specified to \"-P\".");
cvsdist 38c29c3
 				usage();
cvsdist 38c29c3
 			}
cvsdist 38c29c3
-			if (cp = searchpath(optarg))
cvsdist 38c29c3
+			if ((cp = searchpath(optarg)))
cvsdist 38c29c3
 				path_remsh = strdup(cp);
cvsdist 38c29c3
 			else {
cvsdist 38c29c3
 				error("No component of path \"%s\" exists.",
Michal Luscon f5c9a76
@@ -291,7 +292,7 @@
cvsdist 38c29c3
 	else {
cvsdist 38c29c3
 		if (fin == NULL)
cvsdist 38c29c3
 			fin = opendist(distfile);
cvsdist 38c29c3
-		(void) yyparse();
cvsdist 38c29c3
+		yyparse();
cvsdist 38c29c3
 		/*
cvsdist 38c29c3
 		 * Need to keep stdin open for child processing later
cvsdist 38c29c3
 		 */
Michal Luscon f5c9a76
@@ -342,6 +343,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Print usage message and exit.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+void
cvsdist 38c29c3
 usage()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	char *sopts = "cDFnv";
Michal Luscon f5c9a76
@@ -373,12 +375,13 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * rcp like interface for distributing files.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+void
cvsdist 38c29c3
 docmdargs(nargs, args)
cvsdist 38c29c3
 	int nargs;
cvsdist 38c29c3
 	char *args[];
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *nl, *prev;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	struct namelist *nl, *prev;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	struct namelist *files, *hosts;
cvsdist 38c29c3
 	struct subcmd *cmds;
cvsdist 38c29c3
 	char *dest;
Michal Luscon f5c9a76
@@ -427,10 +430,10 @@
cvsdist 38c29c3
  * Get a list of NAME blocks (mostly for debugging).
cvsdist 38c29c3
  */
cvsdist 38c29c3
 extern char *getnlstr(nl)
cvsdist 38c29c3
-	register struct namelist *nl;
cvsdist 38c29c3
+	struct namelist *nl;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buf[16384];
cvsdist 38c29c3
-	register int count = 0, len = 0;
cvsdist 38c29c3
+	int count = 0, len = 0;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	(void) sprintf(buf, "(");
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/client.c.cleanup	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/client.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: client.c,v 6.82 1998/11/10 04:08:47 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -78,7 +78,7 @@
cvsdist 38c29c3
 	int destdir;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	extern struct namelist *filelist;
cvsdist 38c29c3
-	register char *lname, *cp;
cvsdist 38c29c3
+	char *lname, *cp;
cvsdist 38c29c3
 	static char buff[BUFSIZ];
cvsdist 38c29c3
 	int srclen, pathlen;
cvsdist 38c29c3
 	char *p;
Michal Luscon f5c9a76
@@ -140,7 +140,7 @@
cvsdist 38c29c3
 	struct namelist *list;
cvsdist 38c29c3
 	char *file;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *nl;
cvsdist 38c29c3
+	struct namelist *nl;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (nl = list; nl != NULL; nl = nl->n_next)
cvsdist 38c29c3
 		if (strcmp(file, nl->n_name) == 0)
Michal Luscon f5c9a76
@@ -157,7 +157,7 @@
cvsdist 38c29c3
 	char *rname;
cvsdist 38c29c3
 	int destdir;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct subcmd *sc;
cvsdist 38c29c3
+	struct subcmd *sc;
cvsdist 38c29c3
 	extern struct subcmd *subcmds;
cvsdist 38c29c3
 	char *rfile;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -194,7 +194,7 @@
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	char *rfile;
cvsdist 38c29c3
 	struct namelist *new;
cvsdist 38c29c3
-	register struct subcmd *sc;
cvsdist 38c29c3
+	struct subcmd *sc;
cvsdist 38c29c3
 	extern struct subcmd *subcmds;
cvsdist 38c29c3
 	int isokay = 0;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -221,7 +221,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void freecmdspecialfiles()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *ptr, *save;
cvsdist 38c29c3
+	struct namelist *ptr, *save;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (ptr = updfilelist; ptr; ) {
cvsdist 38c29c3
 		if (ptr->n_name) (void) free(ptr->n_name);
Michal Luscon f5c9a76
@@ -243,10 +243,8 @@
cvsdist 38c29c3
 	char **filev;
cvsdist 38c29c3
 	opt_t opts;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct subcmd *sc;
cvsdist 38c29c3
-	register struct namelist *f;
cvsdist 38c29c3
-	register char **cpp;
cvsdist 38c29c3
-	char *file;
cvsdist 38c29c3
+	struct subcmd *sc;
cvsdist 38c29c3
+	struct namelist *f;
cvsdist 38c29c3
 	int first = TRUE;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (sc = cmd->c_cmds; sc != NULL; sc = sc->sc_next) {
Michal Luscon f5c9a76
@@ -288,7 +286,7 @@
cvsdist 38c29c3
 int checkfilename(name)
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (strchr(name, '\n')) {
cvsdist 38c29c3
 		for (cp = name; *cp; cp++)
Michal Luscon f5c9a76
@@ -495,7 +493,7 @@
cvsdist 38c29c3
 static int rmchk(opts)
cvsdist 38c29c3
 	opt_t opts;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register u_char *s;
cvsdist 38c29c3
+	u_char *s;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	int didupdate = 0;
cvsdist 38c29c3
 	int n;
Michal Luscon f5c9a76
@@ -612,7 +610,7 @@
cvsdist 38c29c3
 	
cvsdist 38c29c3
 	optarget = ptarget;
cvsdist 38c29c3
 	len = ptarget - target;
cvsdist 38c29c3
-	while (dp = readdir(d)) {
cvsdist 38c29c3
+	while ((dp = readdir(d))) {
cvsdist 38c29c3
 		if (!strcmp(dp->d_name, ".") ||
cvsdist 38c29c3
 		    !strcmp(dp->d_name, ".."))
cvsdist 38c29c3
 			continue;
Michal Luscon f5c9a76
@@ -625,7 +623,7 @@
cvsdist 38c29c3
 		if (ptarget[-1] != '/')
cvsdist 38c29c3
 			*ptarget++ = '/';
cvsdist 38c29c3
 		cp = dp->d_name;
cvsdist 38c29c3
-		while (*ptarget++ = *cp++)
cvsdist 38c29c3
+		while ((*ptarget++ = *cp++))
cvsdist 38c29c3
 			;
cvsdist 38c29c3
 		ptarget--;
cvsdist 38c29c3
 		if (sendit(dp->d_name, opts, destdir) > 0)
Michal Luscon f5c9a76
@@ -764,13 +762,13 @@
cvsdist 38c29c3
 	opt_t opts;
cvsdist 38c29c3
 	struct stat *statp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register off_t size;
cvsdist 38c29c3
-	register time_t mtime;
cvsdist 38c29c3
+	off_t size;
cvsdist 38c29c3
+	time_t mtime;
cvsdist 38c29c3
 	unsigned short lmode;
cvsdist 38c29c3
 	unsigned short rmode;
cvsdist 38c29c3
 	char *owner = NULL, *group = NULL;
cvsdist 38c29c3
 	int done, n;
cvsdist 38c29c3
-	u_char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "update(%s, 0x%x, 0x%x)\n", rname, opts, statp);
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -1029,7 +1026,6 @@
cvsdist 38c29c3
 	int destdir;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static struct stat stb;
cvsdist 38c29c3
-	extern struct subcmd *subcmds;
cvsdist 38c29c3
 	char *user, *group;
cvsdist 38c29c3
 	int u, len;
cvsdist 38c29c3
 	int didupdate = 0;
Michal Luscon f5c9a76
@@ -1151,7 +1148,7 @@
cvsdist 38c29c3
 	(void) unlink(statfile);
cvsdist 38c29c3
 #endif
cvsdist 38c29c3
 
cvsdist 38c29c3
-	if (file = getnotifyfile())
cvsdist 38c29c3
+	if ((file = getnotifyfile()))
cvsdist 38c29c3
 		(void) unlink(file);
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/child.c.cleanup	1998-11-10 05:18:57.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/child.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: child.c,v 6.29 1998/11/10 04:18:56 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -84,7 +84,7 @@
cvsdist 38c29c3
 static void removechild(child)
cvsdist 38c29c3
 	CHILD *child;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register CHILD *pc, *prevpc;
cvsdist 38c29c3
+	CHILD *pc, *prevpc;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "removechild(%s, %d, %d) start",
cvsdist 38c29c3
 		 child->c_name, child->c_pid, child->c_readfd);
Michal Luscon f5c9a76
@@ -142,7 +142,7 @@
cvsdist 38c29c3
 static CHILD *copychild(child)
cvsdist 38c29c3
 	CHILD *child;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register CHILD *newc;
cvsdist 38c29c3
+	CHILD *newc;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	newc = (CHILD *) xmalloc(sizeof(CHILD));
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -161,7 +161,7 @@
cvsdist 38c29c3
 static void addchild(child)
cvsdist 38c29c3
 	CHILD *child;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register CHILD *pc;
cvsdist 38c29c3
+	CHILD *pc;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "addchild() start\n");
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -274,7 +274,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void reap()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register CHILD *pc;
cvsdist 38c29c3
+	CHILD *pc;
cvsdist 38c29c3
 	int status = 0;
cvsdist 38c29c3
 	pid_t pid;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -330,7 +330,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void childscan() 
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register CHILD *pc, *nextpc;
cvsdist 38c29c3
+	CHILD *pc, *nextpc;
cvsdist 38c29c3
 	
cvsdist 38c29c3
 	debugmsg(DM_CALL, "childscan() start");
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -360,8 +360,8 @@
cvsdist 38c29c3
 extern void waitup()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 #if	defined(HAVE_SELECT)
cvsdist 38c29c3
-	register int count;
cvsdist 38c29c3
-	register CHILD *pc;
cvsdist 38c29c3
+	int count;
cvsdist 38c29c3
+	CHILD *pc;
cvsdist 38c29c3
 	fd_set rchildfds;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "waitup() start\n");
cvsdist 38c29c3
--- rdist-6.1.5/src/docmd.c.cleanup	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/docmd.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: docmd.c,v 6.87 1998/11/10 04:08:32 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -93,10 +93,10 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void notify(rhost, to, lmod)
cvsdist 38c29c3
 	char *rhost;
cvsdist 38c29c3
-	register struct namelist *to;
cvsdist 38c29c3
+	struct namelist *to;
cvsdist 38c29c3
 	time_t lmod;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int fd, len;
cvsdist 38c29c3
+	int fd, len;
cvsdist 38c29c3
 	FILE *pf, *popen();
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	static char buf[BUFSIZ];
Michal Luscon f5c9a76
@@ -215,7 +215,7 @@
cvsdist 38c29c3
 	struct cmd *cmd;
cvsdist 38c29c3
 	struct cmd *cmdlist;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct cmd *pcmd;
cvsdist 38c29c3
+	struct cmd *pcmd;
cvsdist 38c29c3
 	
cvsdist 38c29c3
 	for (pcmd = cmdlist; pcmd; pcmd = pcmd->c_next) {
cvsdist 38c29c3
 		checkcmd(pcmd);
Michal Luscon f5c9a76
@@ -232,7 +232,7 @@
cvsdist 38c29c3
 	struct cmd *cmd;
cvsdist 38c29c3
 	struct cmd *cmdlist;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct cmd *pc;
cvsdist 38c29c3
+	struct cmd *pc;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!cmd) {
cvsdist 38c29c3
 		debugmsg(DM_MISC, "markfailed() NULL cmd parameter");
Michal Luscon f5c9a76
@@ -303,7 +303,7 @@
cvsdist 38c29c3
 static int makeconn(rhost)
cvsdist 38c29c3
 	char *rhost;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *ruser, *cp;
cvsdist 38c29c3
+	char *ruser, *cp;
cvsdist 38c29c3
 	static char *cur_host = NULL;
cvsdist 38c29c3
 	extern char *locuser;
cvsdist 38c29c3
 	extern long min_freefiles, min_freespace;
Michal Luscon f5c9a76
@@ -424,9 +424,9 @@
cvsdist 38c29c3
 	struct cmd *cmd;
cvsdist 38c29c3
 	char **filev;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *f;
cvsdist 38c29c3
-	register struct subcmd *sc;
cvsdist 38c29c3
-	register char **cpp;
cvsdist 38c29c3
+	struct namelist *f;
cvsdist 38c29c3
+	struct subcmd *sc;
cvsdist 38c29c3
+	char **cpp;
cvsdist 38c29c3
 	int n, ddir, destdir, opts = options;
cvsdist 38c29c3
 	struct namelist *files;
cvsdist 38c29c3
 	struct subcmd *sbcmds;
Michal Luscon f5c9a76
@@ -561,7 +561,6 @@
cvsdist 38c29c3
 		}
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 
cvsdist 38c29c3
-done:
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * Run any commands for the entire cmd
cvsdist 38c29c3
 	 */
Michal Luscon f5c9a76
@@ -578,7 +577,7 @@
cvsdist 38c29c3
 			notify(rhost, sc->sc_args, (time_t) 0);
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!nflag) {
cvsdist 38c29c3
-		register struct linkbuf *nextl, *l;
cvsdist 38c29c3
+		struct linkbuf *nextl, *l;
cvsdist 38c29c3
 
cvsdist 38c29c3
 		for (l = ihead; l != NULL; freelinkinfo(l), l = nextl) {
cvsdist 38c29c3
 			nextl = l->nextp;
Michal Luscon f5c9a76
@@ -595,11 +594,12 @@
cvsdist 38c29c3
 	setjmp_ok = FALSE;
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
+int
cvsdist 38c29c3
 okname(name)
cvsdist 38c29c3
-	register char *name;
cvsdist 38c29c3
+	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp = name;
cvsdist 38c29c3
-	register int c, isbad;
cvsdist 38c29c3
+	char *cp = name;
cvsdist 38c29c3
+	int c, isbad;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (isbad = FALSE; *cp && !isbad; ++cp) {
cvsdist 38c29c3
 		c = *cp;
Michal Luscon f5c9a76
@@ -621,9 +621,9 @@
cvsdist 38c29c3
 	struct subcmd *sbcmds;
cvsdist 38c29c3
 	char **env;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register DIR *d;
cvsdist 38c29c3
-	register DIRENTRY *dp;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	DIR *d;
cvsdist 38c29c3
+	DIRENTRY *dp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	char *optarget;
cvsdist 38c29c3
 	int len;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -635,7 +635,7 @@
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 	optarget = ptarget;
cvsdist 38c29c3
 	len = ptarget - target;
cvsdist 38c29c3
-	while (dp = readdir(d)) {
cvsdist 38c29c3
+	while ((dp = readdir(d))) {
cvsdist 38c29c3
 		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
cvsdist 38c29c3
 			continue;
cvsdist 38c29c3
 		if (len + 1 + (int)strlen(dp->d_name) >= BUFSIZ - 1) {
Michal Luscon f5c9a76
@@ -645,7 +645,7 @@
cvsdist 38c29c3
 		ptarget = optarget;
cvsdist 38c29c3
 		*ptarget++ = '/';
cvsdist 38c29c3
 		cp = dp->d_name;
cvsdist 38c29c3
-		while (*ptarget++ = *cp++)
cvsdist 38c29c3
+		while ((*ptarget++ = *cp++))
cvsdist 38c29c3
 			;
cvsdist 38c29c3
 		ptarget--;
cvsdist 38c29c3
 		cmptime(target, sbcmds, env);
Michal Luscon f5c9a76
@@ -734,9 +736,9 @@
cvsdist 38c29c3
 	struct cmd *cmd;
cvsdist 38c29c3
 	char **filev;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct subcmd *sc;
cvsdist 38c29c3
-	register struct namelist *f;
cvsdist 38c29c3
-	register char *cp, **cpp;
cvsdist 38c29c3
+	struct subcmd *sc;
cvsdist 38c29c3
+	struct namelist *f;
cvsdist 38c29c3
+	char *cp, **cpp;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	struct namelist *files = cmd->c_files;
cvsdist 38c29c3
 	struct subcmd *sbcmds = cmd->c_cmds;
Michal Luscon f5c9a76
@@ -818,8 +818,8 @@
cvsdist 38c29c3
 extern int except(file)
cvsdist 38c29c3
 	char *file;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct	subcmd *sc;
cvsdist 38c29c3
-	register struct	namelist *nl;
cvsdist 38c29c3
+	struct	subcmd *sc;
cvsdist 38c29c3
+	struct	namelist *nl;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "except(%s)", file);
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -912,8 +912,8 @@
cvsdist 38c29c3
 	int argc;
cvsdist 38c29c3
 	char **argv;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *f;
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	struct namelist *f;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (argc) {
cvsdist 38c29c3
 		for (i = 0; i < argc; i++) {
Michal Luscon f5c9a76
@@ -956,9 +956,9 @@
cvsdist 38c29c3
 	int argc;
cvsdist 38c29c3
 	char **argv;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct cmd *c;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	struct cmd *c;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	(void) signal(SIGHUP, sighandler);
cvsdist 38c29c3
 	(void) signal(SIGINT, sighandler);
Michal Luscon f5c9a76
@@ -1026,7 +1026,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 		if (hostlist) {
cvsdist 38c29c3
 			/* Do specific hosts as specified on command line */
cvsdist 38c29c3
-			register struct namelist *nlptr;
cvsdist 38c29c3
+			struct namelist *nlptr;
cvsdist 38c29c3
 
cvsdist 38c29c3
 			for (nlptr = hostlist; nlptr; nlptr = nlptr->n_next)
cvsdist 38c29c3
 				/*
cvsdist 38c29c3
--- rdist-6.1.5/src/distopt.c.cleanup	1998-11-10 05:09:11.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/distopt.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -25,7 +25,7 @@
Michal Luscon f5c9a76
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: distopt.c,v 6.12 1998/11/10 04:09:11 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -74,7 +74,7 @@
cvsdist 38c29c3
 extern DISTOPTINFO *getdistopt(name)
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (i = 0; distoptinfo[i].do_name; ++i)
cvsdist 38c29c3
 		if (strcasecmp(name, distoptinfo[i].do_name) == 0)
Michal Luscon f5c9a76
@@ -93,7 +93,7 @@
cvsdist 38c29c3
 	opt_t *optptr;
cvsdist 38c29c3
 	int doerrs;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *string, *optstr;
cvsdist 38c29c3
+	char *string, *optstr;
cvsdist 38c29c3
 	DISTOPTINFO *distopt;
cvsdist 38c29c3
 	int negate;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -112,7 +112,7 @@
cvsdist 38c29c3
 		 * and the option starts with "no", strip "no"
cvsdist 38c29c3
 		 * from option and retry lookup.
cvsdist 38c29c3
 		 */
cvsdist 38c29c3
-		if (distopt = getdistopt(optstr)) {
cvsdist 38c29c3
+		if ((distopt = getdistopt(optstr))) {
cvsdist 38c29c3
 			FLAG_ON(*optptr, distopt->do_value);
cvsdist 38c29c3
 			continue;
cvsdist 38c29c3
 		}
Michal Luscon f5c9a76
@@ -135,7 +135,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 extern char *getdistoptlist()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 	static char buf[1024];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (i = 0, buf[0] = CNULL; distoptinfo[i].do_name; ++i) {
Michal Luscon f5c9a76
@@ -157,7 +157,7 @@
cvsdist 38c29c3
 extern char *getondistoptlist(opts)
cvsdist 38c29c3
 	opt_t opts;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 	static char buf[1024];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (i = 0, buf[0] = CNULL; distoptinfo[i].do_name; ++i) {
cvsdist 38c29c3
--- rdist-6.1.5/src/expand.c.cleanup	1998-11-10 05:09:31.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/expand.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: expand.c,v 6.19 1998/11/10 04:09:31 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -75,9 +75,9 @@
cvsdist 38c29c3
 		      sizeof(*sortbase), argcmp), sortbase = &eargv[eargc]
cvsdist 38c29c3
 
cvsdist 38c29c3
 static void Cat(s1, s2)				/* quote in s1 and s2 */
cvsdist 38c29c3
-	register u_char *s1, *s2;
cvsdist 38c29c3
+	u_char *s1, *s2;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	int len = strlen((char *)s1) + strlen((char *)s2) + 2;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if ((eargc + 1) >= MAXEARGS) {
Michal Luscon f5c9a76
@@ -91,12 +91,12 @@
cvsdist 38c29c3
 	do { 
cvsdist 38c29c3
 		if (*s1 == QUOTECHAR) 
cvsdist 38c29c3
 			s1++; 
cvsdist 38c29c3
-	} while (*cp++ = *s1++);
cvsdist 38c29c3
+	} while ((*cp++ = *s1++));
cvsdist 38c29c3
 	cp--;
cvsdist 38c29c3
 	do { 
cvsdist 38c29c3
 		if (*s2 == QUOTECHAR) 
cvsdist 38c29c3
 			s2++; 
cvsdist 38c29c3
-	} while (*cp++ = *s2++);
cvsdist 38c29c3
+	} while ((*cp++ = *s2++));
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
 static void addpath(c)
Michal Luscon f5c9a76
@@ -125,8 +125,8 @@
cvsdist 38c29c3
 	struct namelist *list;
cvsdist 38c29c3
 	int wh;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct namelist *nl, *prev;
cvsdist 38c29c3
-	register int n;
cvsdist 38c29c3
+	struct namelist *nl, *prev;
cvsdist 38c29c3
+	int n;
cvsdist 38c29c3
 	char pathbuf[BUFSIZ];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (debug)
Michal Luscon f5c9a76
@@ -176,7 +176,7 @@
cvsdist 38c29c3
 	u_char *str;
cvsdist 38c29c3
 	int ch;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register u_char *cp;
cvsdist 38c29c3
+	u_char *cp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (cp = str; cp && *cp != CNULL; ++cp)
cvsdist 38c29c3
 		if (ch == *cp)
Michal Luscon f5c9a76
@@ -188,8 +188,8 @@
cvsdist 38c29c3
 void expstr(s)
cvsdist 38c29c3
 	u_char *s;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register u_char *cp, *cp1;
cvsdist 38c29c3
-	register struct namelist *tp;
cvsdist 38c29c3
+	u_char *cp, *cp1;
cvsdist 38c29c3
+	struct namelist *tp;
cvsdist 38c29c3
 	u_char *tail;
cvsdist 38c29c3
 	u_char ebuf[BUFSIZ];
cvsdist 38c29c3
 	u_char varbuff[BUFSIZ];
Michal Luscon f5c9a76
@@ -296,7 +296,7 @@
cvsdist 38c29c3
 			cp1 = (u_char *)pw->pw_dir;
cvsdist 38c29c3
 			s = cp;
cvsdist 38c29c3
 		}
cvsdist 38c29c3
-		for (cp = (u_char *)path; *cp++ = *cp1++; )
cvsdist 38c29c3
+		for (cp = (u_char *)path; (*cp++ = *cp1++); )
cvsdist 38c29c3
 			;
cvsdist 38c29c3
 		tpathp = pathp = (char *)cp - 1;
cvsdist 38c29c3
 	} else {
Michal Luscon f5c9a76
@@ -320,7 +320,7 @@
cvsdist 38c29c3
 	sort();
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
-static
cvsdist 38c29c3
+static int
cvsdist 38c29c3
 argcmp(a1, a2)
cvsdist 38c29c3
 	char **a1, **a2;
cvsdist 38c29c3
 {
Michal Luscon f5c9a76
@@ -335,8 +335,8 @@
cvsdist 38c29c3
 void expsh(s)				/* quote in s */
cvsdist 38c29c3
 	u_char *s;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register u_char *cp, *oldcp;
cvsdist 38c29c3
-	register char *spathp;
cvsdist 38c29c3
+	u_char *cp, *oldcp;
cvsdist 38c29c3
+	char *spathp;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	spathp = pathp;
Michal Luscon f5c9a76
@@ -374,7 +374,7 @@
cvsdist 38c29c3
 	char *pattern;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
-	register DIRENTRY *dp;
cvsdist 38c29c3
+	DIRENTRY *dp;
cvsdist 38c29c3
 	DIR *dirp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	dirp = opendir(path);
Michal Luscon f5c9a76
@@ -411,11 +411,12 @@
cvsdist 38c29c3
 	yyerror(path);
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
+int
cvsdist 38c29c3
 execbrc(p, s)				/* quote in p */
cvsdist 38c29c3
 	u_char *p, *s;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	u_char restbuf[BUFSIZ + 2];
cvsdist 38c29c3
-	register u_char *pe, *pm, *pl;
cvsdist 38c29c3
+	u_char *pe, *pm, *pl;
cvsdist 38c29c3
 	int brclev = 0;
cvsdist 38c29c3
 	u_char *lm, savec;
cvsdist 38c29c3
 	char *spathp;
Michal Luscon f5c9a76
@@ -501,11 +502,12 @@
cvsdist 38c29c3
 	return (0);
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
+int
cvsdist 38c29c3
 match(s, p)					/* quote in p */
cvsdist 38c29c3
 	char *s, *p;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int c;
cvsdist 38c29c3
-	register char *sentp;
cvsdist 38c29c3
+	int c;
cvsdist 38c29c3
+	char *sentp;
cvsdist 38c29c3
 	char sexpany = expany;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (*s == '.' && *p != '.')
Michal Luscon f5c9a76
@@ -518,11 +520,12 @@
cvsdist 38c29c3
 	return (c);
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
+int
cvsdist 38c29c3
 amatch(s, p)					/* quote in p */
cvsdist 38c29c3
-	register char *s;
cvsdist 38c29c3
-	register u_char *p;
cvsdist 38c29c3
+	char *s;
cvsdist 38c29c3
+	u_char *p;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int scc;
cvsdist 38c29c3
+	int scc;
cvsdist 38c29c3
 	int ok, lc;
cvsdist 38c29c3
 	char *spathp;
cvsdist 38c29c3
 	struct stat stb;
Michal Luscon f5c9a76
@@ -539,7 +542,7 @@
cvsdist 38c29c3
 		case '[':
cvsdist 38c29c3
 			ok = 0;
cvsdist 38c29c3
 			lc = 077777;
cvsdist 38c29c3
-			while (cc = *p++) {
cvsdist 38c29c3
+			while ((cc = *p++)) {
cvsdist 38c29c3
 				if (cc == ']') {
cvsdist 38c29c3
 					if (ok)
cvsdist 38c29c3
 						break;
Michal Luscon f5c9a76
@@ -593,7 +596,7 @@
cvsdist 38c29c3
 			while (*s)
cvsdist 38c29c3
 				addpath(*s++);
cvsdist 38c29c3
 			addpath('/');
cvsdist 38c29c3
-			if (stat(path, &stb) == 0 && S_ISDIR(stb.st_mode))
cvsdist 38c29c3
+			if (stat(path, &stb) == 0 && S_ISDIR(stb.st_mode)) {
cvsdist 38c29c3
 				if (*p == CNULL) {
cvsdist 38c29c3
 					if (which & E_TILDE)
cvsdist 38c29c3
 						Cat((u_char *)path, 
Michal Luscon f5c9a76
@@ -603,6 +606,7 @@
cvsdist 38c29c3
 						    (u_char *)tpathp);
cvsdist 38c29c3
 				} else
cvsdist 38c29c3
 					expsh(p);
cvsdist 38c29c3
+			}
cvsdist 38c29c3
 			pathp = spathp;
cvsdist 38c29c3
 			*pathp = CNULL;
cvsdist 38c29c3
 			return (0);
cvsdist 38c29c3
--- rdist-6.1.5/src/lookup.c.cleanup	1998-11-10 05:12:56.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/lookup.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: lookup.c,v 6.9 1998/11/10 04:12:56 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -62,11 +62,12 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Define a variable from a command line argument.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+void
cvsdist 38c29c3
 define(name)
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp, *s;
cvsdist 38c29c3
-	register struct namelist *nl;
cvsdist 38c29c3
+	char *cp, *s;
cvsdist 38c29c3
+	struct namelist *nl;
cvsdist 38c29c3
 	struct namelist *value;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "define(%s)", name);
Michal Luscon f5c9a76
@@ -131,9 +132,9 @@
cvsdist 38c29c3
 	int action;
cvsdist 38c29c3
 	struct namelist *value;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register unsigned n;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
-	register struct syment *s;
cvsdist 38c29c3
+	unsigned n;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
+	struct syment *s;
cvsdist 38c29c3
 	char ebuf[BUFSIZ];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_CALL, "lookup(%s, %d, %x)", name, action, value);
cvsdist 38c29c3
--- rdist-6.1.5/src/isexec.c.cleanup	1998-11-10 05:11:42.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/isexec.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -31,7 +31,7 @@
cvsdist 38c29c3
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: isexec.c,v 6.22 1998/11/10 04:11:42 mcooper Exp $";
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/signal.c.cleanup	1998-11-10 05:16:13.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/signal.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: signal.c,v 6.2 1998/11/10 04:16:13 mcooper Exp $";
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/rshrcmd.c.cleanup	1998-11-10 05:15:07.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/rshrcmd.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -29,7 +29,7 @@
cvsdist 38c29c3
  * Chris Siebenmann <cks@utcc.utoronto.ca>.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: rshrcmd.c,v 1.9 1998/11/10 04:15:07 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -53,6 +53,7 @@
cvsdist 38c29c3
  * program in place of a direct rcmd() function call so as to
cvsdist 38c29c3
  * avoid having to be root.
cvsdist 38c29c3
  */
cvsdist 38c29c3
+int
cvsdist 38c29c3
 rshrcmd(ahost, port, luser, ruser, cmd, fd2p)
cvsdist 38c29c3
 	char  	**ahost;
cvsdist 38c29c3
 	u_short	port;
Michal Luscon f5c9a76
@@ -127,6 +128,7 @@
cvsdist 38c29c3
 		(void) wait(0);
cvsdist 38c29c3
 		return sp[0];
cvsdist 38c29c3
 	}
cvsdist 38c29c3
+	return -1;
cvsdist 38c29c3
 	/*NOTREACHED*/
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/common.c.cleanup	1998-11-10 05:09:01.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/common.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: common.c,v 6.84 1998/11/10 04:09:01 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -81,14 +81,14 @@
cvsdist 38c29c3
 /* 
cvsdist 38c29c3
  * Front end to write() that handles partial write() requests.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern WRITE_RETURN_T xwrite(fd, buf, len)
cvsdist 38c29c3
+WRITE_RETURN_T xwrite(fd, buf, len)
cvsdist 38c29c3
 	int fd;
cvsdist 38c29c3
 	void *buf;
cvsdist 38c29c3
 	WRITE_AMT_T len;
cvsdist 38c29c3
 {
cvsdist 38c29c3
     	WRITE_AMT_T nleft = len;
cvsdist 38c29c3
 	WRITE_RETURN_T nwritten;
cvsdist 38c29c3
-	register char *ptr = buf;
cvsdist 38c29c3
+	char *ptr = buf;
cvsdist 38c29c3
          
cvsdist 38c29c3
 	while (nleft > 0) {
cvsdist 38c29c3
 	    	if ((nwritten = write(fd, ptr, nleft)) <= 0) {
Michal Luscon f5c9a76
@@ -104,14 +104,14 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Set program name
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void setprogname(argv)
cvsdist 38c29c3
+void setprogname(argv)
cvsdist 38c29c3
 	char **argv;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!progname) {
cvsdist 38c29c3
 		progname = strdup(argv[0]);
cvsdist 38c29c3
-		if (cp = strrchr(progname, '/'))
cvsdist 38c29c3
+		if ((cp = strrchr(progname, '/')))
cvsdist 38c29c3
 			progname = cp + 1;
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 }
Michal Luscon f5c9a76
@@ -119,14 +119,14 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Do run-time initialization
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int init(argc, argv, envp)
cvsdist 38c29c3
+int init(argc, argv, envp)
cvsdist 38c29c3
 	/*ARGSUSED*/
cvsdist 38c29c3
 	int argc;
cvsdist 38c29c3
 	char **argv;
cvsdist 38c29c3
 	char **envp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!isserver)
cvsdist 38c29c3
 		(void) signal(SIGSEGV, sighandler);
Michal Luscon f5c9a76
@@ -176,7 +176,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Finish things up before ending.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void finish()
cvsdist 38c29c3
+void finish()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	extern jmp_buf finish_jmpbuf;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -210,7 +210,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Handle lost connections
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void lostconn()
cvsdist 38c29c3
+void lostconn()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	/* Prevent looping */
cvsdist 38c29c3
 	(void) signal(SIGPIPE, SIG_IGN);
Michal Luscon f5c9a76
@@ -226,7 +226,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Do a core dump
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void coredump()
cvsdist 38c29c3
+void coredump()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	error("Segmentation violation - dumping core [PID = %d, %s]",
cvsdist 38c29c3
 	      getpid(), 
Michal Luscon f5c9a76
@@ -239,7 +239,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * General signal handler
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void sighandler(sig)
cvsdist 38c29c3
+void sighandler(sig)
cvsdist 38c29c3
 	int sig;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	debugmsg(DM_CALL, "sighandler() received signal %d\n", sig);
Michal Luscon f5c9a76
@@ -319,7 +319,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Stdarg frontend to sendcmdmsg()
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int sendcmd(char cmd, char *fmt, ...)
cvsdist 38c29c3
+int sendcmd(char cmd, char *fmt, ...)
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buf[BUFSIZ];
cvsdist 38c29c3
 	va_list args;
Michal Luscon f5c9a76
@@ -339,7 +339,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Varargs frontend to sendcmdmsg()
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int sendcmd(va_alist)
cvsdist 38c29c3
+int sendcmd(va_alist)
cvsdist 38c29c3
 	va_dcl
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buf[BUFSIZ];
Michal Luscon f5c9a76
@@ -366,7 +366,7 @@
cvsdist 38c29c3
  * Stupid frontend to sendcmdmsg()
cvsdist 38c29c3
  */
cvsdist 38c29c3
 /*VARARGS2*/
cvsdist 38c29c3
-extern int sendcmd(cmd, fmt, a1, a2, a3, a4, a5, a6, a7, a8)
cvsdist 38c29c3
+int sendcmd(cmd, fmt, a1, a2, a3, a4, a5, a6, a7, a8)
cvsdist 38c29c3
 	char cmd;
cvsdist 38c29c3
 	char *fmt;
cvsdist 38c29c3
 {
Michal Luscon f5c9a76
@@ -427,13 +427,13 @@
cvsdist 38c29c3
  * errors, call cleanup() or lostconn().  In other words, unless
cvsdist 38c29c3
  * the third argument is nonzero, this routine never returns failure.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int remline(buffer, space, doclean)
cvsdist 38c29c3
-	register u_char *buffer;
cvsdist 38c29c3
+int remline(buffer, space, doclean)
cvsdist 38c29c3
+	u_char *buffer;
cvsdist 38c29c3
 	int space;
cvsdist 38c29c3
 	int doclean;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int c, left = space;
cvsdist 38c29c3
-	register u_char *p = buffer;
cvsdist 38c29c3
+	int c, left = space;
cvsdist 38c29c3
+	u_char *p = buffer;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (rem_r < 0) {
cvsdist 38c29c3
 		error("Cannot read remote input: Remote descriptor not open.");
Michal Luscon f5c9a76
@@ -488,9 +488,9 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Non-line-oriented remote read.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-readrem(p, space)
cvsdist 38c29c3
+int readrem(p, space)
cvsdist 38c29c3
 	char *p;
cvsdist 38c29c3
-	register int space;
cvsdist 38c29c3
+	int space;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	if (remleft <= 0) {
cvsdist 38c29c3
 		/*
Michal Luscon f5c9a76
@@ -521,7 +521,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Get the user name for the uid.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern char *getusername(uid, file, opts)
cvsdist 38c29c3
+char *getusername(uid, file, opts)
cvsdist 38c29c3
 	UID_T uid;
cvsdist 38c29c3
 	char *file;
cvsdist 38c29c3
 	opt_t opts;
Michal Luscon f5c9a76
@@ -560,7 +560,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Get the group name for the gid.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern char *getgroupname(gid, file, opts)
cvsdist 38c29c3
+char *getgroupname(gid, file, opts)
cvsdist 38c29c3
 	GID_T gid;
cvsdist 38c29c3
 	char *file;
cvsdist 38c29c3
 	opt_t opts;
Michal Luscon f5c9a76
@@ -598,7 +598,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Read a response from the remote host.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int response()
cvsdist 38c29c3
+int response()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static u_char resp[BUFSIZ];
cvsdist 38c29c3
 	u_char *s;
Michal Luscon f5c9a76
@@ -640,6 +640,7 @@
cvsdist 38c29c3
 			message(MT_FERROR, "%s", s);
cvsdist 38c29c3
 		finish();
cvsdist 38c29c3
 	}
cvsdist 38c29c3
+	return -1;
cvsdist 38c29c3
 	/*NOTREACHED*/
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -651,11 +652,11 @@
cvsdist 38c29c3
  * user's home directory path name. Return a pointer in buf to the
cvsdist 38c29c3
  * part corresponding to `file'.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern char *exptilde(ebuf, file)
cvsdist 38c29c3
+char *exptilde(ebuf, file)
cvsdist 38c29c3
 	char *ebuf;
cvsdist 38c29c3
-	register char *file;
cvsdist 38c29c3
+	char *file;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *s1, *s2, *s3;
cvsdist 38c29c3
+	char *s1, *s2, *s3;
cvsdist 38c29c3
 	extern char *homedir;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (*file != '~') {
Michal Luscon f5c9a76
@@ -688,12 +689,12 @@
cvsdist 38c29c3
 			*s3 = '/';
cvsdist 38c29c3
 		s2 = pw->pw_dir;
cvsdist 38c29c3
 	}
cvsdist 38c29c3
-	for (s1 = ebuf; *s1++ = *s2++; )
cvsdist 38c29c3
+	for (s1 = ebuf; (*s1++ = *s2++); )
cvsdist 38c29c3
 		;
cvsdist 38c29c3
 	s2 = --s1;
cvsdist 38c29c3
 	if (s3 != NULL) {
cvsdist 38c29c3
 		s2++;
cvsdist 38c29c3
-		while (*s1++ = *s3++)
cvsdist 38c29c3
+		while ((*s1++ = *s3++))
cvsdist 38c29c3
 			;
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 	return(s2);
Michal Luscon f5c9a76
@@ -704,7 +705,7 @@
cvsdist 38c29c3
  * Set our effective user id to the user running us.
cvsdist 38c29c3
  * This should be the uid we do most of our work as.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int becomeuser()
cvsdist 38c29c3
+int becomeuser()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	int r = 0;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -726,7 +727,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Set our effective user id to "root" (uid = 0)
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int becomeroot()
cvsdist 38c29c3
+int becomeroot()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	int r = 0;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -747,7 +748,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Set access and modify times of a given file
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern int setfiletime(file, atime, mtime)
cvsdist 38c29c3
+int setfiletime(file, atime, mtime)
cvsdist 38c29c3
 	char *file;
cvsdist 38c29c3
 	time_t atime;
cvsdist 38c29c3
 	time_t mtime;
Michal Luscon f5c9a76
@@ -784,7 +785,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Get version info
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern char *getversion()
cvsdist 38c29c3
+char *getversion()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buff[BUFSIZ];
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -805,7 +806,7 @@
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	int fd[2], pid, i;
cvsdist 38c29c3
 	int status;
cvsdist 38c29c3
-	register char *cp, *s;
cvsdist 38c29c3
+	char *cp, *s;
cvsdist 38c29c3
 	char sbuf[BUFSIZ], buf[BUFSIZ];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (pipe(fd) < 0) {
Michal Luscon f5c9a76
@@ -927,12 +928,12 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Private version of basename()
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern char *xbasename(path)
cvsdist 38c29c3
+char *xbasename(path)
cvsdist 38c29c3
 	char *path;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
  
cvsdist 38c29c3
-	if (cp = strrchr(path, '/'))
cvsdist 38c29c3
+	if ((cp = strrchr(path, '/')))
cvsdist 38c29c3
 		return(cp+1);
cvsdist 38c29c3
 	else
cvsdist 38c29c3
 		return(path);
Michal Luscon f5c9a76
@@ -943,11 +944,11 @@
cvsdist 38c29c3
  * search until a component of that path is found and
cvsdist 38c29c3
  * return the found file name.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern char *searchpath(path)
cvsdist 38c29c3
+char *searchpath(path)
cvsdist 38c29c3
 	char *path;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
-	register char *file;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
+	char *file;
cvsdist 38c29c3
 	struct stat statbuf;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (; ;) {
Michal Luscon f5c9a76
@@ -971,8 +972,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Set line buffering.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void
cvsdist 38c29c3
-mysetlinebuf(fp)
cvsdist 38c29c3
+void mysetlinebuf(fp)
cvsdist 38c29c3
 	FILE *fp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 #if	SETBUF_TYPE == SETBUF_SETLINEBUF
Michal Luscon f5c9a76
@@ -989,8 +989,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Our interface to system call to get a socket pair.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-int
cvsdist 38c29c3
-getsocketpair(domain, type, protocol, sv)
cvsdist 38c29c3
+int getsocketpair(domain, type, protocol, sv)
cvsdist 38c29c3
 	int domain;
cvsdist 38c29c3
 	int type;
cvsdist 38c29c3
 	int protocol;
cvsdist 38c29c3
--- rdist-6.1.5/src/message.c.cleanup	1998-11-10 05:13:30.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/message.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: message.c,v 6.25 1998/11/10 04:13:30 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -91,7 +91,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 extern void msgprusage()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i, x;
cvsdist 38c29c3
+	int i, x;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	(void) fprintf(stderr, "\nWhere <msgopt> is of form\n");
cvsdist 38c29c3
 	(void) fprintf(stderr, 
Michal Luscon f5c9a76
@@ -114,7 +114,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 extern void msgprconfig()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i, x;
cvsdist 38c29c3
+	int i, x;
cvsdist 38c29c3
 	static char buf[MSGBUFSIZ];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	debugmsg(DM_MISC, "Current message logging config:");
Michal Luscon f5c9a76
@@ -139,7 +139,7 @@
cvsdist 38c29c3
 static MSGFACILITY *getmsgfac(name)
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (i = 0; msgfacility[i].mf_name; ++i)
cvsdist 38c29c3
 		if (strcasecmp(name, msgfacility[i].mf_name) == 0)
Michal Luscon f5c9a76
@@ -154,7 +154,7 @@
cvsdist 38c29c3
 static MSGTYPE *getmsgtype(name)
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (i = 0; msgtypes[i].mt_name; ++i)
cvsdist 38c29c3
 		if (strcasecmp(name, msgtypes[i].mt_name) == 0)
Michal Luscon f5c9a76
@@ -172,9 +172,9 @@
cvsdist 38c29c3
 	char *str;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char ebuf[BUFSIZ];
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
-	register char *strptr, *word;
cvsdist 38c29c3
-	register MSGTYPE *mtp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
+	char *strptr, *word;
cvsdist 38c29c3
+	MSGTYPE *mtp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * MF_SYSLOG is the only supported message facility for the server
Michal Luscon f5c9a76
@@ -234,11 +236,11 @@
cvsdist 38c29c3
 	msgfac->mf_msgtypes = 0;	/* Start from scratch */
cvsdist 38c29c3
 	while (strptr) {
cvsdist 38c29c3
 		word = strptr;
cvsdist 38c29c3
-		if (cp = strchr(strptr, ','))
cvsdist 38c29c3
+		if ((cp = strchr(strptr, ',')))
cvsdist 38c29c3
 			*cp++ = CNULL;
cvsdist 38c29c3
 		strptr = cp;
cvsdist 38c29c3
 
cvsdist 38c29c3
-		if (mtp = getmsgtype(word)) {
cvsdist 38c29c3
+		if ((mtp = getmsgtype(word))) {
cvsdist 38c29c3
 			msgfac->mf_msgtypes |= mtp->mt_type;
cvsdist 38c29c3
 			/*
cvsdist 38c29c3
 			 * XXX This is really a kludge until we add real
Michal Luscon f5c9a76
@@ -266,8 +266,8 @@
cvsdist 38c29c3
 	int doset;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char ebuf[BUFSIZ], msgbuf[MSGBUFSIZ];
cvsdist 38c29c3
-	register char *cp, *optstr;
cvsdist 38c29c3
-	register char *word;
cvsdist 38c29c3
+	char *cp, *optstr;
cvsdist 38c29c3
+	char *word;
cvsdist 38c29c3
 	MSGFACILITY *msgfac;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (msgstr == NULL)
Michal Luscon f5c9a76
@@ -302,7 +302,7 @@
cvsdist 38c29c3
 		if (doset) {
cvsdist 38c29c3
 			char *mcp;
cvsdist 38c29c3
 
cvsdist 38c29c3
-			if (mcp = setmsgtypes(msgfac, cp))
cvsdist 38c29c3
+			if ((mcp = setmsgtypes(msgfac, cp)))
cvsdist 38c29c3
 				return(mcp);
cvsdist 38c29c3
 		}
cvsdist 38c29c3
 	}
Michal Luscon f5c9a76
@@ -456,8 +456,9 @@
cvsdist 38c29c3
 		return;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!msgfac->mf_fptr) {
cvsdist 38c29c3
-		register char *cp;
cvsdist 38c29c3
+		char *cp;
cvsdist 38c29c3
 		char *getenv();
cvsdist 38c29c3
+		int fd;
cvsdist 38c29c3
 
cvsdist 38c29c3
 		/*
cvsdist 38c29c3
 		 * Create and open a new temporary file
Michal Luscon f5c9a76
@@ -469,7 +470,10 @@
cvsdist 38c29c3
 		(void) sprintf(tempfile, "%s/%s", cp, _RDIST_TMP);
cvsdist 38c29c3
 
cvsdist 38c29c3
 		msgfac->mf_filename = tempfile;
cvsdist 38c29c3
-		(void) mktemp(msgfac->mf_filename);
cvsdist 38c29c3
+		fd = mkstemp(msgfac->mf_filename);
cvsdist 38c29c3
+			if (fd < 0)
cvsdist 38c29c3
+				fatalerr("Cannot open notify file for writing: %s: %s.", msgfac->mf_filename, SYSERR);
cvsdist 38c29c3
+		close(fd);
cvsdist 38c29c3
 		if ((msgfac->mf_fptr = fopen(msgfac->mf_filename, "w"))==NULL)
cvsdist 38c29c3
 			fatalerr("Cannot open notify file for writing: %s: %s.",
cvsdist 38c29c3
 			      msgfac->mf_filename, SYSERR);
Michal Luscon f5c9a76
@@ -509,15 +513,15 @@
cvsdist 38c29c3
 	int flags;
cvsdist 38c29c3
 	char *msgbuf;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i, x;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	int i, x;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	static char mbuf[2048];
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (msgbuf && *msgbuf) {
cvsdist 38c29c3
 		/*
cvsdist 38c29c3
 		 * Ensure no stray newlines are present
cvsdist 38c29c3
 		 */
cvsdist 38c29c3
-		if (cp = strchr(msgbuf, '\n'))
cvsdist 38c29c3
+		if ((cp = strchr(msgbuf, '\n')))
cvsdist 38c29c3
 			*cp = CNULL;
cvsdist 38c29c3
 
cvsdist 38c29c3
 		checkhostname();
Michal Luscon f5c9a76
@@ -857,7 +861,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 extern char *getnotifyfile()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (i = 0; msgfacility[i].mf_name; i++)
cvsdist 38c29c3
 		if (msgfacility[i].mf_msgfac == MF_NOTIFY &&
cvsdist 38c29c3
--- rdist-6.1.5/src/setargs.c.cleanup	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/setargs.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: setargs.c,v 6.5 1998/11/10 04:15:56 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -60,12 +60,12 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Settup things for using setproctitle()
cvsdist 38c29c3
  */
cvsdist 38c29c3
-setargs_settup(argc, argv, envp)
cvsdist 38c29c3
+void setargs_settup(argc, argv, envp)
cvsdist 38c29c3
 	int			argc;
cvsdist 38c29c3
 	char		      **argv;
cvsdist 38c29c3
 	char		      **envp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int 		i;
cvsdist 38c29c3
+	int 		i;
cvsdist 38c29c3
 	extern char 	      **environ;
cvsdist 38c29c3
 
cvsdist 38c29c3
   	/* Remember the User Environment */
Michal Luscon f5c9a76
@@ -86,10 +86,10 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Set process title
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void _setproctitle(msg)
cvsdist 38c29c3
+void _setproctitle(msg)
cvsdist 38c29c3
         char *msg;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 	char *p;
cvsdist 38c29c3
 	
cvsdist 38c29c3
 	p = Argv[0];
Michal Luscon f5c9a76
@@ -113,7 +113,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Varargs front-end to _setproctitle()
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void setproctitle(va_alist)
cvsdist 38c29c3
+void setproctitle(va_alist)
cvsdist 38c29c3
 	va_dcl
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buf[BUFSIZ];
Michal Luscon f5c9a76
@@ -132,7 +132,7 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Stdarg front-end to _setproctitle()
cvsdist 38c29c3
  */
cvsdist 38c29c3
-extern void setproctitle(char *fmt, ...)
cvsdist 38c29c3
+void setproctitle(char *fmt, ...)
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buf[BUFSIZ];
cvsdist 38c29c3
 	va_list args;
Michal Luscon f5c9a76
@@ -149,7 +149,7 @@
cvsdist 38c29c3
  * Non-Varargs front-end to _setproctitle()
cvsdist 38c29c3
  */
cvsdist 38c29c3
 /*VARARGS1*/
cvsdist 38c29c3
-extern void setproctitle(fmt, a1, a2, a3, a4, a5, a6)
cvsdist 38c29c3
+void setproctitle(fmt, a1, a2, a3, a4, a5, a6)
cvsdist 38c29c3
 	char *fmt;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char buf[BUFSIZ];
cvsdist 38c29c3
--- rdist-6.1.5/src/rdistd.c.cleanup	1998-11-10 05:14:06.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/rdistd.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: rdistd.c,v 6.23 1998/11/10 04:14:06 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -47,21 +47,12 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 #include "defs.h"
cvsdist 38c29c3
 
cvsdist 38c29c3
-/*
cvsdist 38c29c3
- * Print usage message
cvsdist 38c29c3
- */
cvsdist 38c29c3
-static void usage()
cvsdist 38c29c3
-{
cvsdist 38c29c3
-	fprintf(stderr, "usage: %s -S [ -DV ]\n", progname);
cvsdist 38c29c3
-	exit(1);
cvsdist 38c29c3
-}
cvsdist 38c29c3
-
cvsdist 38c29c3
 char	localmsglist[] = "syslog=ferror";
cvsdist 38c29c3
 
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * The Beginning
cvsdist 38c29c3
  */
cvsdist 38c29c3
-main(argc, argv, envp)
cvsdist 38c29c3
+int main(argc, argv, envp)
cvsdist 38c29c3
 	int argc;
cvsdist 38c29c3
 	char **argv;
cvsdist 38c29c3
 	char **envp;
Michal Luscon f5c9a76
@@ -89,7 +80,8 @@
cvsdist 38c29c3
 		case '?':
cvsdist 38c29c3
 		default:
cvsdist 38c29c3
 			error("Bad command line option.");
cvsdist 38c29c3
-			usage();
cvsdist 38c29c3
+			fprintf(stderr, "usage: %s -S [ -DV ]\n", progname);
cvsdist 38c29c3
+			exit(1);
cvsdist 38c29c3
 		}
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (!isserver) {
Michal Luscon f5c9a76
@@ -102,7 +94,7 @@
cvsdist 38c29c3
 	rem_w = fileno(stdout);
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/* Set logging */
cvsdist 38c29c3
-	if (cp = msgparseopts(localmsglist, TRUE))
cvsdist 38c29c3
+	if ((cp = msgparseopts(localmsglist, TRUE)))
cvsdist 38c29c3
 		fatalerr("Bad message logging option (%s): %s", 
cvsdist 38c29c3
 			 localmsglist, cp);
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/server.c.cleanup	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/server.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -31,7 +31,7 @@
cvsdist 38c29c3
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: server.c,v 6.86 1998/11/10 04:15:31 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -191,7 +191,7 @@
cvsdist 38c29c3
 	static UID_T last_uid = (UID_T)-2;
cvsdist 38c29c3
 	static GID_T last_primegid;
cvsdist 38c29c3
 	extern char *locuser;
cvsdist 38c29c3
-	register int i;
cvsdist 38c29c3
+	int i;
cvsdist 38c29c3
 	UID_T uid;
cvsdist 38c29c3
 	GID_T gid;
cvsdist 38c29c3
 	GID_T primegid = (GID_T)-2;
Michal Luscon f5c9a76
@@ -246,7 +246,7 @@
cvsdist 38c29c3
 	        /*
cvsdist 38c29c3
 		 * Invalid cached values so we need to do a new lookup.
cvsdist 38c29c3
 		 */
cvsdist 38c29c3
-		if (gr = mygetgroup(group)) {
cvsdist 38c29c3
+		if ((gr = mygetgroup(group))) {
cvsdist 38c29c3
 			last_gid = gid = gr->gr_gid;
cvsdist 38c29c3
 			strcpy(last_group, gr->gr_name);
cvsdist 38c29c3
 		} else {
Michal Luscon f5c9a76
@@ -319,7 +319,7 @@
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	DIR *d;
cvsdist 38c29c3
 	static DIRENTRY *dp;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	char *optarget;
cvsdist 38c29c3
 	int len, failures = 0;
Michal Luscon f5c9a76
@@ -356,7 +356,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 	optarget = ptarget;
cvsdist 38c29c3
 	len = ptarget - target;
cvsdist 38c29c3
-	while (dp = readdir(d)) {
cvsdist 38c29c3
+	while ((dp = readdir(d))) {
cvsdist 38c29c3
 		if ((D_NAMLEN(dp) == 1 && dp->d_name[0] == '.') ||
cvsdist 38c29c3
 		    (D_NAMLEN(dp) == 2 && dp->d_name[0] == '.' &&
cvsdist 38c29c3
 		     dp->d_name[1] == '.'))
Michal Luscon f5c9a76
@@ -370,7 +370,7 @@
cvsdist 38c29c3
 		ptarget = optarget;
cvsdist 38c29c3
 		*ptarget++ = '/';
cvsdist 38c29c3
 		cp = dp->d_name;;
cvsdist 38c29c3
-		while (*ptarget++ = *cp++)
cvsdist 38c29c3
+		while ((*ptarget++ = *cp++))
cvsdist 38c29c3
 			;
cvsdist 38c29c3
 		ptarget--;
cvsdist 38c29c3
 		if (lstat(target, &stb) < 0) {
Michal Luscon f5c9a76
@@ -408,10 +408,10 @@
cvsdist 38c29c3
  * for extraneous files and remove them.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void doclean(cp)
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	DIR *d;
cvsdist 38c29c3
-	register DIRENTRY *dp;
cvsdist 38c29c3
+	DIRENTRY *dp;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	char *optarget, *ep;
cvsdist 38c29c3
 	int len;
Michal Luscon f5c9a76
@@ -430,7 +430,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 	optarget = ptarget;
cvsdist 38c29c3
 	len = ptarget - target;
cvsdist 38c29c3
-	while (dp = readdir(d)) {
cvsdist 38c29c3
+	while ((dp = readdir(d))) {
cvsdist 38c29c3
 		if ((D_NAMLEN(dp) == 1 && dp->d_name[0] == '.') ||
cvsdist 38c29c3
 		    (D_NAMLEN(dp) == 2 && dp->d_name[0] == '.' &&
cvsdist 38c29c3
 		     dp->d_name[1] == '.'))
Michal Luscon f5c9a76
@@ -444,7 +444,7 @@
cvsdist 38c29c3
 		ptarget = optarget;
cvsdist 38c29c3
 		*ptarget++ = '/';
cvsdist 38c29c3
 		cp = dp->d_name;;
cvsdist 38c29c3
-		while (*ptarget++ = *cp++)
cvsdist 38c29c3
+		while ((*ptarget++ = *cp++))
cvsdist 38c29c3
 			;
cvsdist 38c29c3
 		ptarget--;
cvsdist 38c29c3
 		if (lstat(target, &stb) < 0) {
Michal Luscon f5c9a76
@@ -475,7 +475,7 @@
cvsdist 38c29c3
  * Frontend to doclean().
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void clean(cp)
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	doclean(cp);
cvsdist 38c29c3
 	(void) sendcmd(CC_END, NULL);
Michal Luscon f5c9a76
@@ -503,7 +503,7 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static void docmdspecial()
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	char *cmd, *env = NULL;
cvsdist 38c29c3
 	int n;
cvsdist 38c29c3
 	int len;
Michal Luscon f5c9a76
@@ -661,7 +661,7 @@
cvsdist 38c29c3
 	char *name;
cvsdist 38c29c3
 	opt_t opts;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	int r = -1;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -754,7 +754,7 @@
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	int f, wrerr, olderrno, lastwashole = 0, wassparse = 0;
cvsdist 38c29c3
 	off_t i;
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	char *savefile = NULL;
cvsdist 38c29c3
 	static struct stat statbuff;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -981,7 +981,7 @@
cvsdist 38c29c3
 	char *owner, *group;
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char lowner[100], lgroup[100];
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
 	struct stat stb;
cvsdist 38c29c3
 	int s;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -1038,7 +1038,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 				o = (owner[0] == ':') ? opts & DO_NUMCHKOWNER :
cvsdist 38c29c3
 					opts;
cvsdist 38c29c3
-				if (cp = getusername(stb.st_uid, target, o))
cvsdist 38c29c3
+				if ((cp = getusername(stb.st_uid, target, o)))
cvsdist 38c29c3
 					if (strcmp(owner, cp))
cvsdist 38c29c3
 						(void) strcpy(lowner, cp);
cvsdist 38c29c3
 			}
Michal Luscon f5c9a76
@@ -1047,7 +1047,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 				o = (group[0] == ':') ? opts & DO_NUMCHKGROUP :
cvsdist 38c29c3
 					opts;
cvsdist 38c29c3
-				if (cp = getgroupname(stb.st_gid, target, o))
cvsdist 38c29c3
+				if ((cp = getgroupname(stb.st_gid, target, o)))
cvsdist 38c29c3
 					if (strcmp(group, cp))
cvsdist 38c29c3
 						(void) strcpy(lgroup, cp);
cvsdist 38c29c3
 			}
Michal Luscon f5c9a76
@@ -1101,8 +1101,8 @@
cvsdist 38c29c3
 	if (s < 0) {
cvsdist 38c29c3
 		if (errno == ENOENT) {
cvsdist 38c29c3
 			if (mkdir(target, mode) == 0 ||
cvsdist 38c29c3
-			    chkparent(target, opts) == 0 && 
cvsdist 38c29c3
-			    mkdir(target, mode) == 0) {
cvsdist 38c29c3
+			    (chkparent(target, opts) == 0 && 
cvsdist 38c29c3
+			     mkdir(target, mode) == 0)) {
cvsdist 38c29c3
 				message(MT_NOTICE, "%s: mkdir", target);
cvsdist 38c29c3
 				(void) fchog(-1, target, owner, group, mode);
cvsdist 38c29c3
 				ack();
Michal Luscon f5c9a76
@@ -1298,7 +1298,7 @@
cvsdist 38c29c3
 static void setconfig(cmd)
cvsdist 38c29c3
 	char *cmd;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cp = cmd;
cvsdist 38c29c3
+	char *cp = cmd;
cvsdist 38c29c3
 	char *estr;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	switch (*cp++) {
Michal Luscon f5c9a76
@@ -1332,7 +1332,7 @@
cvsdist 38c29c3
 		break;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	case SC_LOGGING:	/* Logging options */
cvsdist 38c29c3
-		if (estr = msgparseopts(cp, TRUE)) {
cvsdist 38c29c3
+		if ((estr = msgparseopts(cp, TRUE))) {
cvsdist 38c29c3
 			fatalerr("Bad message option string (%s): %s", 
cvsdist 38c29c3
 				 cp, estr);
cvsdist 38c29c3
 			return;
Michal Luscon f5c9a76
@@ -1449,7 +1449,7 @@
cvsdist 38c29c3
 		sptarget[catname] = ptarget;
cvsdist 38c29c3
 		if (catname++) {
cvsdist 38c29c3
 			*ptarget++ = '/';
cvsdist 38c29c3
-			while (*ptarget++ = *file++)
cvsdist 38c29c3
+			while ((*ptarget++ = *file++))
cvsdist 38c29c3
 			    ;
cvsdist 38c29c3
 			ptarget--;
cvsdist 38c29c3
 		}
Michal Luscon f5c9a76
@@ -1457,6 +1457,7 @@
cvsdist 38c29c3
 		/*
cvsdist 38c29c3
 		 * Create name of temporary file
cvsdist 38c29c3
 		 */
cvsdist 38c29c3
+		int fd;
cvsdist 38c29c3
 		if (catname && cattarget(file) < 0) {
cvsdist 38c29c3
 			error("Cannot set file name.");
cvsdist 38c29c3
 			return;
Michal Luscon f5c9a76
@@ -1471,7 +1472,12 @@
cvsdist 38c29c3
 			(void) sprintf(new, "%s/%s", target, tempname);
cvsdist 38c29c3
 			*file = '/';
cvsdist 38c29c3
 		}
cvsdist 38c29c3
-		(void) mktemp(new);
cvsdist 38c29c3
+		fd = mkstemp(new);
cvsdist 38c29c3
+		if (fd < 0) {
cvsdist 38c29c3
+			error("Cannot set file name.");
cvsdist 38c29c3
+			return;
cvsdist 38c29c3
+		}
cvsdist 38c29c3
+		close(fd);
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/*
Michal Luscon f5c9a76
@@ -1575,8 +1581,8 @@
cvsdist 38c29c3
 extern void server()
cvsdist 38c29c3
 {
cvsdist 38c29c3
 	static char cmdbuf[BUFSIZ];
cvsdist 38c29c3
-	register char *cp;
cvsdist 38c29c3
-	register int n;
cvsdist 38c29c3
+	char *cp;
cvsdist 38c29c3
+	int n;
cvsdist 38c29c3
 	extern jmp_buf finish_jmpbuf;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (setjmp(finish_jmpbuf)) {
cvsdist 38c29c3
--- rdist-6.1.5/src/filesys.c.cleanup	1998-11-10 05:10:18.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/filesys.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: filesys.c,v 6.25 1998/11/10 04:10:17 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -66,7 +66,7 @@
cvsdist 38c29c3
 	static char last_pathname[MAXPATHLEN];
cvsdist 38c29c3
 	static char file[MAXPATHLEN + 3];
cvsdist 38c29c3
 	static struct stat filestat;
cvsdist 38c29c3
-	register char *p;
cvsdist 38c29c3
+	char *p;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * Mark the statbuf as invalid to start with.
Michal Luscon f5c9a76
@@ -119,7 +119,7 @@
cvsdist 38c29c3
 			 * Normally we want to change /dir1/dir2/file
cvsdist 38c29c3
 			 * into "/dir1/dir2/."
cvsdist 38c29c3
 			 */
cvsdist 38c29c3
-			if (p = (char *) strrchr(file, '/')) {
cvsdist 38c29c3
+			if ((p = (char *) strrchr(file, '/'))) {
cvsdist 38c29c3
 				*++p = '.';
cvsdist 38c29c3
 				*++p = CNULL;
cvsdist 38c29c3
 			} else {
Michal Luscon f5c9a76
@@ -177,7 +177,7 @@
cvsdist 38c29c3
 	struct stat *filest;
cvsdist 38c29c3
 	struct mntinfo *mntinfo;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct mntinfo *mi;
cvsdist 38c29c3
+	struct mntinfo *mi;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (mi = mntinfo; mi; mi = mi->mi_nxt) {
cvsdist 38c29c3
 		if (mi->mi_mnt->me_flags & MEFLAG_IGNORE)
Michal Luscon f5c9a76
@@ -196,7 +196,7 @@
cvsdist 38c29c3
 	mntent_t *mnt;
cvsdist 38c29c3
 	struct mntinfo *mntinfo;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register struct mntinfo *m;
cvsdist 38c29c3
+	struct mntinfo *m;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (m = mntinfo; m; m = m->mi_nxt)
cvsdist 38c29c3
 		if (strcmp(m->mi_mnt->me_path, mnt->me_path) == 0)
Michal Luscon f5c9a76
@@ -241,7 +241,7 @@
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 
cvsdist 38c29c3
 	mntinfo = mi;
cvsdist 38c29c3
-	while (mnt = getmountent(mfp)) {
cvsdist 38c29c3
+	while ((mnt = getmountent(mfp))) {
cvsdist 38c29c3
 		debugmsg(DM_MISC, "mountent = '%s' (%s)", 
cvsdist 38c29c3
 			 mnt->me_path, mnt->me_type);
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -302,7 +302,7 @@
cvsdist 38c29c3
 	static struct stat filestat;
cvsdist 38c29c3
 	struct stat *pstat;
cvsdist 38c29c3
 	struct mntinfo *tmpmi;
cvsdist 38c29c3
-	register mntent_t *mnt;
cvsdist 38c29c3
+	mntent_t *mnt;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * Use the supplied stat buffer if not NULL or our own.
Michal Luscon f5c9a76
@@ -324,16 +324,16 @@
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * Find the mnt that pathname is on.
cvsdist 38c29c3
 	 */
cvsdist 38c29c3
-	if (mnt = findmnt(pstat, mntinfo))
cvsdist 38c29c3
+	if ((mnt = findmnt(pstat, mntinfo)))
cvsdist 38c29c3
 		return(mnt);
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * We failed to find correct mnt, so maybe it's a newly
cvsdist 38c29c3
 	 * mounted filesystem.  We rebuild mntinfo and try again.
cvsdist 38c29c3
 	 */
cvsdist 38c29c3
-	if (tmpmi = makemntinfo(mntinfo)) {
cvsdist 38c29c3
+	if ((tmpmi = makemntinfo(mntinfo))) {
cvsdist 38c29c3
 		mntinfo = tmpmi;
cvsdist 38c29c3
-		if (mnt = findmnt(pstat, mntinfo))
cvsdist 38c29c3
+		if ((mnt = findmnt(pstat, mntinfo)))
cvsdist 38c29c3
 			return(mnt);
cvsdist 38c29c3
 	}
cvsdist 38c29c3
 
cvsdist 38c29c3
--- rdist-6.1.5/src/filesys-os.c.cleanup	1998-11-10 05:09:59.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/filesys-os.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -32,7 +32,7 @@
cvsdist 38c29c3
  * SUCH DAMAGE.
cvsdist 38c29c3
  */
cvsdist 38c29c3
 
cvsdist 38c29c3
-#ifndef lint
cvsdist 38c29c3
+#if 0
cvsdist 38c29c3
 static char RCSid[] = 
cvsdist 38c29c3
 "$Id: filesys-os.c,v 6.18 1998/11/10 04:09:58 mcooper Exp $";
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -308,7 +308,7 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 	bzero((char *)&me, sizeof(mntent_t));
cvsdist 38c29c3
 
cvsdist 38c29c3
-	if (mntent = getmntent(fptr)) {
cvsdist 38c29c3
+	if ((mntent = getmntent(fptr))) {
cvsdist 38c29c3
 		me.me_path = mntent->mnt_dir;
cvsdist 38c29c3
 		me.me_type = mntent->mnt_type;
cvsdist 38c29c3
 		if (mntent->mnt_opts && hasmntopt(mntent, MNTOPT_RO))
cvsdist 38c29c3
--- rdist-6.1.5/src/strcasecmp.c.cleanup	1998-11-10 05:16:52.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/strcasecmp.c	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -70,9 +70,9 @@
cvsdist 38c29c3
 };
cvsdist 38c29c3
 
cvsdist 38c29c3
 strcasecmp(s1, s2)
cvsdist 38c29c3
-	register char *s1, *s2;
cvsdist 38c29c3
+	char *s1, *s2;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cm = charmap;
cvsdist 38c29c3
+	char *cm = charmap;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	while (cm[*s1] == cm[*s2++])
cvsdist 38c29c3
 		if (*s1++ == '\0')
Michal Luscon f5c9a76
@@ -81,10 +81,10 @@
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
 strncasecmp(s1, s2, n)
cvsdist 38c29c3
-	register char *s1, *s2;
cvsdist 38c29c3
-	register int n;
cvsdist 38c29c3
+	char *s1, *s2;
cvsdist 38c29c3
+	int n;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *cm = charmap;
cvsdist 38c29c3
+	char *cm = charmap;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	while (--n >= 0 && cm[*s1] == cm[*s2++])
cvsdist 38c29c3
 		if (*s1++ == '\0')
cvsdist 38c29c3
--- rdist-6.1.5/src/strtol.c.cleanup	1994-03-17 00:25:50.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/strtol.c	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
@@ -54,13 +54,13 @@
cvsdist 38c29c3
 strtol(nptr, endptr, base)
cvsdist 38c29c3
 	char *nptr;
cvsdist 38c29c3
 	char **endptr;
cvsdist 38c29c3
-	register int base;
cvsdist 38c29c3
+	int base;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char *s = nptr;
cvsdist 38c29c3
-	register unsigned long acc;
cvsdist 38c29c3
-	register int c;
cvsdist 38c29c3
-	register unsigned long cutoff;
cvsdist 38c29c3
-	register int neg = 0, any, cutlim;
cvsdist 38c29c3
+	char *s = nptr;
cvsdist 38c29c3
+	unsigned long acc;
cvsdist 38c29c3
+	int c;
cvsdist 38c29c3
+	unsigned long cutoff;
cvsdist 38c29c3
+	int neg = 0, any, cutlim;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	/*
cvsdist 38c29c3
 	 * Skip white space and pick up leading +/- sign if any.
cvsdist 38c29c3
--- rdist-6.1.5/src/regex.c.cleanup	1998-11-10 05:14:28.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/src/regex.c	2003-12-17 11:39:14.000000000 +0100
Michal Luscon f5c9a76
@@ -136,10 +136,8 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 char *
cvsdist 38c29c3
 re_comp(sp)
cvsdist 38c29c3
-	register char	*sp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int	c;
cvsdist 38c29c3
-	register char	*ep = expbuf;
cvsdist 38c29c3
+	char	*ep = expbuf;
cvsdist 38c29c3
 	int	cclcnt, numbra = 0;
cvsdist 38c29c3
 	char	*lastep = 0;
cvsdist 38c29c3
 	char	bracket[NBRA];
Michal Luscon f5c9a76
@@ -260,10 +258,10 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 int
cvsdist 38c29c3
 re_exec(p1)
cvsdist 38c29c3
-	register char	*p1;
cvsdist 38c29c3
+	char	*p1;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char	*p2 = expbuf;
cvsdist 38c29c3
-	register int	c;
cvsdist 38c29c3
+	char	*p2 = expbuf;
cvsdist 38c29c3
+	int	c;
cvsdist 38c29c3
 	int	rv;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	for (c = 0; c < NBRA; c++) {
Michal Luscon f5c9a76
@@ -300,9 +298,9 @@
cvsdist 38c29c3
  */
cvsdist 38c29c3
 static	int
cvsdist 38c29c3
 advance(lp, ep)
cvsdist 38c29c3
-	register char	*lp, *ep;
cvsdist 38c29c3
+	char	*lp, *ep;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char	*curlp;
cvsdist 38c29c3
+	char	*curlp;
cvsdist 38c29c3
 	int	ct, i;
cvsdist 38c29c3
 	int	rv;
cvsdist 38c29c3
 
Michal Luscon f5c9a76
@@ -407,10 +405,10 @@
cvsdist 38c29c3
 }
cvsdist 38c29c3
 
cvsdist 38c29c3
 backref(i, lp)
cvsdist 38c29c3
-	register int	i;
cvsdist 38c29c3
-	register char	*lp;
cvsdist 38c29c3
+	int	i;
cvsdist 38c29c3
+	char	*lp;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register char	*bp;
cvsdist 38c29c3
+	char	*bp;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	bp = braslist[i];
cvsdist 38c29c3
 	while (*bp++ == *lp++)
Michal Luscon f5c9a76
@@ -421,10 +419,10 @@
cvsdist 38c29c3
 
cvsdist 38c29c3
 int
cvsdist 38c29c3
 cclass(set, c, af)
cvsdist 38c29c3
-	register char	*set, c;
cvsdist 38c29c3
+	char	*set, c;
cvsdist 38c29c3
 	int	af;
cvsdist 38c29c3
 {
cvsdist 38c29c3
-	register int	n;
cvsdist 38c29c3
+	int	n;
cvsdist 38c29c3
 
cvsdist 38c29c3
 	if (c == 0)
cvsdist 38c29c3
 		return(0);
cvsdist 38c29c3
--- rdist-6.1.5/include/defs.h.cleanup	2003-12-17 11:38:16.000000000 +0100
cvsdist 38c29c3
+++ rdist-6.1.5/include/defs.h	2003-12-17 11:38:16.000000000 +0100
Michal Luscon f5c9a76
@@ -49,11 +49,13 @@
cvsdist 38c29c3
 #include <grp.h>
cvsdist 38c29c3
 #include <syslog.h>
cvsdist 38c29c3
 #include <setjmp.h>
cvsdist 38c29c3
+#include <time.h>
cvsdist 38c29c3
 #include <sys/types.h>
cvsdist 38c29c3
 #include <sys/param.h>
cvsdist 38c29c3
 #include <sys/file.h>
cvsdist 38c29c3
-#include <sys/time.h>
cvsdist 38c29c3
 #include <sys/stat.h>
cvsdist 38c29c3
+#include <sys/wait.h>
cvsdist 38c29c3
+#include <sys/socket.h>
cvsdist 38c29c3
 
cvsdist 38c29c3
 #include "version.h"
cvsdist 38c29c3
 #include "config-def.h"
Michal Luscon f5c9a76
@@ -67,6 +69,9 @@
cvsdist 38c29c3
 #endif	/* yacc */
cvsdist 38c29c3
 
cvsdist 38c29c3
 #include <signal.h>
cvsdist 38c29c3
+#define _REGEX_RE_COMP
cvsdist 38c29c3
+#include <regex.h>
cvsdist 38c29c3
+
cvsdist 38c29c3
 
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * This belongs in os-svr4.h but many SVR4 OS's
Michal Luscon f5c9a76
@@ -340,12 +345,11 @@
cvsdist 38c29c3
 /*
cvsdist 38c29c3
  * Our own declarations.
cvsdist 38c29c3
  */
cvsdist 38c29c3
-char			       *exptilde();
cvsdist 38c29c3
 char			       *makestr();
cvsdist 38c29c3
 char	       		       *xcalloc();
cvsdist 38c29c3
 char	       		       *xmalloc();
cvsdist 38c29c3
 char	       		       *xrealloc();
cvsdist 38c29c3
-extern char		       *xbasename();
cvsdist 38c29c3
+extern char		       *exptilde();
cvsdist 38c29c3
 extern char		       *getdistoptlist();
cvsdist 38c29c3
 extern char		       *getgroupname();
cvsdist 38c29c3
 extern char		       *getnlstr();
Michal Luscon f5c9a76
@@ -355,44 +359,75 @@
cvsdist 38c29c3
 extern char		       *getversion();
cvsdist 38c29c3
 extern char		       *msgparseopts();
cvsdist 38c29c3
 extern char		       *searchpath();
cvsdist 38c29c3
+extern char		       *xbasename();
cvsdist 38c29c3
+extern int			amatch();
cvsdist 38c29c3
 extern int			any();
cvsdist 38c29c3
+extern int			becomeroot();
cvsdist 38c29c3
+extern int			becomeuser();
cvsdist 38c29c3
+extern int			except();
cvsdist 38c29c3
+extern int			execbrc();
cvsdist 38c29c3
+extern int			getfilesysinfo();
cvsdist 38c29c3
+extern int			getsocketpair();
cvsdist 38c29c3
 extern int			init();
cvsdist 38c29c3
 extern int			install();
cvsdist 38c29c3
 extern int			isexec();
cvsdist 38c29c3
+extern int			is_nfs_mounted();
cvsdist 38c29c3
+extern int			is_ro_mounted();
cvsdist 38c29c3
+extern int			is_symlinked();
cvsdist 38c29c3
+extern int			match();
cvsdist 38c29c3
+extern int			okname();
cvsdist 38c29c3
 extern int			parsedistopts();
cvsdist 38c29c3
+extern int			readrem();
cvsdist 38c29c3
 extern int			remline();
cvsdist 38c29c3
+extern int			response();
cvsdist 38c29c3
+extern int			rshrcmd();
cvsdist 38c29c3
 extern int			setfiletime();
cvsdist 38c29c3
+extern int			setnonblocking();
cvsdist 38c29c3
 extern int			spawn();
cvsdist 38c29c3
+extern int			yylex();
cvsdist 38c29c3
+extern int			yyparse();
cvsdist 38c29c3
 extern struct subcmd 	       *makesubcmd();
cvsdist 38c29c3
+extern void			append();
cvsdist 38c29c3
 extern void			checkhostname();
cvsdist 38c29c3
 extern void			cleanup();
cvsdist 38c29c3
 extern void			complain();
cvsdist 38c29c3
+extern void			coredump();
cvsdist 38c29c3
+extern void			define();
cvsdist 38c29c3
+extern void			docmdargs();
cvsdist 38c29c3
 extern void			docmds();
cvsdist 38c29c3
 extern void			finish();
cvsdist 38c29c3
-extern void			log();
cvsdist 38c29c3
+extern void			freelinkinfo();
cvsdist 38c29c3
+extern void			insert();
cvsdist 38c29c3
 extern void			logmsg();
cvsdist 38c29c3
 extern void			lostconn();
cvsdist 38c29c3
 extern void			markassigned();
cvsdist 38c29c3
+extern void			msgprconfig();
cvsdist 38c29c3
 extern void			msgprusage();
cvsdist 38c29c3
+extern void			mysetlinebuf();
cvsdist 38c29c3
 extern void			note();
cvsdist 38c29c3
 extern void			runcmdspecial();
cvsdist 38c29c3
 extern void			runcommand();
cvsdist 38c29c3
 extern void			server();
cvsdist 38c29c3
+extern void			setargs_settup();
cvsdist 38c29c3
 extern void			setprogname();
cvsdist 38c29c3
 extern void			sighandler();
cvsdist 38c29c3
+extern void			usage();
cvsdist 38c29c3
 extern void			waitup();
cvsdist 38c29c3
+extern void			yyerror();
cvsdist 38c29c3
+extern WRITE_RETURN_T		xwrite();
cvsdist 38c29c3
 struct namelist		       *expand();
cvsdist 38c29c3
 struct namelist		       *lookup();
cvsdist 38c29c3
 struct namelist		       *makenl();
cvsdist 38c29c3
-extern WRITE_RETURN_T		xwrite();
cvsdist 38c29c3
 
cvsdist 38c29c3
 #if	defined(ARG_TYPE) && ARG_TYPE == ARG_STDARG
cvsdist 38c29c3
+extern int			sendcmd(char cmd, char *fmt, ...);
cvsdist 38c29c3
 extern void			debugmsg(int, char *, ...);
cvsdist 38c29c3
 extern void			error(char *, ...);
cvsdist 38c29c3
 extern void			fatalerr(char *, ...);
cvsdist 38c29c3
 extern void			message(int, char *, ...);
cvsdist 38c29c3
 extern void			setproctitle(char *fmt, ...);
cvsdist 38c29c3
 #else
cvsdist 38c29c3
+extern int			sendcmd(va_alist);
cvsdist 38c29c3
 extern void			debugmsg();
cvsdist 38c29c3
 extern void			error();
cvsdist 38c29c3
 extern void			fatalerr();