[Glibc-bsd-commits] r5378 - trunk/glibc-ports/kfreebsd

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-24 21:11:37 +0000 (Fri, 24 Jan 2014)
New Revision: 5378

Added:
   trunk/glibc-ports/kfreebsd/shm_open.c
Modified:
   trunk/glibc-ports/kfreebsd/Makefile
   trunk/glibc-ports/kfreebsd/syscalls.list
Log:
Remove O_CLOEXEC flag in shm_open().

O_CLOEXEC never has any effect on shm_open(). However, old kernel
versions (prior to rev 261138 in HEAD) return EINVAL when this
(otherwise harmless) flag is used.



Modified: trunk/glibc-ports/kfreebsd/Makefile
===================================================================
--- trunk/glibc-ports/kfreebsd/Makefile	2014-01-23 13:03:58 UTC (rev 5377)
+++ trunk/glibc-ports/kfreebsd/Makefile	2014-01-24 21:11:37 UTC (rev 5378)
@@ -132,3 +132,7 @@
 ifeq ($(subdir),sunrpc)
 sysdep_headers += nfs/nfs.h
 endif
+
+ifeq ($(subdir),rt)
+librt-routines += sys_shm_open
+endif

Added: trunk/glibc-ports/kfreebsd/shm_open.c
===================================================================
--- trunk/glibc-ports/kfreebsd/shm_open.c	                        (rev 0)
+++ trunk/glibc-ports/kfreebsd/shm_open.c	2014-01-24 21:11:37 UTC (rev 5378)
@@ -0,0 +1,40 @@
+/* Copyright (C) 2014 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <sysdep.h>
+
+extern int __syscall_shm_open (const char *name, int flag, mode_t mode);
+libc_hidden_proto (__syscall_shm_open)
+
+int
+shm_open (name, flag, mode)
+     const char *name;
+     int flag;
+     mode_t mode;
+{
+  /*
+   * O_CLOEXEC never has any effect on shm_open(). However, old kernel
+   * versions (prior to rev 261138 in HEAD) return EINVAL when this
+   * (otherwise harmless) flag is used.
+   */
+  flag &= ~O_CLOEXEC;
+
+  return INLINE_SYSCALL (shm_open, 3, name, flag, mode);
+}

Modified: trunk/glibc-ports/kfreebsd/syscalls.list
===================================================================
--- trunk/glibc-ports/kfreebsd/syscalls.list	2014-01-23 13:03:58 UTC (rev 5377)
+++ trunk/glibc-ports/kfreebsd/syscalls.list	2014-01-24 21:11:37 UTC (rev 5378)
@@ -168,7 +168,7 @@
 setrlimit		-	setrlimit		i:ip		__setrlimit setrlimit setrlimit64
 setsid			-	setsid			i:		__setsid setsid
 setuid			-	setuid			i:i		__setuid setuid
-shm_open		-	shm_open		i:sii		shm_open
+sys_shm_open		-	shm_open		i:sii		__syscall_shm_open
 shm_unlink		-	shm_unlink		i:s		shm_unlink
 shmat			-	shmat			i:iai		shmat
 sys_shmctl		-	shmctl			i:iip		__syscall_shmctl