Update copyright notice

[empserver] / src / lib / gen / disassoc.c

diff --git a/src/lib/gen/disassoc.c b/src/lib/gen/disassoc.c
index 3260eef0c087583758989663a9fdc98cee359231..15f31e2c75c65c986f7e3d01ff4e3a7b2cc061e0 100644 (file)
--- a/src/lib/gen/disassoc.c
+++ b/src/lib/gen/disassoc.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,59 +14,68 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
- *  disassoc.c: Fork and close
- * 
+ *  disassoc.c: Boilerplate daemonization code
+ *
  *  Known contributors to this file:
  *     Doug Hay, 1998
+ *     Markus Armbruster, 2005
  */
 
 /*
- * boilerplate daemon code; disassociate from
- * the current tty by forking, closing all file
- * descriptors, opening slash, and ioctl-ing
- * TIOCNOTTY
+ * See W. Richard Stevens: UNIX Network Programming, Vol. 1
  */
 
-#include <sys/types.h>
-#if !defined(_WIN32)
-#include <sys/ioctl.h>
-#include <unistd.h>            /* fork close dup2 */
-#endif
+#include <config.h>
+
+#ifndef _WIN32
 #include <fcntl.h>
-#include "gen.h"
+#include <sys/types.h>
+#include <unistd.h>
+#include "prototypes.h"
 
-void
+int
 disassoc(void)
 {
-#if !defined(_WIN32)
+    pid_t pid;
     int i;
 
-    if (fork() != 0)
-       exit(0);
-    for (i = 0; i < 10; i++)
-       (void)close(i);
-    (void)open("/", O_RDONLY, 0);
-    (void)dup2(0, 1);
-    (void)dup2(0, 2);
-#if defined hpux || defined Rel4
-    setsid();
-#else
-    i = open("/dev/tty", O_RDWR, 0);
-    if (i > 0) {
-       (void)ioctl(i, TIOCNOTTY, 0);
-       (void)close(i);
-    }
-#endif
-#endif
+    if ((pid = fork()) < 0)
+       return -1;
+    else if (pid)
+       _exit(0);               /* parent */
+
+    /* Become session leader of new session, lose controlling tty */
+    if (setsid() < 0)
+       return -1;
+
+    /* Lose session leader status, so we can't acquire a controlling tty */
+    if ((pid = fork()) < 0)
+       return -1;
+    else if (pid)
+       _exit(0);               /* parent */
+    /* Note: no controlling tty, therefore no SIGHUP sent */
+
+    /* datadir is working directory, that's fine */
+
+    /* We opened a bunch of files already, so just close 0..2 */
+    for (i = 0; i < 3; i++)
+       close(i);
+
+    /* Library code may use 0..2; make sure that's safe */
+    open("/dev/null", O_RDWR);
+    dup(0);
+    dup(0);
+
+    return 0;
 }
+#endif