Skip to content
Snippets Groups Projects
Commit ef1e47e2 authored by rswindell's avatar rswindell
Browse files

More safe string management function replacement, even though most (all?) of 

this code is on the chopping block already.
parent e2d178e8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 33 deletions
src/sbbs3/bat_xfer.cpp
+ 33
− 33
View file @ ef1e47e2
...@@ -71,7 +71,7 @@ void sbbs_t::batchmenu() ...@@ -71,7 +71,7 @@ void sbbs_t::batchmenu()
} }
ASYNC; ASYNC;
bputs(text[BatchMenuPrompt]); bputs(text[BatchMenuPrompt]);
sprintf(keys,"BCDLRU?\r%c", text[YNQP][2]); SAFEPRINTF(keys,"BCDLRU?\r%c", text[YNQP][2]);
ch=(char)getkeys(keys,0); ch=(char)getkeys(keys,0);
if(ch>' ') if(ch>' ')
logch(ch,0); logch(ch,0);
...@@ -122,7 +122,7 @@ void sbbs_t::batchmenu() ...@@ -122,7 +122,7 @@ void sbbs_t::batchmenu()
xfer_prot_menu(XFER_BIDIR); xfer_prot_menu(XFER_BIDIR);
SYNC; SYNC;
mnemonics(text[ProtocolOrQuit]); mnemonics(text[ProtocolOrQuit]);
sprintf(tmp2,"%c",text[YNQP][2]); SAFEPRINTF(tmp2,"%c",text[YNQP][2]);
for(i=0;i<cfg.total_prots;i++) for(i=0;i<cfg.total_prots;i++)
if(cfg.prot[i]->bicmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) { if(cfg.prot[i]->bicmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) {
sprintf(tmp,"%c",cfg.prot[i]->mnemonic); sprintf(tmp,"%c",cfg.prot[i]->mnemonic);
...@@ -151,11 +151,11 @@ void sbbs_t::batchmenu() ...@@ -151,11 +151,11 @@ void sbbs_t::batchmenu()
if(cfg.dir[batdn_dir[i]]->seqdev) { if(cfg.dir[batdn_dir[i]]->seqdev) {
lncntr=0; lncntr=0;
unpadfname(batdn_name[i],tmp); unpadfname(batdn_name[i],tmp);
sprintf(tmp2,"%s%s",cfg.temp_dir,tmp); SAFEPRINTF2(tmp2,"%s%s",cfg.temp_dir,tmp);
if(!fexistcase(tmp2)) { if(!fexistcase(tmp2)) {
seqwait(cfg.dir[batdn_dir[i]]->seqdev); seqwait(cfg.dir[batdn_dir[i]]->seqdev);
bprintf(text[RetrievingFile],tmp); bprintf(text[RetrievingFile],tmp);
sprintf(str,"%s%s" SAFEPRINTF2(str,"%s%s"
,batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths ,batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths
? cfg.altpath[batdn_alt[i]-1] ? cfg.altpath[batdn_alt[i]-1]
: cfg.dir[batdn_dir[i]]->path : cfg.dir[batdn_dir[i]]->path
...@@ -168,15 +168,15 @@ void sbbs_t::batchmenu() ...@@ -168,15 +168,15 @@ void sbbs_t::batchmenu()
CRLF; CRLF;
} }
} }
sprintf(str,"%sBATCHDN.LST",cfg.node_dir); SAFEPRINTF(str,"%sBATCHDN.LST",cfg.node_dir);
sprintf(tmp2,"%sBATCHUP.LST",cfg.node_dir); SAFEPRINTF(tmp2,"%sBATCHUP.LST",cfg.node_dir);
start=time(NULL); start=time(NULL);
protocol(cfg.prot[xfrprot],XFER_BIDIR,str,tmp2,true); protocol(cfg.prot[xfrprot],XFER_BIDIR,str,tmp2,true);
end=time(NULL); end=time(NULL);
for(i=0;i<batdn_total;i++) for(i=0;i<batdn_total;i++)
if(cfg.dir[batdn_dir[i]]->seqdev) { if(cfg.dir[batdn_dir[i]]->seqdev) {
unpadfname(batdn_name[i],tmp); unpadfname(batdn_name[i],tmp);
sprintf(tmp2,"%s%s",cfg.temp_dir,tmp); SAFEPRINTF2(tmp2,"%s%s",cfg.temp_dir,tmp);
remove(tmp2); remove(tmp2);
} }
batch_upload(); batch_upload();
...@@ -199,7 +199,7 @@ void sbbs_t::batchmenu() ...@@ -199,7 +199,7 @@ void sbbs_t::batchmenu()
f.dir=batdn_dir[i]; f.dir=batdn_dir[i];
f.datoffset=batdn_offset[i]; f.datoffset=batdn_offset[i];
f.size=batdn_size[i]; f.size=batdn_size[i];
strcpy(f.name,batdn_name[i]); SAFECOPY(f.name,batdn_name[i]);
closefile(&f); closefile(&f);
} }
batdn_total=0; batdn_total=0;
...@@ -260,7 +260,7 @@ void sbbs_t::batchmenu() ...@@ -260,7 +260,7 @@ void sbbs_t::batchmenu()
if((int)n>=1) { if((int)n>=1) {
n--; n--;
f.dir=batdn_dir[n]; f.dir=batdn_dir[n];
strcpy(f.name,batdn_name[n]); SAFECOPY(f.name,batdn_name[n]);
f.datoffset=batdn_offset[n]; f.datoffset=batdn_offset[n];
f.size=batdn_size[n]; f.size=batdn_size[n];
closefile(&f); closefile(&f);
...@@ -295,7 +295,7 @@ void sbbs_t::batchmenu() ...@@ -295,7 +295,7 @@ void sbbs_t::batchmenu()
break; break;
ASYNC; ASYNC;
mnemonics(text[ProtocolOrQuit]); mnemonics(text[ProtocolOrQuit]);
sprintf(str,"%c",text[YNQP][2]); SAFEPRINTF(str,"%c",text[YNQP][2]);
for(i=0;i<cfg.total_prots;i++) for(i=0;i<cfg.total_prots;i++)
if(cfg.prot[i]->batulcmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) { if(cfg.prot[i]->batulcmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) {
sprintf(tmp,"%c",cfg.prot[i]->mnemonic); sprintf(tmp,"%c",cfg.prot[i]->mnemonic);
...@@ -309,7 +309,7 @@ void sbbs_t::batchmenu() ...@@ -309,7 +309,7 @@ void sbbs_t::batchmenu()
&& chk_ar(cfg.prot[i]->ar,&useron,&client)) && chk_ar(cfg.prot[i]->ar,&useron,&client))
break; break;
if(i<cfg.total_prots) { if(i<cfg.total_prots) {
sprintf(str,"%sBATCHUP.LST",cfg.node_dir); SAFEPRINTF(str,"%sBATCHUP.LST",cfg.node_dir);
xfrprot=i; xfrprot=i;
if(batup_total) if(batup_total)
xfrdir=batup_dir[0]; xfrdir=batup_dir[0];
...@@ -383,7 +383,7 @@ BOOL sbbs_t::start_batch_download() ...@@ -383,7 +383,7 @@ BOOL sbbs_t::start_batch_download()
xfer_prot_menu(XFER_BATCH_DOWNLOAD); xfer_prot_menu(XFER_BATCH_DOWNLOAD);
ASYNC; ASYNC;
mnemonics(text[ProtocolOrQuit]); mnemonics(text[ProtocolOrQuit]);
sprintf(str,"%c",text[YNQP][2]); SAFEPRINTF(str,"%c",text[YNQP][2]);
for(i=0;i<cfg.total_prots;i++) for(i=0;i<cfg.total_prots;i++)
if(cfg.prot[i]->batdlcmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) { if(cfg.prot[i]->batdlcmd[0] && chk_ar(cfg.prot[i]->ar,&useron,&client)) {
sprintf(tmp,"%c",cfg.prot[i]->mnemonic); sprintf(tmp,"%c",cfg.prot[i]->mnemonic);
...@@ -412,11 +412,11 @@ BOOL sbbs_t::start_batch_download() ...@@ -412,11 +412,11 @@ BOOL sbbs_t::start_batch_download()
unpadfname(batdn_name[i],fname); unpadfname(batdn_name[i],fname);
if(cfg.dir[batdn_dir[i]]->seqdev) { if(cfg.dir[batdn_dir[i]]->seqdev) {
lncntr=0; lncntr=0;
sprintf(path,"%s%s",cfg.temp_dir,fname); SAFEPRINTF2(path,"%s%s",cfg.temp_dir,fname);
if(!fexistcase(path)) { if(!fexistcase(path)) {
seqwait(cfg.dir[batdn_dir[i]]->seqdev); seqwait(cfg.dir[batdn_dir[i]]->seqdev);
bprintf(text[RetrievingFile],fname); bprintf(text[RetrievingFile],fname);
sprintf(str,"%s%s" SAFEPRINTF2(str,"%s%s"
,batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths ,batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths
? cfg.altpath[batdn_alt[i]-1] ? cfg.altpath[batdn_alt[i]-1]
: cfg.dir[batdn_dir[i]]->path : cfg.dir[batdn_dir[i]]->path
...@@ -430,7 +430,7 @@ BOOL sbbs_t::start_batch_download() ...@@ -430,7 +430,7 @@ BOOL sbbs_t::start_batch_download()
} }
} }
else else
sprintf(path,"%s%s" SAFEPRINTF2(path,"%s%s"
,batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths ,batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths
? cfg.altpath[batdn_alt[i]-1] ? cfg.altpath[batdn_alt[i]-1]
: cfg.dir[batdn_dir[i]]->path : cfg.dir[batdn_dir[i]]->path
...@@ -463,7 +463,7 @@ BOOL sbbs_t::start_batch_download() ...@@ -463,7 +463,7 @@ BOOL sbbs_t::start_batch_download()
} }
} }
sprintf(str,"%sBATCHDN.LST",cfg.node_dir); SAFEPRINTF(str,"%sBATCHDN.LST",cfg.node_dir);
action=NODE_DLNG; action=NODE_DLNG;
t=now; t=now;
if(cur_cps) if(cur_cps)
...@@ -499,7 +499,7 @@ bool sbbs_t::create_batchdn_lst(bool native) ...@@ -499,7 +499,7 @@ bool sbbs_t::create_batchdn_lst(bool native)
int file; int file;
uint i; uint i;
sprintf(path,"%sBATCHDN.LST",cfg.node_dir); SAFEPRINTF(path,"%sBATCHDN.LST",cfg.node_dir);
if((file=nopen(path,O_WRONLY|O_CREAT|O_TRUNC))==-1) { if((file=nopen(path,O_WRONLY|O_CREAT|O_TRUNC))==-1) {
errormsg(WHERE,ERR_OPEN,path,O_WRONLY|O_CREAT|O_TRUNC); errormsg(WHERE,ERR_OPEN,path,O_WRONLY|O_CREAT|O_TRUNC);
return(false); return(false);
...@@ -533,16 +533,16 @@ bool sbbs_t::create_batchup_lst() ...@@ -533,16 +533,16 @@ bool sbbs_t::create_batchup_lst()
int file; int file;
uint i; uint i;
sprintf(str,"%sBATCHUP.LST",cfg.node_dir); SAFEPRINTF(str,"%sBATCHUP.LST",cfg.node_dir);
if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))==-1) { if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC); errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC);
return(false); return(false);
} }
for(i=0;i<batup_total;i++) { for(i=0;i<batup_total;i++) {
if(batup_dir[i]>=cfg.total_dirs) if(batup_dir[i]>=cfg.total_dirs)
strcpy(str,cfg.temp_dir); SAFECOPY(str,cfg.temp_dir);
else else
strcpy(str,batup_alt[i]>0 && batup_alt[i]<=cfg.altpaths SAFECOPY(str,batup_alt[i]>0 && batup_alt[i]<=cfg.altpaths
? cfg.altpath[batup_alt[i]-1] : cfg.dir[batup_dir[i]]->path); ? cfg.altpath[batup_alt[i]-1] : cfg.dir[batup_dir[i]]->path);
write(file,str,strlen(str)); write(file,str,strlen(str));
unpadfname(batup_name[i],str); unpadfname(batup_name[i],str);
...@@ -564,27 +564,27 @@ bool sbbs_t::create_bimodem_pth() ...@@ -564,27 +564,27 @@ bool sbbs_t::create_bimodem_pth()
int file; int file;
uint i; uint i;
sprintf(str,"%sBIMODEM.PTH",cfg.node_dir); /* Create bimodem file */ SAFEPRINTF(str,"%sBIMODEM.PTH",cfg.node_dir); /* Create bimodem file */
if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))==-1) { if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC); errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC);
return(false); return(false);
} }
for(i=0;i<batup_total;i++) { for(i=0;i<batup_total;i++) {
sprintf(str,"%s%s",batup_dir[i]>=cfg.total_dirs ? cfg.temp_dir SAFEPRINTF2(str,"%s%s",batup_dir[i]>=cfg.total_dirs ? cfg.temp_dir
: batup_alt[i]>0 && batup_alt[i]<=cfg.altpaths : batup_alt[i]>0 && batup_alt[i]<=cfg.altpaths
? cfg.altpath[batup_alt[i]-1] : cfg.dir[batup_dir[i]]->path ? cfg.altpath[batup_alt[i]-1] : cfg.dir[batup_dir[i]]->path
,unpadfname(batup_name[i],tmp)); ,unpadfname(batup_name[i],tmp));
sprintf(tmp2,"D %-80.80s%-160.160s" SAFEPRINTF2(tmp2,"D %-80.80s%-160.160s"
,unpadfname(batup_name[i],tmp),str); ,unpadfname(batup_name[i],tmp),str);
write(file,tmp2,248); write(file,tmp2,248);
} }
for(i=0;i<batdn_total;i++) { for(i=0;i<batdn_total;i++) {
sprintf(str,"%s%s" SAFEPRINTF2(str,"%s%s"
,(batdn_dir[i]>=cfg.total_dirs || cfg.dir[batdn_dir[i]]->seqdev) ,(batdn_dir[i]>=cfg.total_dirs || cfg.dir[batdn_dir[i]]->seqdev)
? cfg.temp_dir : batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths ? cfg.temp_dir : batdn_alt[i]>0 && batdn_alt[i]<=cfg.altpaths
? cfg.altpath[batdn_alt[i]-1] : cfg.dir[batdn_dir[i]]->path ? cfg.altpath[batdn_alt[i]-1] : cfg.dir[batdn_dir[i]]->path
,unpadfname(batdn_name[i],tmp)); ,unpadfname(batdn_name[i],tmp));
sprintf(tmp2,"U %-240.240s",str); SAFEPRINTF(tmp2,"U %-240.240s",str);
write(file,tmp2,248); write(file,tmp2,248);
} }
close(file); close(file);
...@@ -608,8 +608,8 @@ void sbbs_t::batch_upload() ...@@ -608,8 +608,8 @@ void sbbs_t::batch_upload()
curdirnum=batup_dir[i]; /* for ARS */ curdirnum=batup_dir[i]; /* for ARS */
lncntr=0; /* defeat pause */ lncntr=0; /* defeat pause */
unpadfname(batup_name[i],tmp); unpadfname(batup_name[i],tmp);
sprintf(str1,"%s%s",cfg.temp_dir,tmp); SAFEPRINTF2(str1,"%s%s",cfg.temp_dir,tmp);
sprintf(str2,"%s%s",cfg.dir[batup_dir[i]]->path,tmp); SAFEPRINTF2(str2,"%s%s",cfg.dir[batup_dir[i]]->path,tmp);
if(fexistcase(str1) && fexistcase(str2)) { /* file's in two places */ if(fexistcase(str1) && fexistcase(str2)) { /* file's in two places */
bprintf(text[FileAlreadyThere],batup_name[i]); bprintf(text[FileAlreadyThere],batup_name[i]);
remove(str1); /* this is the one received */ remove(str1); /* this is the one received */
...@@ -618,8 +618,8 @@ void sbbs_t::batch_upload() ...@@ -618,8 +618,8 @@ void sbbs_t::batch_upload()
} }
if(fexist(str1)) if(fexist(str1))
mv(str1,str2,0); mv(str1,str2,0);
strcpy(f.name,batup_name[i]); SAFECOPY(f.name,batup_name[i]);
strcpy(f.desc,batup_desc[i]); SAFECOPY(f.desc,batup_desc[i]);
f.dir=batup_dir[i]; f.dir=batup_dir[i];
f.misc=batup_misc[i]; f.misc=batup_misc[i];
f.altpath=batup_alt[i]; f.altpath=batup_alt[i];
...@@ -639,7 +639,7 @@ void sbbs_t::batch_upload() ...@@ -639,7 +639,7 @@ void sbbs_t::batch_upload()
return; return;
dir=opendir(cfg.temp_dir); dir=opendir(cfg.temp_dir);
while(dir!=NULL && (dirent=readdir(dir))!=NULL) { while(dir!=NULL && (dirent=readdir(dir))!=NULL) {
sprintf(str1,"%s%s",cfg.temp_dir,dirent->d_name); SAFEPRINTF2(str1,"%s%s",cfg.temp_dir,dirent->d_name);
if(isdir(str1)) if(isdir(str1))
continue; continue;
memset(&f,0,sizeof(file_t)); memset(&f,0,sizeof(file_t));
...@@ -659,7 +659,7 @@ void sbbs_t::batch_upload() ...@@ -659,7 +659,7 @@ void sbbs_t::batch_upload()
if(y<usrdirs[x]) if(y<usrdirs[x])
break; break;
} }
sprintf(str2,"%s%s",cfg.dir[f.dir]->path,dirent->d_name); SAFEPRINTF2(str2,"%s%s",cfg.dir[f.dir]->path,dirent->d_name);
if(x<usrlibs || fexistcase(str2)) { if(x<usrlibs || fexistcase(str2)) {
bprintf(text[FileAlreadyOnline],f.name); bprintf(text[FileAlreadyOnline],f.name);
remove(str1); remove(str1);
...@@ -684,7 +684,7 @@ void sbbs_t::batch_download(int xfrprot) ...@@ -684,7 +684,7 @@ void sbbs_t::batch_download(int xfrprot)
for(i=0;i<batdn_total;) { for(i=0;i<batdn_total;) {
lncntr=0; /* defeat pause */ lncntr=0; /* defeat pause */
f.dir=curdirnum=batdn_dir[i]; f.dir=curdirnum=batdn_dir[i];
strcpy(f.name,batdn_name[i]); SAFECOPY(f.name,batdn_name[i]);
f.datoffset=batdn_offset[i]; f.datoffset=batdn_offset[i];
f.size=batdn_size[i]; f.size=batdn_size[i];
f.altpath=batdn_alt[i]; f.altpath=batdn_alt[i];
...@@ -764,7 +764,7 @@ void sbbs_t::batch_create_list() ...@@ -764,7 +764,7 @@ void sbbs_t::batch_create_list()
FILE* stream; FILE* stream;
if(batdn_total) { if(batdn_total) {
sprintf(str,"%sfile/%04u.dwn",cfg.data_dir,useron.number); SAFEPRINTF2(str,"%sfile/%04u.dwn",cfg.data_dir,useron.number);
if((stream=fnopen(NULL,str,O_WRONLY|O_TRUNC|O_CREAT))!=NULL) { if((stream=fnopen(NULL,str,O_WRONLY|O_TRUNC|O_CREAT))!=NULL) {
for(i=0;i<(int)batdn_total;i++) for(i=0;i<(int)batdn_total;i++)
fprintf(stream,"%s\r\n",batdn_name[i]); fprintf(stream,"%s\r\n",batdn_name[i]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment