always use the same code for creating temporary files

Let's unify our code here, and also always specifiy O_CLOEXEC.
This commit is contained in:
Lennart Poettering
2014-01-28 13:47:35 +01:00
parent 7736202ce9
commit 2d5bdf5bc0
10 changed files with 43 additions and 30 deletions
+1 -4
View File
@@ -325,10 +325,7 @@ int ask_password_agent(
mkdir_p_label("/run/systemd/ask-password", 0755);
RUN_WITH_UMASK(0022) {
fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);
}
fd = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC);
if (fd < 0) {
log_error("Failed to create password file: %m");
r = -errno;
+6 -2
View File
@@ -3893,7 +3893,7 @@ int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
t[k] = '.';
stpcpy(stpcpy(t+k+1, fn), "XXXXXX");
fd = mkostemp(t, O_WRONLY|O_CLOEXEC);
fd = mkostemp_safe(t, O_WRONLY|O_CLOEXEC);
if (fd < 0) {
free(t);
return -errno;
@@ -6115,11 +6115,15 @@ int mkostemp_safe(char *pattern, int flags) {
unsigned long tries = TMP_MAX;
char *s;
int r;
_cleanup_umask_ mode_t u;
assert(pattern);
u = umask(077);
/* This is much like like mkostemp() but avoids using any
* static variables, thus is async signal safe */
* static variables, thus is async signal safe. Also, it's not
* subject to umask(). */
s = endswith(pattern, "XXXXXX");
if (!s)