@@ -750,11 +750,8 @@ static fc_error_t initialize(struct optstruct *opts)

     cl_error_t cl_init_retcode;

     fc_config fcConfig;

     char *tempDirectory = NULL;

-    size_t tempDirectoryLen;

     const struct optstruct *logFileOpt = NULL;

-    STATBUF statbuf;

-

     memset(&fcConfig, 0, sizeof(fc_config));

     if (NULL == opts) {

@@ -862,25 +859,9 @@ static fc_error_t initialize(struct optstruct *opts)

     fcConfig.databaseDirectory = optget(opts, "DatabaseDirectory")->strarg;

     /* Select a path for the temp directory:  databaseDirectory/tmp */

-    tempDirectoryLen = strlen(fcConfig.databaseDirectory) + strlen(PATHSEP) + strlen("tmp") + 1; /* mdir/fname\0 */

-    tempDirectory    = (char *)cli_calloc(tempDirectoryLen, sizeof(char));

-    if (!tempDirectory) {

-        mprintf("!initialize: out of memory\n");

-        status = FC_EMEM;

-        goto done;

-    }

-    snprintf(tempDirectory, tempDirectoryLen, "%s" PATHSEP "tmp", fcConfig.databaseDirectory);

+    tempDirectory = cli_gentemp_with_prefix(fcConfig.databaseDirectory, "tmp");

     fcConfig.tempDirectory = tempDirectory;

-    if (LSTAT(tempDirectory, &statbuf) == -1) {

-        if (0 != mkdir(tempDirectory, 0755)) {

-            logg("!Can't create temporary directory %s\n", tempDirectory);

-            logg("Hint: The database directory must be writable for UID %d or GID %d\n", getuid(), getgid());

-            status = FC_EDBDIRACCESS;

-            goto done;

-        }

-    }

-

     /* Store the path of the temp directory so we can delete it later. */

     strncpy(g_freshclamTempDirectory, fcConfig.tempDirectory, sizeof(g_freshclamTempDirectory));

     g_freshclamTempDirectory[sizeof(g_freshclamTempDirectory) - 1] = '\0';

@@ -1411,6 +1392,8 @@ fc_error_t perform_database_update(

     uint32_t nUpdated      = 0;

     uint32_t nTotalUpdated = 0;

+    STATBUF statbuf;

+

     if (NULL == serverList) {

         mprintf("!perform_database_update: Invalid arguments.\n");

         goto done;

@@ -1437,6 +1420,18 @@ fc_error_t perform_database_update(

      */

     (void)fc_dns_query_update_info(dnsUpdateInfoServer, &dnsUpdateInfo, &newVersion);

+    /*

+     * Create a temp directory to use for the update process.

+     */

+    if (LSTAT(g_freshclamTempDirectory, &statbuf) == -1) {

+        if (0 != mkdir(g_freshclamTempDirectory, 0755)) {

+            logg("!Can't create temporary directory %s\n", g_freshclamTempDirectory);

+            logg("Hint: The database directory must be writable for UID %d or GID %d\n", getuid(), getgid());

+            status = FC_EDBDIRACCESS;

+            goto done;

+        }

+    }

+

     if ((NULL != databaseList) && (0 < nDatabases)) {

         /*

         * Download/update the desired official databases.

@@ -1497,6 +1492,12 @@ fc_error_t perform_database_update(

 done:

+    if (LSTAT(g_freshclamTempDirectory, &statbuf) != -1) {

+        /* Remove temp directory */

+        if (*g_freshclamTempDirectory) {

+            cli_rmdirs(g_freshclamTempDirectory);

+        }

+    }

     if (NULL != dnsUpdateInfo) {

         free(dnsUpdateInfo);

     }

@@ -235,17 +235,6 @@ fc_error_t fc_initialize(fc_config *fcConfig)

         goto done;

     }

-    /* Validate that the temp directory exists, and store it. */

-    if (LSTAT(fcConfig->tempDirectory, &statbuf) == -1) {

-        logg("!Temp directory does not exist: %s\n", fcConfig->tempDirectory);

-        status = FC_EDIRECTORY;

-        goto done;

-    }

-    if (!S_ISDIR(statbuf.st_mode)) {

-        logg("!Temp directory is not a directory: %s\n", fcConfig->tempDirectory);

-        status = FC_EDIRECTORY;

-        goto done;

-    }

     g_tempDirectory = cli_strdup(fcConfig->tempDirectory);

     g_maxAttempts    = fcConfig->maxAttempts;