[PATCH] htdigest.c - use apr_temp_dir_get() for getting temp dir

[Guenter Knauf]

Hi,
this patch makes htdigest use the apr_temp_dir_get() for getting the temp dir;

--- htdigest.c.orig     Mon Feb 09 21:59:50 2004
+++ htdigest.c          Sun Mar 14 19:07:20 2004
@@ -208,6 +208,7 @@
     apr_file_t *f;
     apr_status_t rv;
     char tn[] = "htdigest.tmp.XXXXXX";
+    char *dirname;
     char user[MAX_STRING_LEN];
     char realm[MAX_STRING_LEN];
     char line[MAX_STRING_LEN];
@@ -251,7 +252,14 @@
     else if (argc != 4)
        usage();
 
-    if (apr_file_mktemp(&tfp, tn,
+    if (apr_temp_dir_get((const char**)&dirname, cntxt) != APR_SUCCESS) {
+        fprintf(stderr, "%s: could not determine temp dir\n",
+                        argv[0]);
+        exit(1);
+    }
+    dirname = apr_psprintf(cntxt, "%s/%s", dirname, tn);
+
+    if (apr_file_mktemp(&tfp, dirname,
 #ifdef OMIT_DELONCLOSE
     APR_CREATE | APR_READ | APR_WRITE | APR_EXCL
 #else
@@ -296,15 +304,15 @@
     }
     apr_file_close(f);
 #if defined(OS2) || defined(WIN32)
-    sprintf(command, "copy \"%s\" \"%s\"", tn, argv[1]);
+    sprintf(command, "copy \"%s\" \"%s\"", dirname, argv[1]);
 #else
-    sprintf(command, "cp %s %s", tn, argv[1]);
+    sprintf(command, "cp %s %s", dirname, argv[1]);
 #endif
 
 #ifdef OMIT_DELONCLOSE
     apr_file_close(tfp);
     system(command);
-    apr_file_remove(tn, cntxt);
+    apr_file_remove(dirname, cntxt);
 #else
     system(command);
     apr_file_close(tfp);


Guenter.

htdigest.c.diff-1
Description: Binary data