www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Use apr_temp_dir_get() to get the temporary directory

Browse Source 
Submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bradley Nicholes
2004-03-17 00:04:35 +00:00
parent 678376c6a4
commit 5095c3880c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
support/htdigest.c
View File

@@ -208,6 +208,7 @@ int main(int argc, const char * const argv[])
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 @@ int main(int argc, const char * const argv[])
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 @@ int main(int argc, const char * const argv[])
}
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);