svn: 1847

src/main.c

@@ -640,9 +640,9 @@ printf("out: %s\n", out);
   }
 
   /* setup initial tempdir as ./ until we read in tmpdir from conf */
-  egg_snprintf(tempdir, sizeof(tempdir), "./");
 
   binname = getfullbinname(argv[0]);
+  egg_snprintf(tempdir, sizeof(tempdir), "%s/", dirname(binname));
   chdir(dirname(binname));
 
   check_tempdir();	/* make sure directory exists and we can access it */

src/misc_file.c

@@ -216,15 +216,13 @@ void check_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);
-  }
+  Tempfile *testdir = new Tempfile("test");
+  int result;
+
+  fprintf(testdir->f, "\n");
+  result = fflush(testdir->f);
+  delete testdir;
+  if (result)
+    fatal(strerror(errno), 0);
 }