mirror of
https://github.com/cathugger/mkp224o.git
synced 2025-12-05 21:27:13 -06:00
correctly handle filter file loading error, small tweak
This commit is contained in:
@@ -496,10 +496,12 @@ static void filters_prepare(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void loadfilterfile(const char *fname)
|
||||
static bool loadfilterfile(const char *fname)
|
||||
{
|
||||
char buf[128];
|
||||
FILE *f = fopen(fname,"r");
|
||||
if (!f)
|
||||
return false;
|
||||
while (fgets(buf,sizeof(buf),f)) {
|
||||
for (char *p = buf;*p;++p) {
|
||||
if (*p == '\n') {
|
||||
@@ -510,4 +512,5 @@ static void loadfilterfile(const char *fname)
|
||||
if (*buf && *buf != '#' && memcmp(buf,"//",2) != 0)
|
||||
filters_add(buf);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
1
ioutil.c
1
ioutil.c
@@ -95,6 +95,7 @@ int closefile(FH fd)
|
||||
int createdir(const char *path,int secret)
|
||||
{
|
||||
// XXX don't know how to handle secret argument
|
||||
(void) secret;
|
||||
return CreateDirectoryA(path,0) ? 0 : -1;
|
||||
}
|
||||
|
||||
|
||||
10
main.c
10
main.c
@@ -3,6 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <pthread.h>
|
||||
@@ -256,8 +257,13 @@ int main(int argc,char **argv)
|
||||
exit(0);
|
||||
}
|
||||
else if (*arg == 'f') {
|
||||
if (argc--)
|
||||
loadfilterfile(*argv++);
|
||||
if (argc--) {
|
||||
const char *filename = *argv++;
|
||||
if (!loadfilterfile(filename)) {
|
||||
fprintf(stderr,"failed to load filter file %s\n",filename);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
else
|
||||
e_additional();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user