Ver Fonte

* Moved check_tempdir() to misc_file.c

svn: 1823
Bryan Drewery há 21 anos atrás
pai
commit
38337c4d60
3 ficheiros alterados com 27 adições e 26 exclusões
  1. 0 26
      src/main.c
  2. 26 0
      src/misc_file.c
  3. 1 0
      src/misc_file.h

+ 0 - 26
src/main.c

@@ -536,32 +536,6 @@ static void core_halfhourly()
     write_userfile(-1);
 }
 
-static void check_tempdir()
-{
-  if (!can_stat(tempdir)) {
-    if (mkdir(tempdir,  S_IRUSR | S_IWUSR | S_IXUSR)) {
-      unlink(tempdir);
-      if (!can_stat(tempdir))
-        if (mkdir(tempdir, S_IRUSR | S_IWUSR | S_IXUSR))
-          werr(ERR_TMPSTAT);
-    }
-  }
-  if (fixmod(tempdir))
-    werr(ERR_TMPMOD);
-
-  /* test tempdir: it's vital */
-  {
-    Tempfile *testdir = new Tempfile("test");
-    int result;
-   
-    fprintf(testdir->f, "\n");
-    result = fflush(testdir->f);
-    delete testdir;
-    if (result)
-      fatal(strerror(errno), 0);
-  }
-}
-
 static void startup_checks(int hack) {
   /* for compatability with old conf files 
    * only check/use conf file if it exists and settings.uname is empty.

+ 26 - 0
src/misc_file.c

@@ -201,3 +201,29 @@ Tempfile::~Tempfile()
   delete[] file;
 }
 
+void check_tempdir()
+{
+  if (!can_stat(tempdir)) {
+    if (mkdir(tempdir,  S_IRUSR | S_IWUSR | S_IXUSR)) {
+      unlink(tempdir);
+      if (!can_stat(tempdir))
+        if (mkdir(tempdir, S_IRUSR | S_IWUSR | S_IXUSR))
+          werr(ERR_TMPSTAT);
+    }
+  }
+  if (fixmod(tempdir))
+    werr(ERR_TMPMOD);
+
+  /* test tempdir: it's vital */
+  {
+    Tempfile *testdir = new Tempfile("test");
+    int result;
+
+    fprintf(testdir->f, "\n");
+    result = fflush(testdir->f);
+    delete testdir;
+    if (result)
+      fatal(strerror(errno), 0);
+  }
+}
+

+ 1 - 0
src/misc_file.h

@@ -17,6 +17,7 @@ int can_lstat(const char *);
 int is_symlink(const char *);
 int is_dir(const char *);
 int fixmod(const char *);
+void check_tempdir();
 
 class Tempfile 
 {