--- config/config-data.h.orig	1998-11-10 03:59:47 UTC

+++ config/config-data.h

@@ -58,10 +58,10 @@ typedef 	struct dirent		DIRENTRY;

  * Set default write(2) return and amount types.

  */

 #if	!defined(WRITE_RETURN_T)

-#define		WRITE_RETURN_T		int	/* What write() returns */

+#define		WRITE_RETURN_T		ssize_t	/* What write() returns */

 #endif	/* WRITE_RETURN_T */

 #if	!defined(WRITE_AMT_T)

-#define		WRITE_AMT_T		int	/* Amount to write */

+#define		WRITE_AMT_T		size_t	/* Amount to write */

 #endif	/* WRITE_AMT_T */

 #endif	/* __configdata_h__ */

--- src/child.c.orig	1998-11-10 04:18:57 UTC

+++ src/child.c

@@ -189,7 +189,7 @@ static void readchild(child)

 	CHILD *child;

 {

 	char rbuf[BUFSIZ];

-	int amt;

+	ssize_t amt;

 	debugmsg(DM_CALL, "[readchild(%s, %d, %d) start]", 

 		 child->c_name, child->c_pid, child->c_readfd);

@@ -208,7 +208,7 @@ static void readchild(child)

 	 */

 	while ((amt = read(child->c_readfd, rbuf, sizeof(rbuf))) > 0) {

 		/* XXX remove these debug calls */

-		debugmsg(DM_MISC, "[readchild(%s, %d, %d) got %d bytes]", 

+		debugmsg(DM_MISC, "[readchild(%s, %d, %d) got %lld bytes]", 

 			 child->c_name, child->c_pid, child->c_readfd, amt);

 		(void) xwrite(fileno(stdout), rbuf, amt);

@@ -217,7 +217,7 @@ static void readchild(child)

 			 child->c_name, child->c_pid, child->c_readfd);

 	}

-	debugmsg(DM_MISC, "readchild(%s, %d, %d) done: amt = %d errno = %d\n",

+	debugmsg(DM_MISC, "readchild(%s, %d, %d) done: amt = %lld errno = %d\n",

 		 child->c_name, child->c_pid, child->c_readfd, amt, errno);

 	/* 

--- src/client.c.orig	1998-11-10 04:08:47 UTC

+++ src/client.c

@@ -356,16 +356,16 @@ static int sendhardlink(opts, lp, rname, destdir)

 		 rname, lp->pathname, lp->src, lp->target);

 	if (*lp->target == CNULL)

-		(void) sendcmd(C_RECVHARDLINK, "%o %s %s", 

-			       opts, lp->pathname, rname);

+		(void) sendcmd(C_RECVHARDLINK, "%o %d %s %s", 

+			       opts, strlen(lp->pathname), lp->pathname, rname);

 	else {

 		lname = buff;

 		strcpy(lname, remfilename(lp->src, lp->target, 

 					  lp->pathname, rname, 

 					  destdir));

 		debugmsg(DM_MISC, "sendhardlink: lname=%s\n", lname);

-		(void) sendcmd(C_RECVHARDLINK, "%o %s %s", 

-			       opts, lname, rname);

+		(void) sendcmd(C_RECVHARDLINK, "%o %d %s %s", 

+			       opts, strlen(lname), lname, rname);

 	}

 	return(response());

@@ -399,9 +399,9 @@ static int sendfile(rname, opts, stb, user, group, des

 	/*

 	 * Send file info

 	 */

-	(void) sendcmd(C_RECVREG, "%o %04o %ld %ld %ld %s %s %s", 

+	(void) sendcmd(C_RECVREG, "%o %04o %lld %ld %ld %s %s %s", 

 		       opts, stb->st_mode & 07777, 

-		       (long) stb->st_size, 

+		       (long long) stb->st_size, 

 		       stb->st_mtime, stb->st_atime,

 		       user, group, rname);

 	if (response() < 0) {

@@ -409,8 +409,8 @@ static int sendfile(rname, opts, stb, user, group, des

 		return(-1);

 	}

-	debugmsg(DM_MISC, "Send file '%s' %d bytes\n", 

-		 rname, (long) stb->st_size);

+	debugmsg(DM_MISC, "Send file '%s' %ld bytes\n", 

+		 rname, (long long) stb->st_size);

 	/*

 	 * Set remote time out alarm handler.

@@ -661,9 +661,9 @@ static int sendlink(rname, opts, stb, user, group, des

 	/*

 	 * Gather and send basic link info

 	 */

-	(void) sendcmd(C_RECVSYMLINK, "%o %04o %ld %ld %ld %s %s %s", 

+	(void) sendcmd(C_RECVSYMLINK, "%o %04o %lld %ld %ld %s %s %s", 

 		       opts, stb->st_mode & 07777, 

-		       (long) stb->st_size, 

+		       (long long) stb->st_size, 

 		       stb->st_mtime, stb->st_atime,

 		       user, group, rname);

 	if (response() < 0)

@@ -761,7 +761,7 @@ static int update(rname, opts, statp)

 	unsigned short rmode;

 	char *owner = NULL, *group = NULL;

 	int done, n;

-	u_char *cp;

+	char *cp;

 	debugmsg(DM_CALL, "update(%s, 0x%x, 0x%x)\n", rname, opts, statp);

@@ -843,7 +843,7 @@ static int update(rname, opts, statp)

 	/*

 	 * Parse size

 	 */

-	size = strtol(cp, &cp, 10);

+	size = strtoll(cp, &cp, 10);

 	if (*cp++ != ' ') {

 		error("update: size not delimited");

 		return(US_NOTHING);

@@ -895,8 +895,8 @@ static int update(rname, opts, statp)

 	debugmsg(DM_MISC, "update(%s,) local mode %04o remote mode %04o\n", 

 		 rname, lmode, rmode);

-	debugmsg(DM_MISC, "update(%s,) size %d mtime %d owner '%s' grp '%s'\n",

-		 rname, (int) size, mtime, owner, group);

+	debugmsg(DM_MISC, "update(%s,) size %lld mtime %d owner '%s' grp '%s'\n",

+		 rname, (long long) size, mtime, owner, group);

 	if (statp->st_mtime != mtime) {

 		if (statp->st_mtime < mtime && IS_ON(opts, DO_YOUNGER)) {

@@ -922,8 +922,8 @@ static int update(rname, opts, statp)

 	}

 	if (statp->st_size != size) {

-		debugmsg(DM_MISC, "size does not match (%d != %d).\n",

-			 (int) statp->st_size, size);

+		debugmsg(DM_MISC, "size does not match (%lld != %lld).\n",

+			 (long long) statp->st_size, (long long)size);

 		return(US_OUTDATE);

 	} 

--- src/common.c.orig	1998-11-10 04:09:01 UTC

+++ src/common.c

@@ -108,21 +108,6 @@ extern WRITE_RETURN_T xwrite(fd, buf, len)

 }

 /*

- * Set program name

- */

-extern void setprogname(argv)

-	char **argv;

-{

-	register char *cp;

-

-	if (!progname) {

-		progname = strdup(argv[0]);

-		if (cp = strrchr(progname, '/'))

-			progname = cp + 1;

-	}

-}

-

-/*

  * Do run-time initialization

  */

 extern int init(argc, argv, envp)

@@ -137,7 +122,8 @@ extern int init(argc, argv, envp)

 	if (!isserver)

 		(void) signal(SIGSEGV, sighandler);

-	setprogname(argv);

+	if (progname == NULL)

+		progname = basename(argv[0]);

 	/*

 	 * Save a copy of our argc and argv before setargs() overwrites them

@@ -393,14 +379,14 @@ extern int sendcmd(cmd, fmt, a1, a2, a3, a4, a5, a6, a

  */

 static u_char rembuf[BUFSIZ];

 static u_char *remptr;

-static int remleft;

+static ssize_t remleft;

 #define remc() (--remleft < 0 ? remmore() : *remptr++)

 /*

  * Back end to remote read()

  */

-static int remread(fd, buf, bufsiz)

+static ssize_t remread(fd, buf, bufsiz)

 	int fd;

 	u_char *buf;

 	int bufsiz;

@@ -494,7 +480,7 @@ extern int remline(buffer, space, doclean)

 /*

  * Non-line-oriented remote read.

  */

-readrem(p, space)

+ssize_t readrem(p, space)

 	char *p;

 	register int space;

 {

@@ -892,7 +878,7 @@ char *xmalloc(amt)

 	extern POINTER *malloc();

 	if ((ptr = (char *)malloc(amt)) == NULL)

-		fatalerr("Cannot malloc %d bytes of memory.", amt);

+		fatalerr("Cannot malloc %zu bytes of memory.", amt);

 	return(ptr);

 }

@@ -908,7 +894,7 @@ char *xrealloc(baseptr, amt)

 	extern POINTER *realloc();

 	if ((new = (char *)realloc(baseptr, amt)) == NULL)

-		fatalerr("Cannot realloc %d bytes of memory.", amt);

+		fatalerr("Cannot realloc %zu bytes of memory.", amt);

 	return(new);

 }

@@ -924,7 +910,7 @@ char *xcalloc(num, esize)

 	extern POINTER *calloc();

 	if ((ptr = (char *)calloc(num, esize)) == NULL)

-		fatalerr("Cannot calloc %d * %d = %d bytes of memory.",

+		fatalerr("Cannot calloc %zu * %zu = %zu bytes of memory.",

 		      num, esize, num * esize);

 	return(ptr);

 	entries_left--;

--- src/filesys.c.orig	1998-11-10 04:10:18 UTC

+++ src/filesys.c

@@ -430,8 +430,8 @@ int is_symlinked(path, statbuf, isvalid)

  */

 int getfilesysinfo(file, freespace, freefiles)

 	char *file;

-	long *freespace;

-	long *freefiles;

+	int64_t *freespace;

+	int64_t *freefiles;

 {

 #if	defined(STATFS_TYPE)

 	static statfs_t statfsbuf;

--- src/message.c.orig	1998-11-10 04:13:30 UTC

+++ src/message.c

@@ -462,8 +462,8 @@ static void msgsendnotify(msgfac, mtype, flags, msgbuf

 		return;

 	if (!msgfac->mf_fptr) {

-		register char *cp;

-		char *getenv();

+		const char *cp;

+		int	fd;

 		/*

 		 * Create and open a new temporary file

@@ -475,8 +475,8 @@ static void msgsendnotify(msgfac, mtype, flags, msgbuf

 		(void) sprintf(tempfile, "%s/%s", cp, _RDIST_TMP);

 		msgfac->mf_filename = tempfile;

-		(void) mktemp(msgfac->mf_filename);

-		if ((msgfac->mf_fptr = fopen(msgfac->mf_filename, "w"))==NULL)

+		fd = mkstemp(tempfile);

+		if (fd == -1 || (msgfac->mf_fptr = fdopen(fd, "w"))==NULL)

 			fatalerr("Cannot open notify file for writing: %s: %s.",

 			      msgfac->mf_filename, SYSERR);

 		debugmsg(DM_MISC, "Created notify temp file '%s'",

@@ -513,7 +513,7 @@ extern void checkhostname()

  */

 static void _message(flags, msgbuf)

 	int flags;

-	char *msgbuf;

+	const char *msgbuf;

 {

 	register int i, x;

 	register char *cp;

--- src/rdist.c.orig	1998-11-10 04:13:50 UTC

+++ src/rdist.c

@@ -62,8 +62,8 @@ static char copyright[] =

 char   	       *distfile = NULL;		/* Name of distfile to use */

 int     	maxchildren = MAXCHILDREN;	/* Max no of concurrent PIDs */

 int		nflag = 0;			/* Say without doing */

-long		min_freespace = 0;		/* Min filesys free space */

-long		min_freefiles = 0;		/* Min filesys free # files */

+int64_t		min_freespace = 0;		/* Min filesys free space */

+int64_t		min_freefiles = 0;		/* Min filesys free # files */

 FILE   	       *fin = NULL;			/* Input file pointer */

 struct group   *gr = NULL;			/* Static area for getgrent */

 char		localmsglist[] = "stdout=all:notify=all:syslog=nerror,ferror";

@@ -107,12 +107,13 @@ main(argc, argv, envp)

 	register char *cp;

 	int cmdargs = 0;

 	int c;

+	const char *errstr;

 	/*

 	 * We initialize progname here instead of init() because

 	 * things in msgparseopts() need progname set.

 	 */

-	setprogname(argv);

+	progname = basename(argv[0]);

 	if (cp = msgparseopts(localmsglist, TRUE)) {

 		error("Bad builtin log option (%s): %s.", 

@@ -176,10 +177,20 @@ main(argc, argv, envp)

 				error("\"%s\" is not a number.", optarg);

 				usage();

 			}

-			if (c == 'a')

-				min_freespace = atoi(optarg);

-			else if (c == 'A')

-				min_freefiles = atoi(optarg);

+			if (c == 'a') {

+				min_freespace = (int64_t)strtonum(optarg,

+					0, LLONG_MAX, &errstr);

+				if (errstr)

+					fatalerr("Minimum free space is %s: "

+						 "'%s'", errstr, optarg);

+			}

+			else if (c == 'A') {

+				min_freefiles = (int64_t)strtonum(optarg,

+					0, LLONG_MAX, &errstr);

+				if (errstr)

+					fatalerr("Minimum free files is %s: "

+						 "'%s'", errstr, optarg);

+			}

 			else if (c == 'M')

 				maxchildren = atoi(optarg);

 			else if (c == 't')

 		}

--- src/server.c.orig	1998-11-10 04:15:31 UTC

+++ src/server.c

@@ -62,8 +62,8 @@ char	*ptarget;		/* pointer to end of target name */

 int	catname = 0;		/* cat name to target name */

 char	*sptarget[32];		/* stack of saved ptarget's for directories */

 char   *fromhost = NULL;	/* Client hostname */

-static long min_freespace = 0;	/* Minimium free space on a filesystem */

-static long min_freefiles = 0;	/* Minimium free # files on a filesystem */

+static int64_t min_freespace = 0; /* Minimium free space on a filesystem */

+static int64_t min_freefiles = 0; /* Minimium free # files on a filesystem */

 int	oumask;			/* Old umask */

 /*

@@ -645,8 +645,8 @@ static void query(name)

 	case S_IFLNK:

 	case S_IFDIR:

 	case S_IFREG:

-		(void) sendcmd(QC_YES, "%ld %ld %o %s %s",

-			       (long) stb.st_size, 

+		(void) sendcmd(QC_YES, "%lld %ld %o %s %s",

+			       (long long) stb.st_size, 

 			       stb.st_mtime, 

 			       stb.st_mode & 07777,

 			       getusername(stb.st_uid, target, options), 

@@ -767,9 +767,9 @@ static void recvfile(new, opts, mode, owner, group, mt

 	/*

 	 * Create temporary file

 	 */

-	if ((f = creat(new, mode)) < 0) {

+	if ((f = open(new, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, mode)) < 0) {

 		if (errno != ENOENT || chkparent(new, opts) < 0 ||

-		    (f = creat(new, mode)) < 0) {

+		    (f = open(new, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, mode)) < 0) {

 			error("%s: create failed: %s", new, SYSERR);

 			(void) unlink(new);

 			return;

@@ -783,13 +783,13 @@ static void recvfile(new, opts, mode, owner, group, mt

 	wrerr = 0;

 	olderrno = 0;

 	for (i = 0; i < size; i += BUFSIZ) {

-		int amt = BUFSIZ;

+		off_t amt = BUFSIZ;

 		cp = buf;

 		if (i + amt > size)

 			amt = size - i;

 		do {

-			int j;

+			ssize_t j;

 			j = readrem(cp, amt);

 			if (j <= 0) {

@@ -1245,18 +1245,35 @@ static void hardlink(cmd)

 		return;

 	}

-	oldname = strtok(cp, " ");

-	if (oldname == NULL) {

-		error("hardlink: oldname name not delimited");

-		return;

-	}

+{ unsigned int len;

-	newname = strtok((char *)NULL, " ");

-	if (newname == NULL) {

-		error("hardlink: new name not specified");

-		return;

-	}

+  if( *( cp += strspn( cp, " " ) ) == '\0' ) {

+    error("hardlink: oldnamelen name not found");

+    return;

+  }

+  len = strtoul( cp, &cp, 10 );

+

+  if( *( cp += strspn( cp, " " ) ) == '\0' ) {

+    error("hardlink: oldname not found");

+    return;

+  }

+  oldname = cp;

+  if( strlen( cp ) < len + 2 ) {

+    error("hardlink: oldname too short or nothing following found");

+    return;

+  }

+  cp += len;

+  *cp++ = '\0';

+

+  if( *( cp += strspn( cp, " " ) ) == '\0' ) {

+    error("hardlink: newname not found");

+    return;

+  }

+

+  newname = cp;

+}

+

 	if (exptilde(expbuf, oldname) == NULL) {

 		error("hardlink: tilde expansion failed");

 		return;

@@ -1306,6 +1323,7 @@ static void setconfig(cmd)

 {

 	register char *cp = cmd;

 	char *estr;

+	const char *errstr;

 	switch (*cp++) {

 	case SC_HOSTNAME:	/* Set hostname */

@@ -1322,19 +1340,15 @@ static void setconfig(cmd)

 		break;

 	case SC_FREESPACE: 	/* Minimium free space */

-		if (!isdigit(*cp)) {

-			fatalerr("Expected digit, got '%s'.", cp);

-			return;

-		}

-		min_freespace = (unsigned long) atoi(cp);

+		min_freespace = (int64_t)strtonum(cp, 0, LLONG_MAX, &errstr);

+		if (errstr)

+			fatalerr("Minimum free space is %s: '%s'", errstr, optarg);

 		break;

 	case SC_FREEFILES: 	/* Minimium free files */

-		if (!isdigit(*cp)) {

-			fatalerr("Expected digit, got '%s'.", cp);

-			return;

-		}

-		min_freefiles = (unsigned long) atoi(cp);

+		min_freefiles = (int64_t)strtonum(cp, 0, LLONG_MAX, &errstr);

+		if (errstr)

+			fatalerr("Minimum free files is %s: '%s'", errstr, optarg);

 		break;

 	case SC_LOGGING:	/* Logging options */

@@ -1364,7 +1378,7 @@ static void recvit(cmd, type)

 	time_t mtime, atime;

 	char *owner, *group, *file;

 	char new[MAXPATHLEN];

-	long freespace = -1, freefiles = -1;

+	int64_t freespace = -1, freefiles = -1;

 	char *cp = cmd;

 	/*

@@ -1388,7 +1402,7 @@ static void recvit(cmd, type)

 	/*

 	 * Get file size

 	 */

-	size = strtol(cp, &cp, 10);

+	size = (off_t) strtoll(cp, &cp, 10);

 	if (*cp++ != ' ') {

 		error("recvit: size not delimited");

 		return;

@@ -1397,7 +1411,7 @@ static void recvit(cmd, type)

 	/*

 	 * Get modification time

 	 */

-	mtime = strtol(cp, &cp, 10);

+	mtime = (time_t) strtol(cp, &cp, 10);

 	if (*cp++ != ' ') {

 		error("recvit: mtime not delimited");

 		return;

@@ -1441,8 +1455,8 @@ static void recvit(cmd, type)

 	}

 	debugmsg(DM_MISC,

-		 "recvit: opts = %04o mode = %04o size = %d mtime = %d",

-		 opts, mode, size, mtime);

+		 "recvit: opts = %04o mode = %04o size = %lld mtime = %d",

+		 opts, mode, (long long) size, mtime);

 	debugmsg(DM_MISC,

        "recvit: owner = '%s' group = '%s' file = '%s' catname = %d isdir = %d",

 		 owner, group, file, catname, (type == S_IFDIR) ? 1 : 0);

@@ -1486,7 +1500,7 @@ static void recvit(cmd, type)

 	 */

 	if (min_freespace || min_freefiles) {

 		/* Convert file size to kilobytes */

-		long fsize = (long) (size / 1024);

+		int64_t fsize = (int64_t)size / 1024;

 		if (getfilesysinfo(target, &freespace, &freefiles) != 0)

 			return;

@@ -1498,15 +1512,15 @@ static void recvit(cmd, type)

 		if (min_freespace && (freespace >= 0) && 

 		    (freespace - fsize < min_freespace)) {

 			error(

-		     "%s: Not enough free space on filesystem: min %d free %d",

-			      target, min_freespace, freespace);

+		     "%s: Not enough free space on filesystem: min %lld "

+		     "free %lld", target, min_freespace, freespace);

 			return;

 		}

 		if (min_freefiles && (freefiles >= 0) &&

 		    (freefiles - 1 < min_freefiles)) {

 			error(

-		     "%s: Not enough free files on filesystem: min %d free %d",

-			      target, min_freefiles, freefiles);

+		     "%s: Not enough free files on filesystem: min %lld free "

+		     "%lld", target, min_freefiles, freefiles);

 			return;

 		}

 	}