Skip to content

Allow using $TMPDIR to create temporary files #2393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rmetrich wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −3
Open

Allow using $TMPDIR to create temporary files #2393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/common/oscap_acquire.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
#define OSCAP_TEMP_DIR "/tmp"
#endif

#define TEMP_DIR_TEMPLATE OSCAP_TEMP_DIR "/oscap.XXXXXX"
#define OSCAP_TEMP_DIR_TEMPLATE "/oscap.XXXXXX"
#define TEMP_DIR_TEMPLATE OSCAP_TEMP_DIR OSCAP_TEMP_DIR_TEMPLATE
#define TEMP_URL_TEMPLATE "downloaded.XXXXXX"

#ifdef OS_WINDOWS
Expand Down Expand Up @@ -115,10 +116,22 @@ char *oscap_acquire_temp_dir()
#else
char *oscap_acquire_temp_dir()
{
char *temp_dir = oscap_strdup(TEMP_DIR_TEMPLATE);
char *temp_dir;
const char *tmpdir = getenv("TMPDIR");
if (tmpdir != NULL && tmpdir[0] != '\0') {
const size_t len = strlen(tmpdir) + strlen(OSCAP_TEMP_DIR_TEMPLATE) + 1;
temp_dir = malloc(len);
if (temp_dir == NULL) {
oscap_seterr(OSCAP_EFAMILY_GLIBC, "Could not allocate memory for temp directory path.");
return NULL;
}
snprintf(temp_dir, len, "%s%s", tmpdir, OSCAP_TEMP_DIR_TEMPLATE);
} else {
temp_dir = oscap_strdup(TEMP_DIR_TEMPLATE);
}
if (mkdtemp(temp_dir) == NULL) {
oscap_seterr(OSCAP_EFAMILY_GLIBC, "Could not create temp directory %s. %s", temp_dir, strerror(errno));
free(temp_dir);
oscap_seterr(OSCAP_EFAMILY_GLIBC, "Could not create temp directory " TEMP_DIR_TEMPLATE ". %s", strerror(errno));
return NULL;
}
return temp_dir;
Expand Down
Loading