summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2012-01-20 22:40:10 (UTC)
committer Michael Krelin <hacker@klever.net>2012-01-20 22:40:10 (UTC)
commit8035dab48b39f1b0bb9e7aba5ce69fbf59259406 (patch) (side-by-side diff)
treeaca1c9d7cf86d1194cca595c9e84bb0e374fdc07
parent55df23325d4305ea547331e64ca660ba906dc0e6 (diff)
downloadiii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.zip
iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.tar.gz
iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.tar.bz2
more startup sanity checks
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--NEWS.xml1
-rw-r--r--src/iiid.cc11
2 files changed, 12 insertions, 0 deletions
diff --git a/NEWS.xml b/NEWS.xml
index e37cd46..0c6ff09 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -5,2 +5,3 @@
<ni>report the lack of config file for the card</ni>
+ <ni>do some startup checks for config files</ni>
<ni>Extended list of supported file types</ni>
diff --git a/src/iiid.cc b/src/iiid.cc
index c026050..d655fe3 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -2,2 +2,4 @@
#include <getopt.h>
+#include <sys/stat.h>
+#include <glob.h>
#include <iostream>
@@ -76,2 +78,11 @@ int main(int argc,char **argv) try {
+ struct stat st;
+ if(stat(EYEKIN_CONF_DIR,&st) || !S_ISDIR(st.st_mode))
+ syslog(LOG_WARNING,"configuration directory '%s' does not exist or is not a directory",EYEKIN_CONF_DIR);
+ glob_t g; int rg = glob(EYEKIN_CONF_DIR"/????????????.conf",GLOB_NOSORT,NULL,&g);
+ if(rg || !g.gl_pathc)
+ syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR);
+ else
+ globfree(&g);
+
eyefiworker().run(port);