* Ported [2651] to 1.2.9 (Use datadir now, addresses #162)

svn: 2652

src/chanprog.c

@@ -324,6 +324,8 @@ void tell_verbose_status(int idx)
   dprintf(idx, "uid: %s (%d) pid: %d homedir: %s\n", conf.username, conf.uid, mypid, conf.homedir);
   if (tempdir[0])
     dprintf(idx, "Tempdir     : %s\n", tempdir);
+  if (conf.datadir)
+    dprintf(idx, "Datadir     : %s\n", conf.datadir);
 }
 
 /* Show all internal state variables

src/conf.c

@@ -390,7 +390,7 @@ checkpid(const char *nick, conf_bot *bot)
 
   tmpnick = tmp_ptr = strdup(nick);
 
-  simple_snprintf(buf, sizeof buf, "%s.pid.%s", tempdir, tmpnick);
+  simple_snprintf(buf, sizeof buf, "%s/.pid.%s", conf.datadir, tmpnick);
   free(tmp_ptr);
 
   if (bot && !(bot->pid_file))

src/misc.c

@@ -781,7 +781,7 @@ int updatebin(int idx, char *par, int secs)
 
   /* make a backup just in case. */
 
-  simple_snprintf(buf, sizeof(buf), "%s.bin.old", tempdir);
+  simple_snprintf(buf, sizeof(buf), "%s/.bin.old", conf.datadir);
   copyfile(binname, buf);
 
   write_settings(path, -1, 0);	/* re-write the binary with our packdata */

src/shell.c

@@ -752,7 +752,7 @@ void baduname(char *confhas, char *myuname) {
 
   tmpFile = (char *) my_calloc(1, strlen(tempdir) + 3 + 1);
 
-  simple_sprintf(tmpFile, "%s.un", tempdir);
+  simple_sprintf(tmpFile, "%s/.un", conf.datadir);
   sdprintf("CHECKING %s", tmpFile);
   if (is_file(tmpFile)) {
     struct stat ss;

src/userrec.c

@@ -486,7 +486,7 @@ int write_userfile(int idx)
   }
   fclose(f);
   putlog(LOG_DEBUG, "@", "Done writing userfile.");
-  simple_snprintf(backup, sizeof backup, "%s%s~", tempdir, userfile);
+  simple_snprintf(backup, sizeof backup, "%s/%s~", conf.datadir, userfile);
   copyfile(userfile, backup);
   movefile(new_userfile, userfile);
   free(new_userfile);

src/users.c

@@ -522,8 +522,8 @@ void backup_userfile()
   char s[DIRMAX] = "", s2[DIRMAX] = "";
 
   putlog(LOG_MISC, "*", "Backing up user file...");
-  simple_snprintf(s, sizeof s, "%s.u.0", tempdir);
-  simple_snprintf(s2, sizeof s2, "%s.u.1", tempdir);
+  simple_snprintf(s, sizeof s, "%s/.u.0", conf.datadir);
+  simple_snprintf(s2, sizeof s2, "%s/.u.1", conf.datadir);
   movefile(s, s2);
   copyfile(userfile, s);
 }