Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
c60cf944
Commit
c60cf944
authored
Oct 31, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fs/io/FileOutputStream: add macro HAVE_O_TMPFILE
parent
4b8ee586
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
FileOutputStream.cxx
src/fs/io/FileOutputStream.cxx
+6
-6
FileOutputStream.hxx
src/fs/io/FileOutputStream.hxx
+5
-1
No files found.
src/fs/io/FileOutputStream.cxx
View file @
c60cf944
...
...
@@ -138,7 +138,7 @@ FileOutputStream::Cancel() noexcept
#include <unistd.h>
#include <errno.h>
#ifdef
__linux__
#ifdef
HAVE_O_TMPFILE
#ifndef O_TMPFILE
/* supported since Linux 3.11 */
#define __O_TMPFILE 020000000
...
...
@@ -159,12 +159,12 @@ OpenTempFile(FileDescriptor &fd, Path path)
return
fd
.
Open
(
directory
.
c_str
(),
O_TMPFILE
|
O_WRONLY
,
0666
);
}
#endif
/*
__linux__
*/
#endif
/*
HAVE_O_TMPFILE
*/
inline
void
FileOutputStream
::
OpenCreate
(
bool
visible
)
{
#ifdef
__linux__
#ifdef
HAVE_O_TMPFILE
/* try Linux's O_TMPFILE first */
is_tmpfile
=
!
visible
&&
OpenTempFile
(
fd
,
GetPath
());
if
(
!
is_tmpfile
)
{
...
...
@@ -175,7 +175,7 @@ FileOutputStream::OpenCreate(bool visible)
0666
))
throw
FormatErrno
(
"Failed to create %s"
,
GetPath
().
c_str
());
#ifdef
__linux__
#ifdef
HAVE_O_TMPFILE
}
#else
(
void
)
visible
;
...
...
@@ -218,7 +218,7 @@ FileOutputStream::Commit()
{
assert
(
IsDefined
());
#ifdef
__linux__
#ifdef
HAVE_O_TMPFILE
if
(
is_tmpfile
)
{
unlink
(
GetPath
().
c_str
());
...
...
@@ -251,7 +251,7 @@ FileOutputStream::Cancel() noexcept
switch
(
mode
)
{
case
Mode
:
:
CREATE
:
#ifdef
__linux__
#ifdef
HAVE_O_TMPFILE
if
(
!
is_tmpfile
)
#endif
unlink
(
GetPath
().
c_str
());
...
...
src/fs/io/FileOutputStream.hxx
View file @
c60cf944
...
...
@@ -46,6 +46,10 @@
#include <windows.h>
#endif
#ifdef __linux__
#define HAVE_O_TMPFILE
#endif
class
Path
;
class
FileOutputStream
final
:
public
OutputStream
{
...
...
@@ -57,7 +61,7 @@ class FileOutputStream final : public OutputStream {
FileDescriptor
fd
=
FileDescriptor
::
Undefined
();
#endif
#ifdef
__linux__
#ifdef
HAVE_O_TMPFILE
/**
* Was O_TMPFILE used? If yes, then linkat() must be used to
* create a link to this file.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment