Skip to content
Snippets Groups Projects
Commit 0fcb0fe1 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

FileAlreadyThere is used as a printf-format elsewehre, do the same here

The stock text.dat FileAlreadyOnline string doesn't actually contain a '%s',
but if it did, it would've worked as intended in some cases, and broken badly
in others. Now fixed for if/when we do actually include the filenaeme (%s)
in that string.
parent 045d5ce0
No related branches found
No related tags found
No related merge requests found
...@@ -132,7 +132,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, ...@@ -132,7 +132,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode,
(void)MKDIR(str2); (void)MKDIR(str2);
SAFEPRINTF3(str2,"%sfile/%04u.in/%s", cfg.data_dir,usernumber,title); SAFEPRINTF3(str2,"%sfile/%04u.in/%s", cfg.data_dir,usernumber,title);
if(fexistcase(str2)) { if(fexistcase(str2)) {
bputs(text[FileAlreadyThere]); bprintf(text[FileAlreadyThere], str2);
(void)remove(msgpath); (void)remove(msgpath);
return(false); return(false);
} }
......
...@@ -212,7 +212,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb ...@@ -212,7 +212,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb
SAFEPRINTF3(str,"%sfile/%04u.out/%s",tmp,useron.number,fname); SAFEPRINTF3(str,"%sfile/%04u.out/%s",tmp,useron.number,fname);
SAFECOPY(subj, str); SAFECOPY(subj, str);
if(fexistcase(str)) { if(fexistcase(str)) {
bputs(text[FileAlreadyThere]); bprintf(text[FileAlreadyThere], str);
return(false); return(false);
} }
{ /* Remote */ { /* Remote */
...@@ -1048,7 +1048,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb ...@@ -1048,7 +1048,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb
SAFEPRINTF3(str2,"%sfile/%04u.out/%s",cfg.data_dir,useron.number,title); SAFEPRINTF3(str2,"%sfile/%04u.out/%s",cfg.data_dir,useron.number,title);
if(fexistcase(str2)) { if(fexistcase(str2)) {
strListFree(&rcpt_list); strListFree(&rcpt_list);
bputs(text[FileAlreadyThere]); bprintf(text[FileAlreadyThere], str2);
(void)remove(msgpath); (void)remove(msgpath);
return(false); return(false);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment