[hurd,commited] hurd: Add missing fcntl-internal.h

Message ID 20180128160729.22510-1-samuel.thibault@ens-lyon.org
State New
Headers show
Series
  • [hurd,commited] hurd: Add missing fcntl-internal.h
Related show

Commit Message

Samuel Thibault Jan. 28, 2018, 4:07 p.m.
From: Thomas Schwinge <thomas@schwinge.name>


	* hurd/fcntl-internal.h: New file.
---
 ChangeLog             |  4 ++++
 hurd/fcntl-internal.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 hurd/fcntl-internal.h

-- 
2.15.1

Comments

Rafal Luzynski Jan. 29, 2018, 11:54 a.m. | #1
28.01.2018 17:07 Samuel Thibault <samuel.thibault@ens-lyon.org> wrote:
>

>

> From: Thomas Schwinge <thomas@schwinge.name>

>

> * hurd/fcntl-internal.h: New file.

> ---

> ChangeLog | 4 ++++

> hurd/fcntl-internal.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++

> 2 files changed, 66 insertions(+)

> create mode 100644 hurd/fcntl-internal.h

>

> diff --git a/ChangeLog b/ChangeLog

> index 49bdd47601..434fef785d 100644

> --- a/ChangeLog

> +++ b/ChangeLog

> @@ -52,6 +52,10 @@

> * sysdeps/mach/hurd/check_native.c: New file.

> * sysdeps/mach/hurd/check_pf.c: New file.

>

> +2008-12-18 Thomas Schwinge <tschwinge@gnu.org>


Is this really 2008 or a typo?

Regards,

Rafal
Samuel Thibault Jan. 29, 2018, 2:16 p.m. | #2
Rafal Luzynski, on lun. 29 janv. 2018 12:54:59 +0100, wrote:
> 28.01.2018 17:07 Samuel Thibault <samuel.thibault@ens-lyon.org> wrote:

> > * hurd/fcntl-internal.h: New file.

> > ---

> > ChangeLog | 4 ++++

> > hurd/fcntl-internal.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++

> > 2 files changed, 66 insertions(+)

> > create mode 100644 hurd/fcntl-internal.h

> >

> > diff --git a/ChangeLog b/ChangeLog

> > index 49bdd47601..434fef785d 100644

> > --- a/ChangeLog

> > +++ b/ChangeLog

> > @@ -52,6 +52,10 @@

> > * sysdeps/mach/hurd/check_native.c: New file.

> > * sysdeps/mach/hurd/check_pf.c: New file.

> >

> > +2008-12-18 Thomas Schwinge <tschwinge@gnu.org>

> 

> Is this really 2008 or a typo?


That fcntl-internal.h code is really from 2008.  Just nobody had taken
the time to upstream it so far.

Samuel
Joseph Myers Jan. 29, 2018, 4:39 p.m. | #3
On Mon, 29 Jan 2018, Samuel Thibault wrote:

> > > +2008-12-18 Thomas Schwinge <tschwinge@gnu.org>

> > 

> > Is this really 2008 or a typo?

> 

> That fcntl-internal.h code is really from 2008.  Just nobody had taken

> the time to upstream it so far.


ChangeLog dates should be commit dates rather than possibly older dates 
when a patch was written, according to the GNU Coding Standards.

-- 
Joseph S. Myers
joseph@codesourcery.com

Patch

diff --git a/ChangeLog b/ChangeLog
index 49bdd47601..434fef785d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,10 @@ 
 	* sysdeps/mach/hurd/check_native.c: New file.
 	* sysdeps/mach/hurd/check_pf.c: New file.
 
+2008-12-18  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* hurd/fcntl-internal.h: New file.
+
 2018-01-27  James Clarke  <jrtc27@jrtc27.com>
 
 	* sysdeps/hppa/fpu/libm-test-ulps: Update.
diff --git a/hurd/fcntl-internal.h b/hurd/fcntl-internal.h
new file mode 100644
index 0000000000..d795e4089c
--- /dev/null
+++ b/hurd/fcntl-internal.h
@@ -0,0 +1,62 @@ 
+/* Helper functions for translating between O_* and SOCK_* flags.
+   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+
+#include <fcntl.h>
+#include <sys/socket.h>
+
+/* Do some compile-time checks for the SOCK_* constants, which we rely on.  */
+_Static_assert (SOCK_CLOEXEC == O_CLOEXEC,
+    "SOCK_CLOEXEC is assumed to be the same as O_CLOEXEC");
+_Static_assert (((SOCK_MAX - 1) | SOCK_TYPE_MASK) == SOCK_TYPE_MASK,
+    "SOCK_TYPE_MASK must contain SOCK_MAX - 1");
+_Static_assert ((SOCK_CLOEXEC & SOCK_TYPE_MASK) == 0,
+    "SOCK_TYPE_MASK must not contain SOCK_CLOEXEC");
+_Static_assert ((SOCK_NONBLOCK & SOCK_TYPE_MASK) == 0,
+    "SOCK_TYPE_MASK must not contain SOCK_NONBLOCK");
+
+
+/* Convert from SOCK_* flags to O_* flags.  */
+__extern_always_inline
+int
+sock_to_o_flags (int in)
+{
+  int out = 0;
+
+  if (in & SOCK_NONBLOCK)
+    out |= O_NONBLOCK;
+  /* Others are passed through unfiltered.  */
+  out |= in & ~(SOCK_NONBLOCK);
+
+  return out;
+}
+
+/* Convert from O_* flags to SOCK_* flags.  */
+__extern_always_inline
+int
+o_to_sock_flags (int in)
+{
+  int out = 0;
+
+  if (in & O_NONBLOCK)
+    out |= SOCK_NONBLOCK;
+  /* Others are passed through unfiltered.  */
+  out |= in & ~(O_NONBLOCK);
+
+  return out;
+}