X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ipc.c;h=a9d7351ce6ddf1a416e2419440857cb3cee70eb9;hp=674d1cb01e5fae9c5ae2ecb8f8ceec92fa9faa62;hb=f012a742a9b342c51e3c6bef22eaab0f39cb9e46;hpb=1fcea504b3a8541d039c3e63491e158433b06875

diff --git a/ipc.c b/ipc.c
index 674d1cb0..a9d7351c 100644
--- a/ipc.c
+++ b/ipc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,7 +11,6 @@
 #include "ipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/sysctl.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -177,13 +176,21 @@ int shm_detach(void *addr)
 }
 
 # if defined __FreeBSD__ || defined __NetBSD__
+#include <sys/sysctl.h>
 # 	define SYSCTL_SHMMAX_VARIABLE "kern.ipc.shmmax"
-# elif defined __APPLE__
-# 	define SYSCTL_SHMMAX_VARIABLE "kern.sysv.shmmax"
 # else
 #	undef SYSCTL_SHMMAX_VARIABLE
 # endif
 
+/**
+ * Get the maximal size of a shared memory area.
+ *
+ * The value is only computed once when the function is called for the first
+ * time.  Subsequent calls return the number which was computed during the
+ * first call.
+ *
+ * \return A number suitable as an argument to \ref shm_new().
+ */
 size_t shm_get_shmmax(void)
 {
 	static size_t shmmax;
@@ -200,6 +207,7 @@ size_t shm_get_shmmax(void)
 				buf[ret] = '\0';
 				shmmax = strtoul(buf, NULL, 10);
 			}
+			close(fd);
 		}
 	}
 #elif defined SYSCTL_SHMMAX_VARIABLE
@@ -212,7 +220,7 @@ size_t shm_get_shmmax(void)
 #endif
 	if (shmmax == 0) {
 		PARA_WARNING_LOG("unable to determine shmmax\n");
-		shmmax = 65535; /* last ressort */
+		shmmax = 65535; /* last resort */
 	}
 	PARA_INFO_LOG("shmmax: %zu\n", shmmax);
 	return shmmax;