Merge remote-tracking branch 'origin/master' into new_user_dat

src/sbbs3/ansiterm.cpp

@@ -250,7 +250,7 @@ bool sbbs_t::ansi_getxy(int* x, int* y)
             else if(ch=='R' && rsp)
             	break;
 			else {
-				str[rsp] = 0;
+				str[rsp + 1] = 0;
 #ifdef _DEBUG
 				char dbg[128];
 				c_escape_str(str, dbg, sizeof(dbg), /* Ctrl-only? */true);

src/sbbs3/chat.cpp

@@ -769,6 +769,7 @@ void sbbs_t::privchat(bool forced, int node_num)
 	char	outpath[MAX_PATH+1];
 	char	inpath[MAX_PATH+1];
 	uchar	ch;
+	int		wr;
 	int 	in,out,i,n,echo=1,x,y,activity,remote_activity;
     int		local_y=1,remote_y=1;
 	node_t	node;
@@ -1065,15 +1066,22 @@ void sbbs_t::privchat(bool forced, int node_num)
 			(void)read(out,&c,1);
 			(void)lseek(out,-1L,SEEK_CUR);
 			if(!c)		/* hasn't wrapped */
-				write(out,&ch,1);
+				wr = write(out,&ch,1);
 			else {
 				if(!tell(out))
 					lseek(out,0L,SEEK_END);
 				lseek(out,-1L,SEEK_CUR);
 				ch=0;
-				write(out,&ch,1);
+				wr = write(out,&ch,1);
 				lseek(out,-1L,SEEK_CUR); 
 			}
+			if(wr != 1)
+				lprintf(LOG_ERR, "write of character 0x%02X to %s returned %d", ch, outpath, wr);
+			else if(ch < ' ')
+				lprintf(LOG_DEBUG, "wrote control character %u (%s) to %s", ch, c_escape_char(ch), outpath);
+			else
+				lprintf(LOG_DEBUG, "wrote character '%c' to %s", ch, outpath);
+
 			utime(outpath,NULL);	/* update mod time for NFS/smbfs nodes */
 			if(tell(out)>=PCHAT_LEN)
 				lseek(out,0L,SEEK_SET);
@@ -1089,14 +1097,13 @@ void sbbs_t::privchat(bool forced, int node_num)
 			if(rd != 1) {
 				lprintf(LOG_ERR, "read character from %s returned %d instead of 1", inpath, rd);
 				ch = 0;
-			} else {
-				if(ch < ' ')
-					lprintf(LOG_DEBUG, "read control character %u (%s) from %s", ch, c_escape_char(ch), inpath);
-				else
-					lprintf(LOG_DEBUG, "read character '%c' from %s", ch, inpath);
 			}
 			(void)lseek(in,-1L,SEEK_CUR);
 			if(!ch) break;					  /* char from other node */
+			if(ch < ' ')
+				lprintf(LOG_DEBUG, "read control character %u (%s) from %s", ch, c_escape_char(ch), inpath);
+			else
+				lprintf(LOG_DEBUG, "read character '%c' from %s", ch, inpath);
 			activity=1;
 			if(sys_status&SS_SPLITP && !remote_activity) {
 				ansi_getxy(&x,&y);
@@ -1164,13 +1171,8 @@ void sbbs_t::privchat(bool forced, int node_num)
 				} 
 			}
 			ch=0;
-			int wr = write(in,&ch,1);
-			if(wr != 1)
-				lprintf(LOG_ERR, "write of character 0x%02X to %s returned %d", ch, inpath, wr);
-			else if(ch < ' ')
-				lprintf(LOG_DEBUG, "wrote control character %u (%s) to %s", ch, c_escape_char(ch), inpath);
-			else
-				lprintf(LOG_DEBUG, "wrote character '%c' to %s", ch, inpath);
+			if(write(in,&ch,1) != 1)
+				lprintf(LOG_ERR, "write of NUL to %s returned %d", inpath, wr);
 
 			if(!(sys_status&SS_SPLITP))
 				localchar=remotechar;