From: Norbert Lange <nolange79@gmail.com>
To: xenomai@xenomai.org
Subject: [PATCH v2 1/1] cobalt: mode argument from open forwarded for O_TMPFILE
Date: Wed, 10 Apr 2019 16:25:18 +0200 [thread overview]
Message-ID: <20190410142518.12791-2-norbert.lange@andritz.com> (raw)
In-Reply-To: <20190410142518.12791-1-norbert.lange@andritz.com>
The optional mode argument (open is a vararg function),
was only be read and forwarded if the O_CREAT flag is set.
That is not complete, as O_TMPFILE will require this
argument aswell. Fixed in this commit, and a fallback definition
of O_TMPFILE is added, incase libcobalt is built against an
library lacking this macro.
Signed-off-by: Norbert Lange <norbert.lange@andritz.com>
---
lib/cobalt/rtdm.c | 10 ++++++++--
lib/cobalt/wrappers.c | 9 +++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/cobalt/rtdm.c b/lib/cobalt/rtdm.c
index 6b8898e70..176210ddc 100644
--- a/lib/cobalt/rtdm.c
+++ b/lib/cobalt/rtdm.c
@@ -30,6 +30,12 @@
#include <asm/xenomai/syscall.h>
#include "internal.h"
+/* support for very old c libraries not supporting O_TMPFILE */
+#ifndef O_TMPFILE
+#define O_TMPFILE (020000000 | 0200000)
+#endif
+
+
static inline int set_errno(int ret)
{
if (ret >= 0)
@@ -65,7 +71,7 @@ COBALT_IMPL(int, open, (const char *path, int oflag, ...))
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, int);
va_end(ap);
@@ -79,7 +85,7 @@ COBALT_IMPL(int, open64, (const char *path, int oflag, ...))
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, int);
va_end(ap);
diff --git a/lib/cobalt/wrappers.c b/lib/cobalt/wrappers.c
index 20ad63a61..323f60b92 100644
--- a/lib/cobalt/wrappers.c
+++ b/lib/cobalt/wrappers.c
@@ -44,6 +44,11 @@
#include <malloc.h>
#include <boilerplate/compiler.h>
+/* support for very old c libraries not supporting O_TMPFILE */
+#ifndef O_TMPFILE
+#define O_TMPFILE (020000000 | 0200000)
+#endif
+
/* sched */
__weak
int __real_pthread_setschedparam(pthread_t thread,
@@ -174,7 +179,7 @@ int __real_open(const char *path, int oflag, ...)
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, mode_t);
va_end(ap);
@@ -190,7 +195,7 @@ int __real_open64(const char *path, int oflag, ...)
mode_t mode = 0;
va_list ap;
- if (oflag & O_CREAT) {
+ if ((oflag & O_CREAT) || (oflag & O_TMPFILE) == O_TMPFILE) {
va_start(ap, oflag);
mode = va_arg(ap, mode_t);
va_end(ap);
--
2.20.1
next prev parent reply other threads:[~2019-04-10 14:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 14:25 Norbert Lange
2019-04-10 14:25 ` Norbert Lange [this message]
2019-04-10 14:32 ` [PATCH v2 1/1] cobalt: mode argument from open forwarded for O_TMPFILE Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190410142518.12791-2-norbert.lange@andritz.com \
--to=nolange79@gmail.com \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.