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

No longer calls closedir with NULL pointer if opendir fails.

parent b7f86da3
No related branches found
No related tags found
No related merge requests found
...@@ -642,6 +642,7 @@ void sbbs_t::batch_upload() ...@@ -642,6 +642,7 @@ void sbbs_t::batch_upload()
uploadfile(&f); uploadfile(&f);
} }
} }
if(dir!=NULL)
closedir(dir); closedir(dir);
} }
......
...@@ -494,6 +494,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack) ...@@ -494,6 +494,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
if(!mv(str,tmp2,1)) if(!mv(str,tmp2,1))
netfiles++; netfiles++;
} }
if(dir!=NULL)
closedir(dir); closedir(dir);
if(netfiles) if(netfiles)
CRLF; } CRLF; }
...@@ -616,6 +617,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack) ...@@ -616,6 +617,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
if(!isdir(tmp)) if(!isdir(tmp))
remove(tmp); remove(tmp);
} }
if(dir!=NULL)
closedir(dir); closedir(dir);
} }
......
...@@ -311,6 +311,7 @@ void sbbs_t::extract(uint dirnum) ...@@ -311,6 +311,7 @@ void sbbs_t::extract(uint dirnum)
if(!isdir(str)) if(!isdir(str))
remove(str); remove(str);
} }
if(dir!=NULL)
closedir(dir); closedir(dir);
CRLF; CRLF;
} }
......
...@@ -425,6 +425,7 @@ bool sbbs_t::unpack_rep(char* repfile) ...@@ -425,6 +425,7 @@ bool sbbs_t::unpack_rep(char* repfile)
sprintf(str,text[ReceivedFileViaQWK],dirent->d_name,useron.alias); sprintf(str,text[ReceivedFileViaQWK],dirent->d_name,useron.alias);
putsmsg(&cfg,1,str); putsmsg(&cfg,1,str);
} }
if(dir!=NULL)
closedir(dir); closedir(dir);
sprintf(str,"%sqnet-rep.now",cfg.data_dir); sprintf(str,"%sqnet-rep.now",cfg.data_dir);
if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))!=-1) if((file=nopen(str,O_WRONLY|O_CREAT|O_TRUNC))!=-1)
......
...@@ -579,6 +579,7 @@ bool sbbs_t::bulkupload(uint dirnum) ...@@ -579,6 +579,7 @@ bool sbbs_t::bulkupload(uint dirnum)
uploadfile(&f); uploadfile(&f);
} }
} }
if(dir!=NULL)
closedir(dir); closedir(dir);
if(sys_status&SS_ABORT) if(sys_status&SS_ABORT)
return(true); return(true);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment