r4841 - in glibc-package/trunk/debian: . patches/hurd-i386
Author: sthibault
Date: 2011-08-01 20:37:38 +0000 (Mon, 01 Aug 2011)
New Revision: 4841
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff
Log:
patches/hurd-i386/submitted-sysvshm.diff: Fix shm creation: do not create file on first lookup.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-01 11:42:53 UTC (rev 4840)
+++ glibc-package/trunk/debian/changelog 2011-08-01 20:37:38 UTC (rev 4841)
@@ -1,10 +1,15 @@
eglibc (2.13-14) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Remove amd64 biarch includes from libc6-dev:i386. Closes: #636115,
#636116.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 31 Jul 2011 14:00:59 +0200
+ [ Samuel Thibault ]
+ * patches/hurd-i386/submitted-sysvshm.diff: Fix shm creation: do not create
+ file on first lookup.
+ -- Samuel Thibault <sthibault@debian.org> Mon, 01 Aug 2011 22:36:14 +0200
+
eglibc (2.13-13) unstable; urgency=low
* sysdeps/*.mk: install the biarch includes in /usr/include instead
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff 2011-08-01 11:42:53 UTC (rev 4840)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff 2011-08-01 20:37:38 UTC (rev 4841)
@@ -517,7 +517,7 @@
+weak_alias(__shmdt, shmdt)
--- /dev/null
+++ b/sysdeps/mach/hurd/shmget.c
-@@ -0,0 +1,245 @@
+@@ -0,0 +1,242 @@
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -674,14 +674,11 @@
+ error_t err = 0;
+ char filename[sizeof (SHM_DIR) - 1 + SHM_NAMEMAX];
+ int fd = -1;
-+ int create_flag;
-+
-+ create_flag = (shmflags & IPC_CREAT) ? O_CREAT : 0;
+ sprintf (filename, SHM_DIR SHM_NAMEPRI, key);
+
+ do
+ {
-+ fd = __open (filename, O_NORW | create_flag, shmflags & 0777);
++ fd = __open (filename, O_NORW, shmflags & 0777);
+
+ if (fd < 0 && errno != ENOENT)
+ /* We give up. */
@@ -710,7 +707,7 @@
+ else
+ {
+ /* The memory segment doesn't exist. */
-+ if (create_flag)
++ if (shmflags & IPC_CREAT)
+ {
+ /* Try to create it exclusively. */
+ err = get_exclusive (shmflags, size, &key, &fd);
Reply to: