X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=close_on_fork.c;h=28c5eabb1ae9a4821b60b638be559e837dc54f36;hp=eb470cf6066b16d78a9154a85124b88e6045ad11;hb=f14e5c15c82d4bf3b7ea611eab6bce95d4767b61;hpb=d1e6b28f66e243516d01916f9125baee75dd98d6

diff --git a/close_on_fork.c b/close_on_fork.c
index eb470cf6..28c5eabb 100644
--- a/close_on_fork.c
+++ b/close_on_fork.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file close_on_fork.c Manage a list of fds that should be closed on fork. */
 
@@ -19,7 +15,7 @@ static int initialized;
 /**
  * Describes an element of the close-on-fork list.
  *
- * \sa list.h
+ * \sa \ref list.h.
  */
 struct close_on_fork {
 	/** The file descriptor which should be closed after fork(). */
@@ -66,13 +62,7 @@ void del_close_on_fork_list(int fd)
 	}
 }
 
-/**
- * Close all fds in the list and destroy all list entries.
- *
- * This function calls close(3) for each fd in the close-on-fork list
- * and empties the list afterwards.
- */
-void close_listed_fds(void)
+static void deplete_cof_list(bool close_fds)
 {
 	struct close_on_fork *cof, *tmp;
 
@@ -80,8 +70,32 @@ void close_listed_fds(void)
 		return;
 	list_for_each_entry_safe(cof, tmp, &close_on_fork_list, node) {
 		PARA_DEBUG_LOG("closing fd %d\n", cof->fd);
-		close(cof->fd);
+		if (close_fds)
+			close(cof->fd);
 		list_del(&cof->node);
 		free(cof);
 	}
 }
+
+/**
+ * Close all fds in the list and destroy all list entries.
+ *
+ * This function calls close(3) for each fd in the close-on-fork list
+ * and empties the list afterwards.
+ *
+ * \sa \ref deplete_close_on_fork_list().
+ */
+void close_listed_fds(void)
+{
+	deplete_cof_list(true);
+}
+
+/**
+ * Remove all listed fds from the close on fork list.
+ *
+ * This is like \ref close_listed_fds() but does not close the fds.
+ */
+void deplete_close_on_fork_list(void)
+{
+	deplete_cof_list(false);
+}