===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/client.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/rdist/client.c	2015/01/20 09:00:16	1.33
--- src/usr.bin/rdist/client.c	2015/01/21 03:18:31	1.34
***************
*** 1,4 ****
! /*	$OpenBSD: client.c,v 1.33 2015/01/20 09:00:16 guenther Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: client.c,v 1.34 2015/01/21 03:18:31 guenther Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 371,378 ****
  	}
  	ENCODE(elname, lname);
  	ENCODE(ername, rname);
! 	(void) sendcmd(C_RECVHARDLINK, "%lo %s %s", 
! 		       opts, elname, ername);
  
  	return(response());
  }
--- 371,377 ----
  	}
  	ENCODE(elname, lname);
  	ENCODE(ername, rname);
! 	(void) sendcmd(C_RECVHARDLINK, "%o %s %s", opts, elname, ername);
  
  	return(response());
  }
***************
*** 405,411 ****
  	 */
  	ENCODE(ername, rname);
  
! 	(void) sendcmd(C_RECVREG, "%lo %04o %lld %lld %lld %s %s %s", 
  		       opts, stb->st_mode & 07777, (long long) stb->st_size, 
  		       (long long)stb->st_mtime, (long long)stb->st_atime,
  		       user, group, ername);
--- 404,410 ----
  	 */
  	ENCODE(ername, rname);
  
! 	(void) sendcmd(C_RECVREG, "%o %04o %lld %lld %lld %s %s %s", 
  		       opts, stb->st_mode & 07777, (long long) stb->st_size, 
  		       (long long)stb->st_mtime, (long long)stb->st_atime,
  		       user, group, ername);
***************
*** 594,600 ****
  	 * Send recvdir command in recvit() format.
  	 */
  	ENCODE(ername, rname);
! 	(void) sendcmd(C_RECVDIR, "%lo %04o 0 0 0 %s %s %s", 
  		       opts, stb->st_mode & 07777, user, group, ername);
  	if (response() < 0)
  		return(-1);
--- 593,599 ----
  	 * Send recvdir command in recvit() format.
  	 */
  	ENCODE(ername, rname);
! 	(void) sendcmd(C_RECVDIR, "%o %04o 0 0 0 %s %s %s", 
  		       opts, stb->st_mode & 07777, user, group, ername);
  	if (response() < 0)
  		return(-1);
***************
*** 664,670 ****
  	u_char *s;
  	char ername[PATH_MAX*4];
  
! 	debugmsg(DM_CALL, "sendlink(%s, %lx, stb, %d)\n", rname, opts, destdir);
  
  	if (stb->st_nlink > 1) {
  		struct linkbuf *lp;
--- 663,669 ----
  	u_char *s;
  	char ername[PATH_MAX*4];
  
! 	debugmsg(DM_CALL, "sendlink(%s, %#x, stb, %d)\n", rname, opts, destdir);
  
  	if (stb->st_nlink > 1) {
  		struct linkbuf *lp;
***************
*** 677,683 ****
  	 * Gather and send basic link info
  	 */
  	ENCODE(ername, rname);
! 	(void) sendcmd(C_RECVSYMLINK, "%lo %04o %lld %lld %lld %s %s %s", 
  		       opts, stb->st_mode & 07777, (long long) stb->st_size, 
  		       (long long)stb->st_mtime, (long long)stb->st_atime,
  		       user, group, ername);
--- 676,682 ----
  	 * Gather and send basic link info
  	 */
  	ENCODE(ername, rname);
! 	(void) sendcmd(C_RECVSYMLINK, "%o %04o %lld %lld %lld %s %s %s", 
  		       opts, stb->st_mode & 07777, (long long) stb->st_size, 
  		       (long long)stb->st_mtime, (long long)stb->st_atime,
  		       user, group, ername);
***************
*** 783,789 ****
  	u_char *cp;
  	char ername[PATH_MAX*4];
  
! 	debugmsg(DM_CALL, "update(%s, 0x%lx, %p)\n", rname, opts, statp);
  
  	switch (statp->st_mode & S_IFMT) {
  	case S_IFBLK:
--- 782,788 ----
  	u_char *cp;
  	char ername[PATH_MAX*4];
  
! 	debugmsg(DM_CALL, "update(%s, %#x, %p)\n", rname, opts, statp);
  
  	switch (statp->st_mode & S_IFMT) {
  	case S_IFBLK:
***************
*** 930,936 ****
  	 */
  	lmode = statp->st_mode & 07777;
  
! 	debugmsg(DM_MISC, "update(%s,) local mode %04o remote mode %04o\n", 
  		 rname, lmode, rmode);
  	debugmsg(DM_MISC, "update(%s,) size %lld mtime %lld owner '%s' grp '%s'"
  		 "\n", rname, (long long) size, (long long)mtime, owner, group);
--- 929,935 ----
  	 */
  	lmode = statp->st_mode & 07777;
  
! 	debugmsg(DM_MISC, "update(%s,) local mode %#04o remote mode %#04o\n", 
  		 rname, lmode, rmode);
  	debugmsg(DM_MISC, "update(%s,) size %lld mtime %lld owner '%s' grp '%s'"
  		 "\n", rname, (long long) size, (long long)mtime, owner, group);
***************
*** 952,958 ****
  	} 
  
  	if (!IS_ON(opts, DO_NOCHKMODE) && lmode != rmode) {
! 		debugmsg(DM_MISC, "modes do not match (%04o != %04o).\n",
  			 lmode, rmode);
  		return(US_CHMOG);
  	}
--- 951,957 ----
  	} 
  
  	if (!IS_ON(opts, DO_NOCHKMODE) && lmode != rmode) {
! 		debugmsg(DM_MISC, "modes do not match (%#04o != %#04o).\n",
  			 lmode, rmode);
  		return(US_CHMOG);
  	}
***************
*** 1051,1065 ****
  	if (u == US_CHMOG) {
  		if (IS_ON(opts, DO_VERIFY)) {
  			message(MT_INFO,
! 				"%s: need to change to perm %04o, owner %s, group %s",
  				starget, lmode, user, group);
  			runspecial(starget, opts, rname, destdir);
  		}
  		else {
! 			message(MT_CHANGE, "%s: change to perm %04o, owner %s, group %s", 
  				starget, lmode, user, group);
  			ENCODE(ername, rname);
! 			(void) sendcmd(C_CHMOG, "%lo %04o %s %s %s",
  				       opts, lmode, user, group, ername);
  			(void) response();
  		}
--- 1050,1064 ----
  	if (u == US_CHMOG) {
  		if (IS_ON(opts, DO_VERIFY)) {
  			message(MT_INFO,
! 				"%s: need to change to perm %#04o, owner %s, group %s",
  				starget, lmode, user, group);
  			runspecial(starget, opts, rname, destdir);
  		}
  		else {
! 			message(MT_CHANGE, "%s: change to perm %#04o, owner %s, group %s", 
  				starget, lmode, user, group);
  			ENCODE(ername, rname);
! 			(void) sendcmd(C_CHMOG, "%o %04o %s %s %s",
  				       opts, lmode, user, group, ername);
  			(void) response();
  		}
***************
*** 1121,1127 ****
  		}
  		return (sendfile(rname, opts, st, user, group, destdir) == 0);
  	} else {
! 		message(MT_INFO, "%s: unknown file type 0%o", starget,
  			st->st_mode);
  		return(0);
  	}
--- 1120,1126 ----
  		}
  		return (sendfile(rname, opts, st, user, group, destdir) == 0);
  	} else {
! 		message(MT_INFO, "%s: unknown file type %#o", starget,
  			st->st_mode);
  		return(0);
  	}
***************
*** 1152,1158 ****
  	if (checkfilename(rname) != 0)
  		return(-1);
  
! 	debugmsg(DM_CALL, "sendit(%s, 0x%lx) called\n", rname, opts);
  
  	if (except(target))
  		return(0);
--- 1151,1157 ----
  	if (checkfilename(rname) != 0)
  		return(-1);
  
! 	debugmsg(DM_CALL, "sendit(%s, %#x) called\n", rname, opts);
  
  	if (except(target))
  		return(0);
***************
*** 1164,1170 ****
  	 * Does rname need updating?
  	 */
  	u = update(rname, opts, &stb);
! 	debugmsg(DM_MISC, "sendit(%s, 0x%lx): update status of %s is %d\n", 
  		 rname, opts, target, u);
  
  	/*
--- 1163,1169 ----
  	 * Does rname need updating?
  	 */
  	u = update(rname, opts, &stb);
! 	debugmsg(DM_MISC, "sendit(%s, %#x): update status of %s is %d\n", 
  		 rname, opts, target, u);
  
  	/*
***************
*** 1224,1230 ****
  	char ername[PATH_MAX*4];
  
  	debugmsg(DM_CALL,
! 		"install(src=%s,dest=%s,ddir=%d,destdir=%d,opts=%ld) start\n",
  		(src?src:"NULL"), (dest?dest:"NULL"), ddir, destdir, opts);
  	/*
  	 * Save source name
--- 1223,1229 ----
  	char ername[PATH_MAX*4];
  
  	debugmsg(DM_CALL,
! 		"install(src=%s,dest=%s,ddir=%d,destdir=%d,opts=%#x) start\n",
  		(src?src:"NULL"), (dest?dest:"NULL"), ddir, destdir, opts);
  	/*
  	 * Save source name
***************
*** 1294,1302 ****
  	 */
  	ENCODE(ername, dest);
   	if (ddir)
! 		(void) sendcmd(C_DIRTARGET, "%lo %s", opts, ername);
  	else
! 		(void) sendcmd(C_TARGET, "%lo %s", opts, ername);
  	if (response() < 0)
  		return(-1);
  
--- 1293,1301 ----
  	 */
  	ENCODE(ername, dest);
   	if (ddir)
! 		(void) sendcmd(C_DIRTARGET, "%o %s", opts, ername);
  	else
! 		(void) sendcmd(C_TARGET, "%o %s", opts, ername);
  	if (response() < 0)
  		return(-1);