tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "tmpfile(3): use O_TMPFILE where available." am: 0361a4f867

Browse source 
Change-Id: I0ca34240eccd9f294d3eeffd1cc889232ad9083b
This commit is contained in:
Elliott Hughes 2020-04-18 00:01:45 +00:00 committed by Automerger Merge Worker
commit a77458c6f4
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
libc/bionic/tmpfile.cpp
View file

@ -31,6 +31,7 @@
*/
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@ -39,48 +40,48 @@
#include <unistd.h>
#include "private/ErrnoRestorer.h"
#include "private/ScopedSignalBlocker.h"
static FILE* __tmpfile_dir(const char* tmp_dir) {
static FILE* __fd_to_fp(int fd) {
FILE* fp = fdopen(fd, "w+");
if (fp != nullptr) return fp;
ErrnoRestorer errno_restorer;
close(fd);
return nullptr;
}
static FILE* __tmpfile_dir_legacy(const char* tmp_dir) {
char* path = nullptr;
if (asprintf(&path, "%s/tmp.XXXXXXXXXX", tmp_dir) == -1) {
return nullptr;
}
int fd;
{
ScopedSignalBlocker ssb;
fd = mkstemp(path);
if (fd == -1) {
free(path);
return nullptr;
}
// Unlink the file now so that it's removed when closed.
unlink(path);
int fd = mkstemp(path);
if (fd == -1) {
free(path);
// Can we still use the file now it's unlinked?
// File systems without hard link support won't have the usual Unix semantics.
struct stat sb;
int rc = fstat(fd, &sb);
if (rc == -1) {
ErrnoRestorer errno_restorer;
close(fd);
return nullptr;
}
return nullptr;
}
// Turn the file descriptor into a FILE*.
FILE* fp = fdopen(fd, "w+");
if (fp != nullptr) {
return fp;
// Unlink the file now so that it's removed when closed.
unlink(path);
free(path);
// Can we still use the file now it's unlinked?
// File systems without hard link support won't have the usual Unix semantics.
struct stat sb;
if (fstat(fd, &sb) == -1) {
ErrnoRestorer errno_restorer;
close(fd);
return nullptr;
}
// Failure. Clean up. We already unlinked, so we just need to close.
ErrnoRestorer errno_restorer;
close(fd);
return nullptr;
return __fd_to_fp(fd);
}
static FILE* __tmpfile_dir(const char* tmp_dir) {
int fd = open(tmp_dir, O_TMPFILE | O_RDWR, S_IRUSR | S_IWUSR);
if (fd == -1) return __tmpfile_dir_legacy(tmp_dir);
return __fd_to_fp(fd);
}
FILE* tmpfile() {