play: Convert com_ls() to lopsub.

[paraslash.git] / close_on_fork.c

diff --git a/close_on_fork.c b/close_on_fork.c
index 299aab0b0f613750481657951837da1626ed9aff..c606d98c46aeb4c9a15e76b90ea5856231c6a38e 100644 (file)
--- a/close_on_fork.c
+++ b/close_on_fork.c
@@ -1,13 +1,17 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file close_on_fork.c Manage a list of fds that should be closed on fork. */
+
+#include <regex.h>
+
 #include "para.h"
 #include "list.h"
 #include "string.h"
+#include "close_on_fork.h"
 
 static struct list_head close_on_fork_list;
 static int initialized;
@@ -63,16 +67,21 @@ void del_close_on_fork_list(int fd)
 }
 
 /**
- * Call close(3) for each fd in the close-on-fork list.
+ * 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)
 {
-       struct close_on_fork *cof;
+       struct close_on_fork *cof, *tmp;
 
        if (!initialized)
                return;
-       list_for_each_entry(cof, &close_on_fork_list, node) {
+       list_for_each_entry_safe(cof, tmp, &close_on_fork_list, node) {
                PARA_DEBUG_LOG("closing fd %d\n", cof->fd);
                close(cof->fd);
+               list_del(&cof->node);
+               free(cof);
        }
 }