Index: src/common.c
--- src/common.c.orig	2001-10-22 22:29:22.000000000 +0200
+++ src/common.c	2003-10-10 20:56:44.000000000 +0200
@@ -143,7 +143,7 @@
 /*
  * Set program name
  */
-extern void setprogname(argv)
+extern void rdist_setprogname(argv)
 	char **argv;
 {
 	register char *cp;
@@ -170,7 +170,7 @@
 	if (!isserver)
 		(void) signal(SIGSEGV, sighandler);
 
-	setprogname(argv);
+	rdist_setprogname(argv);
 
 	/*
 	 * Save a copy of our argc and argv before setargs() overwrites them
Index: src/rdist.c
--- src/rdist.c.orig	2001-10-22 22:29:22.000000000 +0200
+++ src/rdist.c	2003-10-10 20:56:57.000000000 +0200
@@ -138,7 +138,7 @@
 	 * We initialize progname here instead of init() because
 	 * things in msgparseopts() need progname set.
 	 */
-	setprogname(argv);
+	rdist_setprogname(argv);
 
 	if (cp = msgparseopts(localmsglist, TRUE)) {
 		error("Bad builtin log option (%s): %s.", 
Index: src/server.c
--- src/server.c.orig	2001-10-22 22:29:22.000000000 +0200
+++ src/server.c	2003-10-10 20:57:43.000000000 +0200
@@ -172,7 +172,7 @@
 /*
  * Set mode of a file
  */
-static int setmode(file, fd, mode, link)
+static int rdist_setmode(file, fd, mode, link)
 	char *file;
 	int fd;
 	int mode;
@@ -355,7 +355,7 @@
 			mode &= ~S_ISGID;
 		}
 	}
-	(void) setmode(file, fd, mode, S_ISLNK(st.st_mode));
+	(void) rdist_setmode(file, fd, mode, S_ISLNK(st.st_mode));
 
 	return(0);
 }
Index: src/filesys-os.c
--- src/filesys-os.c.orig	2001-10-22 22:29:22.000000000 +0200
+++ src/filesys-os.c	2003-10-10 21:04:52.000000000 +0200
@@ -211,6 +211,7 @@
 		mntstruct.me_flags |= MEFLAG_READONLY;
 #endif
 
+#ifdef MOUNT_NFS
 #if	FMT_TYPE == FMT_STATFS_STR && defined(HAVE_GETVFSBYNAME)
 	{
 	    /*
@@ -270,6 +271,16 @@
 		break;
 	}
 #endif	/* FMT_TYPE == FMT_STATFS_STR */
+#else
+   if ((((struct statfs*)mnt)->f_flags & MNT_LOCAL) == 0) {
+       (void) sprintf(remote_dev, "%s", mnt->f_mntfromname);
+       mntstruct.me_path = remote_dev;
+       mntstruct.me_type = METYPE_NFS;
+   } else {
+       mntstruct.me_path = mnt->f_mntonname;
+       mntstruct.me_type = METYPE_OTHER;
+   }
+#endif
 
 	mnt = (struct statfs*)(sizeof(struct statfs)+(ulong)mnt);
 	entries_left--;
Index: src/relsymlink.c
--- src/relsymlink.c.orig	2001-10-22 22:29:22.000000000 +0200
+++ src/relsymlink.c	2003-10-10 21:05:12.000000000 +0200
@@ -76,7 +76,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <sys/param.h>
 #include "defs.h"
 
Index: include/defs.h
--- include/defs.h.orig	2001-10-22 22:21:36.000000000 +0200
+++ include/defs.h	2003-10-10 20:57:12.000000000 +0200
@@ -333,7 +333,6 @@
 extern void			complain();
 extern void			docmds();
 extern void			finish();
-extern void			log();
 extern void			logmsg();
 extern void			lostconn();
 extern void			markassigned();
@@ -342,7 +341,7 @@
 extern void			runcmdspecial();
 extern void			runcommand();
 extern void			server();
-extern void			setprogname();
+extern void			rdist_setprogname();
 extern void			sighandler();
 extern void			waitup();
 struct namelist		       *expand();
Index: src/gram.y
--- src/gram.y.orig	2001-10-22 22:32:34 +0200
+++ src/gram.y	2007-12-22 16:33:40 +0100
@@ -116,10 +116,10 @@
 	struct namelist        *namel;
 }
 
-%type <optval> OPTION, options
-%type <string> NAME, STRING
-%type <subcmd> INSTALL, NOTIFY, EXCEPT, PATTERN, SPECIAL, CMDSPECIAL, cmdlist, cmd
-%type <namel> namelist, names, opt_namelist nlist
+%type <optval> OPTION options
+%type <string> NAME STRING
+%type <subcmd> INSTALL NOTIFY EXCEPT PATTERN SPECIAL CMDSPECIAL cmdlist cmd
+%type <namel> namelist names opt_namelist nlist
 
 %%
 
@@ -127,19 +127,19 @@
 		| file command
 		;
 
-command:	  NAME '=' namelist = {
+command:	  NAME '=' namelist {
 			(void) lookup($1, INSERT, $3);
 		}
-		| namelist ARROW namelist cmdlist = {
+		| namelist ARROW namelist cmdlist {
 			insert((char *)NULL, $1, $3, $4);
 		}
-		| NAME COLON namelist ARROW namelist cmdlist = {
+		| NAME COLON namelist ARROW namelist cmdlist {
 			insert($1, $3, $5, $6);
 		}
-		| namelist DCOLON NAME cmdlist = {
+		| namelist DCOLON NAME cmdlist {
 			append((char *)NULL, $1, $3, $4);
 		}
-		| NAME COLON namelist DCOLON NAME cmdlist = {
+		| NAME COLON namelist DCOLON NAME cmdlist {
 			append($1, $3, $5, $6);
 		}
 		| error
@@ -159,10 +159,10 @@
 		}
 		;
 
-nlist:	  NAME = {
+nlist:	  NAME {
 			$$ = makenl($1);
 		}
-		| '(' names ')' = {
+		| '(' names ')' {
 			$$ = $2;
 		}
 		;
@@ -170,7 +170,7 @@
 names:		  /* VOID */ {
 			$$ = last_n = NULL;
 		}
-		| names NAME = {
+		| names NAME {
 			if (last_n == NULL)
 				$$ = last_n = makenl($2);
 			else {
@@ -184,7 +184,7 @@
 cmdlist:	  /* VOID */ {
 			$$ = last_sc = NULL;
 		}
-		| cmdlist cmd = {
+		| cmdlist cmd {
 			if (last_sc == NULL)
 				$$ = last_sc = $2;
 			else {
@@ -195,7 +195,7 @@
 		}
 		;
 
-cmd:		  INSTALL options opt_namelist ';' = {
+cmd:		  INSTALL options opt_namelist ';' {
 			register struct namelist *nl;
 
 			$1->sc_options = $2 | options;
@@ -211,17 +211,17 @@
 			}
 			$$ = $1;
 		}
-		| NOTIFY namelist ';' = {
+		| NOTIFY namelist ';' {
 			if ($2 != NULL)
 				$1->sc_args = expand($2, E_VARS);
 			$$ = $1;
 		}
-		| EXCEPT namelist ';' = {
+		| EXCEPT namelist ';' {
 			if ($2 != NULL)
 				$1->sc_args = expand($2, E_ALL);
 			$$ = $1;
 		}
-		| PATTERN namelist ';' = {
+		| PATTERN namelist ';' {
 			struct namelist *nl;
 #if	defined(HAVE_POSIX_REGEX)
 #define ERRMSGSIZE 1000
@@ -251,13 +251,13 @@
 			$$ = $1;
 #endif  /* !HAVE_POSIX_REGEX */
 		}
-		| SPECIAL opt_namelist STRING ';' = {
+		| SPECIAL opt_namelist STRING ';' {
 			if ($2 != NULL)
 				$1->sc_args = expand($2, E_ALL);
 			$1->sc_name = $3;
 			$$ = $1;
 		}
-		| CMDSPECIAL opt_namelist STRING ';' = {
+		| CMDSPECIAL opt_namelist STRING ';' {
 			if ($2 != NULL)
 				$1->sc_args = expand($2, E_ALL);
 			$1->sc_name = $3;
@@ -265,18 +265,18 @@
 		}
 		;
 
-options:	  /* VOID */ = {
+options:	  /* VOID */ {
 			$$ = 0;
 		}
-		| options OPTION = {
+		| options OPTION {
 			$$ |= $2;
 		}
 		;
 
-opt_namelist:	  /* VOID */ = {
+opt_namelist:	  /* VOID */ {
 			$$ = NULL;
 		}
-		| namelist = {
+		| namelist {
 			$$ = $1;
 		}
 		;