From: mdw <mdw>
Date: Thu, 22 Feb 2001 09:07:08 +0000 (+0000)
Subject: Separate detach-from-terminal code into a separate function.
X-Git-Tag: 1.0.0pre1~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/b542dd0bc305096d0771627477406ac8f26cb785

Separate detach-from-terminal code into a separate function.
---

diff --git a/util.c b/util.c
index 4dd6f351..54890b3f 100644
--- a/util.c
+++ b/util.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: util.c,v 1.1 2001/02/03 20:26:37 mdw Exp $
+ * $Id: util.c,v 1.2 2001/02/22 09:07:08 mdw Exp $
  *
  * Utilities for the client and the server
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: util.c,v $
+ * Revision 1.2  2001/02/22 09:07:08  mdw
+ * Separate detach-from-terminal code into a separate function.
+ *
  * Revision 1.1  2001/02/03 20:26:37  mdw
  * Initial checkin.
  *
@@ -51,23 +54,18 @@
 
 /*----- Main code ---------------------------------------------------------*/
 
-/* --- @u_daemon@ --- *
+/* --- @u_detach@ --- *
  *
  * Arguments:	---
  *
- * Returns:	Zero if OK, nonzero on failure.
+ * Returns:	---
  *
- * Use:		Becomes a daemon.
+ * Use:		Detaches from the current terminal and ensures it can never
+ *		acquire a new one.  Calls @fork@.
  */
 
-int u_daemon(void)
+void u_detach(void)
 {
-  pid_t kid;
-
-  if ((kid = fork()) < 0)
-    return (-1);
-  if (kid)
-    _exit(0);
 #ifdef TIOCNOTTY
   {
     int fd;
@@ -78,9 +76,28 @@ int u_daemon(void)
   }
 #endif
   setsid();
-
   if (fork() > 0)
     _exit(0);
+}
+
+/* --- @u_daemon@ --- *
+ *
+ * Arguments:	---
+ *
+ * Returns:	Zero if OK, nonzero on failure.
+ *
+ * Use:		Becomes a daemon.
+ */
+
+int u_daemon(void)
+{
+  pid_t kid;
+
+  if ((kid = fork()) < 0)
+    return (-1);
+  if (kid)
+    _exit(0);
+  u_detach();
   return (0);
 }
 
diff --git a/util.h b/util.h
index b5fbd579..f9c5c78f 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: util.h,v 1.1 2001/02/03 20:26:37 mdw Exp $
+ * $Id: util.h,v 1.2 2001/02/22 09:07:08 mdw Exp $
  *
  * Utilities for the client and the server
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: util.h,v $
+ * Revision 1.2  2001/02/22 09:07:08  mdw
+ * Separate detach-from-terminal code into a separate function.
+ *
  * Revision 1.1  2001/02/03 20:26:37  mdw
  * Initial checkin.
  *
@@ -41,10 +44,20 @@
   extern "C" {
 #endif
 
-/*----- Header files ------------------------------------------------------*/
-
 /*----- Functions provided ------------------------------------------------*/
 
+/* --- @u_detach@ --- *
+ *
+ * Arguments:	---
+ *
+ * Returns:	---
+ *
+ * Use:		Detaches from the current terminal and ensures it can never
+ *		acquire a new one.  Calls @fork@.
+ */
+
+extern void u_detach(void);
+
 /* --- @u_daemon@ --- *
  *
  * Arguments:	---
@@ -54,7 +67,7 @@
  * Use:		Becomes a daemon.
  */
 
-int u_daemon(void);
+extern int u_daemon(void);
 
 /*----- That's all, folks -------------------------------------------------*/