src/sbbs3/email.cpp

@@ -227,7 +227,6 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, long mode,
 		return(false); 
 	}
 
-	setvbuf(instream,NULL,_IOFBF,2*1024);
 	smb_fseek(smb.sdt_fp,offset,SEEK_SET);
 	xlat=XLAT_NONE;
 	smb_fwrite(&smb,&xlat,2,smb.sdt_fp);

src/sbbs3/listfile.cpp

@@ -874,8 +874,8 @@ int sbbs_t::listfileinfo(uint dirnum, const char *filespec, long mode)
 									} 
 								} 
 							}
-							else if(remove(str))    /* always remove if not sysop */
-								bprintf(text[CouldntRemoveFile],str);
+							else if(remove(path))    /* always remove if not sysop */
+								bprintf(text[CouldntRemoveFile],path);
 						}
 					}
 					if(dir_op(dirnum) || useron.exempt&FLAG('R')) {

src/sbbs3/netmail.cpp

@@ -1385,7 +1385,6 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, long mode, smb_t* resm
 		return(false); 
 	}
 
-	setvbuf(instream,NULL,_IOFBF,2*1024);
 	fseeko(smb.sdt_fp,offset,SEEK_SET);
 	xlat=XLAT_NONE;
 	fwrite(&xlat,2,1,smb.sdt_fp);

src/sbbs3/scfgsave.c

@@ -89,7 +89,7 @@ BOOL write_node_cfg(scfg_t* cfg, int backup_level)
 		|| (stream=fdopen(file,"wb"))==NULL) {
 		return(FALSE); 
 	}
-	setvbuf(stream,NULL,_IOFBF,2048);
+	setvbuf(stream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 
 	put_int(cfg->node_num,stream);
 	put_str(cfg->node_name,stream);
@@ -151,7 +151,7 @@ BOOL write_main_cfg(scfg_t* cfg, int backup_level)
 		|| (stream=fdopen(file,"wb"))==NULL) {
 		return(FALSE); 
 	}
-	setvbuf(stream,NULL,_IOFBF,2048);
+	setvbuf(stream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 
 	put_str(cfg->sys_name,stream);
 	put_str(cfg->sys_id,stream);
@@ -334,7 +334,7 @@ BOOL write_msgs_cfg(scfg_t* cfg, int backup_level)
 		|| (stream=fdopen(file,"wb"))==NULL) {
 		return(FALSE); 
 	}
-	setvbuf(stream,NULL,_IOFBF,2048);
+	setvbuf(stream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 
 	put_int(cfg->max_qwkmsgs,stream);
 	put_int(cfg->mail_maxcrcs,stream);
@@ -643,7 +643,7 @@ BOOL write_file_cfg(scfg_t* cfg, int backup_level)
 		|| (stream=fdopen(file,"wb"))==NULL) {
 		return(FALSE); 
 	}
-	setvbuf(stream,NULL,_IOFBF,2048);
+	setvbuf(stream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 
 	put_int(cfg->min_dspace,stream);
 	put_int(cfg->max_batup,stream);
@@ -891,7 +891,7 @@ BOOL write_chat_cfg(scfg_t* cfg, int backup_level)
 		|| (stream=fdopen(file,"wb"))==NULL) {
 		return(FALSE); 
 	}
-	setvbuf(stream,NULL,_IOFBF,2048);
+	setvbuf(stream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 
 	put_int(cfg->total_gurus,stream);
 	for(i=0;i<cfg->total_gurus;i++) {
@@ -967,7 +967,7 @@ BOOL write_xtrn_cfg(scfg_t* cfg, int backup_level)
 		|| (stream=fdopen(file,"wb"))==NULL) {
 		return(FALSE); 
 	}
-	setvbuf(stream,NULL,_IOFBF,2048);
+	setvbuf(stream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 
 	put_int(cfg->total_swaps,stream);
 	for(i=0;i<cfg->total_swaps;i++)

src/sbbs3/writemsg.cpp

@@ -1671,7 +1671,7 @@ bool sbbs_t::editmsg(smb_t* smb, smbmsg_t *msg)
 		return false;
 	}
 
-	setvbuf(instream,NULL,_IOFBF,2*1024);
+	setvbuf(instream,NULL,_IOFBF,FNOPEN_BUF_SIZE);
 	fseeko(smb->sdt_fp,offset,SEEK_SET);
 	xlat=XLAT_NONE;
 	fwrite(&xlat,2,1,smb->sdt_fp);