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

Uses new EX_WILDCARD macro (disables shell for non-Unix).

parent b9f81db0
No related branches found
No related tags found
No related merge requests found
...@@ -588,7 +588,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack) ...@@ -588,7 +588,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
/*******************/ /*******************/
sprintf(tmp2,"%s%s",cfg.temp_dir,ALLFILES); sprintf(tmp2,"%s%s",cfg.temp_dir,ALLFILES);
i=external(cmdstr(temp_cmd(),packet,tmp2,NULL) i=external(cmdstr(temp_cmd(),packet,tmp2,NULL)
,ex|EX_SH); /* Needs sh for wildcard expansion */ ,ex|EX_WILDCARD);
if(!fexist(packet)) { if(!fexist(packet)) {
bputs(text[QWKCompressionFailed]); bputs(text[QWKCompressionFailed]);
if(i) if(i)
......
...@@ -229,7 +229,7 @@ bool sbbs_t::pack_rep(uint hubnum) ...@@ -229,7 +229,7 @@ bool sbbs_t::pack_rep(uint hubnum)
sprintf(str,"%s%s.rep",cfg.data_dir,cfg.qhub[hubnum]->id); sprintf(str,"%s%s.rep",cfg.data_dir,cfg.qhub[hubnum]->id);
sprintf(tmp2,"%s%s",cfg.temp_dir,ALLFILES); sprintf(tmp2,"%s%s",cfg.temp_dir,ALLFILES);
i=external(cmdstr(cfg.qhub[hubnum]->pack,str,tmp2,NULL) i=external(cmdstr(cfg.qhub[hubnum]->pack,str,tmp2,NULL)
,EX_OFFLINE|EX_SH); /* Needs sh for wildcard expansion */ ,EX_OFFLINE|EX_WILDCARD);
if(!fexist(str)) { if(!fexist(str)) {
eprintf("%s",remove_ctrl_a(text[QWKCompressionFailed],tmp)); eprintf("%s",remove_ctrl_a(text[QWKCompressionFailed],tmp));
if(i) if(i)
......
...@@ -123,7 +123,7 @@ void sbbs_t::temp_xfer() ...@@ -123,7 +123,7 @@ void sbbs_t::temp_xfer()
logline(nulstr,tmp2); logline(nulstr,tmp2);
sprintf(tmp2,"%s%s",cfg.temp_dir,str); sprintf(tmp2,"%s%s",cfg.temp_dir,str);
sprintf(str,"%s%s",cfg.temp_dir,f.name); sprintf(str,"%s%s",cfg.temp_dir,f.name);
external(cmdstr(temp_cmd(),str,tmp2,NULL),EX_SH|EX_OUTL|EX_OUTR); external(cmdstr(temp_cmd(),str,tmp2,NULL),EX_WILDCARD|EX_OUTL|EX_OUTR);
break; break;
case 'D': /* download from temp dir */ case 'D': /* download from temp dir */
sprintf(str,"%s%s",cfg.temp_dir,f.name); sprintf(str,"%s%s",cfg.temp_dir,f.name);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment