===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdistd/server.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/rdistd/server.c	1996/02/03 12:13:03	1.1
--- src/usr.bin/rdistd/server.c	1996/03/05 03:16:21	1.2
***************
*** 32,38 ****
   */
  #ifndef lint
  static char RCSid[] = 
! "$Id: server.c,v 1.1 1996/02/03 12:13:03 dm Exp $";
  
  static char sccsid[] = "@(#)server.c	5.3 (Berkeley) 6/7/86";
  
--- 32,38 ----
   */
  #ifndef lint
  static char RCSid[] = 
! "$Id: server.c,v 1.2 1996/03/05 03:16:21 dm Exp $";
  
  static char sccsid[] = "@(#)server.c	5.3 (Berkeley) 6/7/86";
  
***************
*** 186,191 ****
--- 186,193 ----
  	static char last_group[128];
  	static char last_owner[128];
  	static GID_T last_gid = (GID_T)-2;
+ 	static UID_T last_uid = (UID_T)-2;
+ 	static GID_T last_primegid;
  	extern char *locuser;
  	register int i;
  	UID_T uid;
***************
*** 196,202 ****
  	if (userid == 0) {	/* running as root; take anything */
  		if (*owner == ':') {
  			uid = (UID_T) atoi(owner + 1);
! 		} else if (pw == NULL || strcmp(owner, last_owner) != 0) {
  			if ((pw = getpwnam(owner)) == NULL) {
  				if (mode != -1 && IS_ON(mode, S_ISUID)) {
  					message(MT_NOTICE,
--- 198,205 ----
  	if (userid == 0) {	/* running as root; take anything */
  		if (*owner == ':') {
  			uid = (UID_T) atoi(owner + 1);
! 		} else if (last_uid == (UID_T)-2 ||
! 			   strcmp(owner, last_owner) != 0) {
  			if ((pw = getpwnam(owner)) == NULL) {
  				if (mode != -1 && IS_ON(mode, S_ISUID)) {
  					message(MT_NOTICE,
***************
*** 209,220 ****
  					"%s: unknown login name \"%s\"",
  						target, owner);
  			} else {
! 				uid = pw->pw_uid;
  				strcpy(last_owner, owner);
  			}
  		} else {
! 			uid = pw->pw_uid;
! 			primegid = pw->pw_gid;
  		}
  		if (*group == ':') {
  			gid = (GID_T) atoi(group + 1);
--- 212,224 ----
  					"%s: unknown login name \"%s\"",
  						target, owner);
  			} else {
! 				uid	 = last_uid	 = pw->pw_uid;
! 				primegid = last_primegid = pw->pw_gid;
  				strcpy(last_owner, owner);
  			}
  		} else {
! 			uid = last_uid;
! 			primegid = last_primegid;
  		}
  		if (*group == ':') {
  			gid = (GID_T) atoi(group + 1);
***************
*** 710,715 ****
--- 714,737 ----
  }
  
  /*
+  * See if buf is all zeros (sparse check)
+  */
+ static int iszeros (buf, size)
+ 	char *buf;
+ 	off_t size;
+ {
+     	while (size > 0) {
+ 	    if (*buf != CNULL)
+ 		return(0);
+ 	    buf++;
+ 	    size--;
+ 	}
+ 
+ 	return(1);
+ }
+ 
+   
+ /*
   * Receive a file
   */
  static void recvfile(new, opts, mode, owner, group, mtime, atime, size)
***************
*** 722,728 ****
  	time_t atime;
  	off_t size;
  {
! 	int f, wrerr, olderrno;
  	off_t i;
  	register char *cp;
  	char *savefile = NULL;
--- 744,750 ----
  	time_t atime;
  	off_t size;
  {
! 	int f, wrerr, olderrno, lastwashole = 0, wassparse = 0;
  	off_t i;
  	register char *cp;
  	char *savefile = NULL;
***************
*** 768,774 ****
  		amt = BUFSIZ;
  		if (i + amt > size)
  			amt = size - i;
! 		if (wrerr == 0 && xwrite(f, buf, amt) != amt) {
  			olderrno = errno;
  			wrerr++;
  		}
--- 790,820 ----
  		amt = BUFSIZ;
  		if (i + amt > size)
  			amt = size - i;
! 		if (IS_ON(opts, DO_SPARSE) && iszeros(buf, amt)) {
! 		    	if (lseek (f, amt, SEEK_CUR) < 0L) {
! 			    	olderrno = errno;
! 				wrerr++;
! 			}
! 			lastwashole = 1;
! 			wassparse++;
! 		} else {
! 		    	if (wrerr == 0 && xwrite(f, buf, amt) != amt) {
! 			    	olderrno = errno;
! 				wrerr++;
! 			}
! 			lastwashole = 0;
! 		}
! 	}
! 
! 	if (lastwashole) {
! #if	defined(HAVE_FTRUNCATE)
! 	    	if (write (f, "", 1) != 1 || ftruncate (f, size) < 0)
! #else
! 		/* Seek backwards one character and write a null.  */
! 		if (lseek (f, (off_t) -1, SEEK_CUR) < 0L
! 		    || write (f, "", 1) != 1)
! #endif
! 		{
  			olderrno = errno;
  			wrerr++;
  		}
***************
*** 779,784 ****
--- 825,831 ----
  		(void) unlink(new);
  		return;
  	}
+ 
  	if (wrerr) {
  		error("%s: Write error: %s", new, strerror(olderrno));
  		(void) close(f);
***************
*** 895,900 ****
--- 942,950 ----
  		}
  	}
  
+ 	if (wassparse)
+ 	    	message (MT_NOTICE, "%s: was sparse", target);
+ 
  	if (IS_ON(opts, DO_COMPARE))
  		message(MT_REMOTE|MT_CHANGE, "%s: updated", target);
  	else
***************
*** 1508,1515 ****
  	register int n;
  	extern jmp_buf finish_jmpbuf;
  
! 	if (setjmp(finish_jmpbuf))
  		return;
  	(void) signal(SIGHUP, sighandler);
  	(void) signal(SIGINT, sighandler);
  	(void) signal(SIGQUIT, sighandler);
--- 1558,1568 ----
  	register int n;
  	extern jmp_buf finish_jmpbuf;
  
! 	if (setjmp(finish_jmpbuf)) {
! 		setjmp_ok = FALSE;
  		return;
+ 	}
+         setjmp_ok = TRUE;
  	(void) signal(SIGHUP, sighandler);
  	(void) signal(SIGINT, sighandler);
  	(void) signal(SIGQUIT, sighandler);
***************
*** 1530,1546 ****
--- 1583,1602 ----
  	(void) sendcmd(S_VERSION, NULL);
  
  	if (remline(cmdbuf, sizeof(cmdbuf), TRUE) < 0) {
+ 		setjmp_ok = FALSE;
  		error("server: expected control record");
  		return;
  	}
  
  	if (cmdbuf[0] != S_VERSION || !isdigit(cmdbuf[1])) {
+ 		setjmp_ok = FALSE;
  		error("Expected version command, received: \"%s\".", cmdbuf);
  		return;
  	}
  
  	proto_version = atoi(&cmdbuf[1]);
  	if (proto_version != VERSION) {
+ 		setjmp_ok = FALSE;
  		error("Protocol version %d is not supported.", proto_version);
  		return;
  	}
***************
*** 1553,1560 ****
  	 */
  	for ( ; ; ) {
  		n = remline(cp = cmdbuf, sizeof(cmdbuf), TRUE);
! 		if (n == -1)		/* EOF */
  			return;
  		if (n == 0) {
  			error("server: expected control record");
  			continue;
--- 1609,1618 ----
  	 */
  	for ( ; ; ) {
  		n = remline(cp = cmdbuf, sizeof(cmdbuf), TRUE);
! 		if (n == -1) {		/* EOF */
! 			setjmp_ok = FALSE;
  			return;
+ 		}
  		if (n == 0) {
  			error("server: expected control record");
  			continue;
***************
*** 1631,1636 ****
--- 1689,1695 ----
  		case C_FERRMSG:		/* Fatal error message */
  			if (cp && *cp)
  				message(MT_FERROR|MT_NOREMOTE, "%s", cp);
+ 			setjmp_ok = FALSE;
  			return;
  
  		default: