move some more data/log paths missed before

diff --git a/core/error.c b/core/error.c
index 5e4e02c2b25f3e9c2b1524bc8eb41b395f0860d0..6bc221cf1c8c06011c74be2ceb196688e1536566 100644 (file)
--- a/core/error.c
+++ b/core/error.c
@@ -40,11 +40,11 @@ void reopen_logfile(int hooknum, void *arg) {
   if (logfile)
     fclose(logfile);
   
-  logfile=fopen("newserv.log","a");
+  logfile=fopen("log/newserv.log","a");
 }
 
 void init_logfile() {
-  logfile=fopen("newserv.log","a");
+  logfile=fopen("log/newserv.log","a");
   registerhook(HOOK_CORE_SIGUSR1, reopen_logfile);
 }
 

diff --git a/proxyscan/proxyscan.c b/proxyscan/proxyscan.c
index 776d483e8aba44380668b45e0c7e7f8d97293e7b..b1663f1f7c4e99b0ac7e5c1927c360ca23f1edbf 100644 (file)
--- a/proxyscan/proxyscan.c
+++ b/proxyscan/proxyscan.c
@@ -256,7 +256,7 @@ void _init(void) {
   /* Schedule saves */
   schedulerecurring(time(NULL)+3600,0,3600,&dumpcachehosts,NULL);
 
-  ps_logfile=fopen("proxyscan.log","a");
+  ps_logfile=fopen("log/proxyscan.log","a");
 }
 
 void registerproxyscannick(void *arg) {

diff --git a/proxyscan/proxyscancache.c b/proxyscan/proxyscancache.c
index 81dd5f2f5e61ab415a840fabd8da099bc9f68f91..8c51ac79d369f501afa9be952a75089d1bef1de4 100644 (file)
--- a/proxyscan/proxyscancache.c
+++ b/proxyscan/proxyscancache.c
@@ -75,7 +75,7 @@ void dumpcachehosts(void *arg) {
   foundproxy *fpp;
   patricia_node_t *node;
 
-  if ((fp=fopen("cleanhosts","w"))==NULL) {
+  if ((fp=fopen("data/cleanhosts","w"))==NULL) {
     Error("proxyscan",ERR_ERROR,"Unable to open cleanhosts file for writing!");
     return;
   }
@@ -129,7 +129,7 @@ void loadcachehosts() {
   unsigned char bits;
   patricia_node_t *node;
 
-  if ((fp=fopen("cleanhosts","r"))==NULL) {
+  if ((fp=fopen("data/cleanhosts","r"))==NULL) {
     Error("proxyscan",ERR_ERROR,"Unable to open cleanhosts file for reading!");
     return;
   }

diff --git a/proxyscan/proxyscanext.c b/proxyscan/proxyscanext.c
index 81e6871f09bfa880eb320ac140d6e9cc37560ae5..23438c235dc328fc8d37429452387548bd027d8c 100644 (file)
--- a/proxyscan/proxyscanext.c
+++ b/proxyscan/proxyscanext.c
@@ -53,7 +53,7 @@ void loadextrascans() {
   unsigned char bits;
   patricia_node_t *node;
 
-  if ((fp=fopen("ports.txt","r"))==NULL) {
+  if ((fp=fopen("data/ports.txt","r"))==NULL) {
     Error("proxyscan",ERR_ERROR,"Unable to open ports file for reading!");
     return;
   }

diff --git a/qabot/qabot_dbase.c b/qabot/qabot_dbase.c
index 987abf5dd782865464b9e84e9218bb181be5000e..4bd50c58b02d84a47d88cf4028b281513fb2af67 100644 (file)
--- a/qabot/qabot_dbase.c
+++ b/qabot/qabot_dbase.c
@@ -21,7 +21,7 @@ void qabot_loaddb() {
   time_t created;
   flag_t flags;
   
-  if (!(f = fopen("qab_users", "r")))
+  if (!(f = fopen("data/qab_users", "r")))
     return;
   
   while (!feof(f)) {
@@ -41,7 +41,7 @@ void qabot_loaddb() {
   
   fclose(f);
   
-  if (!(f = fopen("qab_bots", "r")))
+  if (!(f = fopen("data/qab_bots", "r")))
     return;
   
   while (!feof(f)) {
@@ -65,7 +65,7 @@ void qabot_savedb() {
   qab_user* u;
   qab_bot* b;
   
-  if (!(f = fopen("qab_users", "w")))
+  if (!(f = fopen("data/qab_users", "w")))
     return;
   
   for (u = qabot_users; u; u = u->next)
@@ -73,7 +73,7 @@ void qabot_savedb() {
   
   fclose(f);
   
-  if (!(f = fopen("qab_bots", "w")))
+  if (!(f = fopen("data/qab_bots", "w")))
     return;
   
   for (b = qab_bots; b; b = b->next)