chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: make gcc shut up by passing a 0 mode param to open()
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index f56d2a2d33750534bfb7368e45b46b2ea790a67d..5b602ea46d4f1da3c843e977eab1a8317cad199c 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-1875,8
+1875,10
@@
int open_terminal(const char *name, int mode) {
* https://bugs.launchpad.net/ubuntu/+source/linux/+bug/554172/comments/245
*/
* https://bugs.launchpad.net/ubuntu/+source/linux/+bug/554172/comments/245
*/
+ assert(!(mode & O_CREAT));
+
for (;;) {
for (;;) {
- fd = open(name, mode);
+ fd = open(name, mode
, 0
);
if (fd >= 0)
break;
if (fd >= 0)
break;
@@
-3520,7
+3522,9
@@
DIR *xopendirat(int fd, const char *name, int flags) {
int nfd;
DIR *d;
int nfd;
DIR *d;
- nfd = openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags);
+ assert(!(flags & O_CREAT));
+
+ nfd = openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags, 0);
if (nfd < 0)
return NULL;
if (nfd < 0)
return NULL;