diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile index 1ed2db147b638928a183d36de5caf7c9549b74f4..6b2b998d34edbbdd4209f467d3d785ad7e9cbe20 100644 --- a/src/sbbs3/GNUmakefile +++ b/src/sbbs3/GNUmakefile @@ -401,6 +401,7 @@ ADDFILES_OBJS = \ $(EXEODIR)/crc16.o \ $(EXEODIR)/str_util.o \ $(EXEODIR)/dat_rec.o \ + $(EXEODIR)/userdat.o \ $(EXEODIR)/filedat.o \ $(EXEODIR)/filewrap.o \ $(EXEODIR)/dirwrap.o \ diff --git a/src/sbbs3/Makefile b/src/sbbs3/Makefile index 54bfe4d2608b299d18194d6ada3fc506709cb50a..a64cea6e66184a6f5b07279b67f03197d8b3b6f1 100644 --- a/src/sbbs3/Makefile +++ b/src/sbbs3/Makefile @@ -189,6 +189,7 @@ $(ADDFILES): addfiles.c \ $(LIBODIR)\crc16.obj \ $(LIBODIR)\str_util.obj \ $(LIBODIR)\date_str.obj \ + $(LIBODIR)\userdat.obj \ dat_rec.c \ filedat.c \ genwrap.c \ diff --git a/src/sbbs3/addfiles.c b/src/sbbs3/addfiles.c index 80af7d5414b8aa5325c999f9d72473be31b367f9..dcf1077d945e2283bc6ef39ee0320082fbd900e0 100644 --- a/src/sbbs3/addfiles.c +++ b/src/sbbs3/addfiles.c @@ -37,9 +37,7 @@ #include "sbbs.h" -#define ADDFILES_VER "3.00" - -char *crlf="\r\n"; +#define ADDFILES_VER "3.01" scfg_t scfg; @@ -278,7 +276,7 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip) if(mode&FILE_ID) { for(i=0;i<scfg.total_fextrs;i++) - if(!stricmp(scfg.fextr[i]->ext,f.name+9)) + if(!stricmp(scfg.fextr[i]->ext,f.name+9) && chk_ar(&scfg,scfg.fextr[i]->ar,NULL)) break; if(i<scfg.total_fextrs) { sprintf(tmp,"%sFILE_ID.DIZ",scfg.temp_dir); @@ -481,7 +479,7 @@ void addlist(char *inpath, file_t f, uint dskip, uint sskip) if(mode&FILE_ID) { for(i=0;i<scfg.total_fextrs;i++) - if(!stricmp(scfg.fextr[i]->ext,f.name+9)) + if(!stricmp(scfg.fextr[i]->ext,f.name+9) && chk_ar(&scfg,scfg.fextr[i]->ar,NULL)) break; if(i<scfg.total_fextrs) { sprintf(tmp,"%sFILE_ID.DIZ",scfg.temp_dir); @@ -894,7 +892,7 @@ int main(int argc, char **argv) printf("%s %7lu %s\n",f.name,f.cdt,f.desc); if(mode&FILE_ID) { for(i=0;i<scfg.total_fextrs;i++) - if(!stricmp(scfg.fextr[i]->ext,f.name+9)) + if(!stricmp(scfg.fextr[i]->ext,f.name+9) && chk_ar(&scfg,scfg.fextr[i]->ar,NULL)) break; if(i<scfg.total_fextrs) { sprintf(tmp,"%sFILE_ID.DIZ",scfg.temp_dir); diff --git a/src/sbbs3/addfiles.dsp b/src/sbbs3/addfiles.dsp index ec017204d238b205ee0b2670e1b580eddf747350..bb134ba01e841d04b40521a5c1b19bcb37638696 100644 --- a/src/sbbs3/addfiles.dsp +++ b/src/sbbs3/addfiles.dsp @@ -136,5 +136,9 @@ SOURCE=.\scfglib2.c SOURCE=.\str_util.c # End Source File +# Begin Source File + +SOURCE=.\userdat.c +# End Source File # End Target # End Project