aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYunchih Chen <yunchih.cat@gmail.com>2019-04-04 21:16:56 +0800
committerYunchih Chen <yunchih.cat@gmail.com>2019-04-07 22:36:00 +0800
commit87f3262b61616634677e57d25798f27c82fb5465 (patch)
tree0b79589c2e9e8281ae740f890a58cad871fd51a1
parentce362d2cc493debf6f52117cb88547c224ea84bc (diff)
downloadnfcollect-87f3262b61616634677e57d25798f27c82fb5465.tar
nfcollect-87f3262b61616634677e57d25798f27c82fb5465.tar.gz
nfcollect-87f3262b61616634677e57d25798f27c82fb5465.tar.bz2
nfcollect-87f3262b61616634677e57d25798f27c82fb5465.tar.lz
nfcollect-87f3262b61616634677e57d25798f27c82fb5465.tar.xz
nfcollect-87f3262b61616634677e57d25798f27c82fb5465.tar.zst
nfcollect-87f3262b61616634677e57d25798f27c82fb5465.zip
Fix check_dir bug
-rw-r--r--bin/nfcollect.c2
-rw-r--r--lib/util.c11
2 files changed, 6 insertions, 7 deletions
diff --git a/bin/nfcollect.c b/bin/nfcollect.c
index 52791f8..1772c60 100644
--- a/bin/nfcollect.c
+++ b/bin/nfcollect.c
@@ -119,7 +119,7 @@ int main(int argc, char *argv[]) {
g.compression_type = get_compression(compression_flag);
if (check_basedir_exist(storage) < 0)
- FATAL("Storage directory does not exist");
+ FATAL("Storage directory: %s does not exist", storage);
// register signal handler
if (signal(SIGHUP, sig_handler) == SIG_ERR)
diff --git a/lib/util.c b/lib/util.c
index ef5238f..5a9076f 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -17,13 +17,12 @@ int check_file_size(const char *storage) {
int check_basedir_exist(const char *storage) {
char *_storage = strdup(storage);
char *basedir = dirname(_storage);
- free(_storage);
- struct stat d;
- if (stat(basedir, &d) != 0 || !S_ISDIR(d.st_mode)) {
- return -1;
- }
- return 0;
+ struct stat d; int ret = 0;
+ if (stat(basedir, &d) != 0 || !S_ISDIR(d.st_mode))
+ ret = -1;
+ free(_storage);
+ return ret;
}
enum CompressionType get_compression(const char *flag) {