merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE

author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> 2004-03-17 20:32:50 +0000
committer: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> 2004-03-17 20:32:50 +0000
commit: 58efad794ce23c0756364c642b28519fb0ab6580 (patch)
tree: 1eb8957aef48c95a8d09ee024c118c854ba1a616
parent: f5e3434d55f055fb7a0cb6ed2ce48e7d52f90668 (diff)
47 files changed, 106 insertions, 137 deletions
diff --git a/difs/atom.c b/difs/atom.c
index 74df015..55d878f 100644
--- a/difs/atom.c
+++ b/difs/atom.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)atom.c	4.1	5/2/91
  *
  */
-/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.5 2003/05/27 22:27:05 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.4tsi Exp $ */
 
 #include "misc.h"
 #include "fsresource.h"
diff --git a/difs/cache.c b/difs/cache.c
index e8c8573..2aab91e 100644
--- a/difs/cache.c
+++ b/difs/cache.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)cache.c	4.2	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.7 2002/10/15 01:45:02 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.6 2001/12/14 20:01:33 dawes Exp $ */
 
 #include	"cachestr.h"
 #include	"misc.h"
diff --git a/difs/charinfo.c b/difs/charinfo.c
index a9b7ad0..f6a9942 100644
--- a/difs/charinfo.c
+++ b/difs/charinfo.c
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
  * This file was once on the other side of
  * the font library interface as util/fsfuncs.c.
  */
-/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.12 2001/12/14 20:01:33 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.11 2001/10/28 03:34:34 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include "misc.h"
diff --git a/difs/difsutils.c b/difs/difsutils.c
index 0f47d30..a17dd81 100644
--- a/difs/difsutils.c
+++ b/difs/difsutils.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.7 2001/12/14 20:01:33 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.6 2001/01/17 23:45:28 dawes Exp $ */
 
 #define	XK_LATIN1
 
diff --git a/difs/dispatch.c b/difs/dispatch.c
index 0ee934a..c358314 100644
--- a/difs/dispatch.c
+++ b/difs/dispatch.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/dispatch.c,v 3.13 2002/10/15 01:45:02 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/dispatch.c,v 3.12 2001/12/14 20:01:33 dawes Exp $ */
 
 #include	<stdlib.h>
 #include	"dispatch.h"
diff --git a/difs/events.c b/difs/events.c
index 1b087bf..802a2c7 100644
--- a/difs/events.c
+++ b/difs/events.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/events.c,v 3.8 2003/05/23 15:03:11 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/difs/events.c,v 3.7tsi Exp $ */
 
 #include	<swaprep.h>
 
diff --git a/difs/extensions.c b/difs/extensions.c
index caf790a..0f76a82 100644
--- a/difs/extensions.c
+++ b/difs/extensions.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.7 2001/12/14 20:01:34 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.6 2001/08/01 00:45:04 tsi Exp $ */
 
 #include	"FSproto.h"
 #include	"misc.h"
diff --git a/difs/fontinfo.c b/difs/fontinfo.c
index 1193ae4..b0beef4 100644
--- a/difs/fontinfo.c
+++ b/difs/fontinfo.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.11 2002/10/15 01:45:02 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.10 2001/12/14 20:01:34 dawes Exp $ */
 
 #include        "FS.h"
 #include        "FSproto.h"
diff --git a/difs/fonts.c b/difs/fonts.c
index 190e276..6665de4 100644
--- a/difs/fonts.c
+++ b/difs/fonts.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.14 2003/11/08 02:02:07 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */
 
 #include        "FS.h"
 #include        "FSproto.h"
diff --git a/difs/initfonts.c b/difs/initfonts.c
index 9ed7675..e3a5283 100644
--- a/difs/initfonts.c
+++ b/difs/initfonts.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * %W%	%E%
  *
  */
-/* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.7 2001/12/14 20:01:34 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.6 2001/08/01 00:45:04 tsi Exp $ */
 
 #include        "font.h"
 #include	"difs.h"
diff --git a/difs/main.c b/difs/main.c
index 71d2c89..b7d8a4c 100644
--- a/difs/main.c
+++ b/difs/main.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/main.c,v 3.12 2002/10/15 01:45:02 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/main.c,v 3.11 2001/12/14 20:01:35 dawes Exp $ */
 
 #include	<stdlib.h>
 #include	<sys/types.h>
diff --git a/difs/resource.c b/difs/resource.c
index da28d7f..9b6943c 100644
--- a/difs/resource.c
+++ b/difs/resource.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * %W%	%G%
  *
  */
-/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.9 2003/05/27 22:27:06 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.8tsi Exp $ */
 /*
  *      a resource is a 32 bit quantity.  the upper 12 bits are client id.
  *      client provides a 19 bit resource id. this is "hashed" by me by
diff --git a/difs/swaprep.c b/difs/swaprep.c
index 07981aa..74d0ca7 100644
--- a/difs/swaprep.c
+++ b/difs/swaprep.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/swaprep.c,v 1.5 2001/12/14 20:01:35 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/swaprep.c,v 1.4 2001/01/17 23:45:29 dawes Exp $ */
 
 #include	<swaprep.h>
 #include	<swapreq.h>
diff --git a/difs/swapreq.c b/difs/swapreq.c
index 433e840..1c26252 100644
--- a/difs/swapreq.c
+++ b/difs/swapreq.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/swapreq.c,v 1.7 2001/12/14 20:01:35 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/swapreq.c,v 1.6 2001/06/25 20:40:17 paulo Exp $ */
 
 #include	<swapreq.h>
 
diff --git a/difs/tables.c b/difs/tables.c
index 069523d..3a2ab3c 100644
--- a/difs/tables.c
+++ b/difs/tables.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.6 2001/12/14 20:01:35 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.5 2001/01/17 23:45:29 dawes Exp $ */
 
 #include <dispatch.h>
 #include <swaprep.h>
diff --git a/include/access.h b/include/access.h
index 4b9efc0..19c774c 100644
--- a/include/access.h
+++ b/include/access.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)access.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/access.h,v 1.5 2001/12/14 20:01:36 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/access.h,v 1.4 2001/01/17 23:45:30 dawes Exp $ */
 
 #ifndef _ACCESS_H_
 #define _ACCESS_H_
diff --git a/include/accstr.h b/include/accstr.h
index 991a1fa..50a134d 100644
--- a/include/accstr.h
+++ b/include/accstr.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)accstr.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.7 2001/12/14 20:01:36 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.6 2001/06/25 20:40:18 paulo Exp $ */
 
 #ifndef _ACCSTR_H_
 #define _ACCSTR_H_
diff --git a/include/auth.h b/include/auth.h
index 06958ce..0ea06f0 100644
--- a/include/auth.h
+++ b/include/auth.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)auth.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/auth.h,v 1.6 2001/12/14 20:01:36 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/auth.h,v 1.5 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _AUTH_H_
 #define _AUTH_H_
diff --git a/include/cache.h b/include/cache.h
index 4f75abd..7e5a2b2 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)cache.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/cache.h,v 1.5 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/cache.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _CACHE_H_
 #define	_CACHE_H_
diff --git a/include/client.h b/include/client.h
index 5f484ab..722959d 100644
--- a/include/client.h
+++ b/include/client.h
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/client.h,v 1.7 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/client.h,v 1.6 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef	_CLIENT_H_
 #define	_CLIENT_H_
diff --git a/include/clientstr.h b/include/clientstr.h
index 100a1ce..4f977ce 100644
--- a/include/clientstr.h
+++ b/include/clientstr.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.7 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.6 2001/08/28 23:44:53 paulo Exp $ */
 
 #ifndef _CLIENTSTR_H_
 #define	_CLIENTSTR_H_
diff --git a/include/difsfn.h b/include/difsfn.h
index 9005ff5..a55a9f8 100644
--- a/include/difsfn.h
+++ b/include/difsfn.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.5 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _DIFSFONT_H_
 #define _DIFSFONT_H_
diff --git a/include/difsfnst.h b/include/difsfnst.h
index 301efea..4353155 100644
--- a/include/difsfnst.h
+++ b/include/difsfnst.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.5 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _DIFSFONTST_H_
 #define _DIFSFONTST_H_
diff --git a/include/difsutils.h b/include/difsutils.h
index 2a31631..d8a1ef4 100644
--- a/include/difsutils.h
+++ b/include/difsutils.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/difsutils.h,v 1.5 2002/10/15 01:45:03 dawes Exp $
+ * $XFree86: xc/programs/xfs/include/difsutils.h,v 1.4 2001/06/25 20:40:18 paulo Exp $
  */
 
 /************************************************************
diff --git a/include/dispatch.h b/include/dispatch.h
index ba359da..c476d17 100644
--- a/include/dispatch.h
+++ b/include/dispatch.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/dispatch.h,v 1.3 2001/08/28 23:44:54 paulo Exp $
+ * $XFree86: xc/programs/xfs/include/dispatch.h,v 1.2 1999/03/07 11:41:00 dawes Exp $
  */
 
 /************************************************************
diff --git a/include/extentst.h b/include/extentst.h
index 3249c73..48a5dca 100644
--- a/include/extentst.h
+++ b/include/extentst.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)extentst.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.7 2003/07/16 01:39:17 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.6 2001/12/14 20:01:38 dawes Exp $ */
 
 #ifndef _EXTENTST_H_
 #define _EXTENTST_H_
diff --git a/include/fsevents.h b/include/fsevents.h
index 1047235..7ed50fb 100644
--- a/include/fsevents.h
+++ b/include/fsevents.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from the X Consortium.
  * @(#)events.h	4.2	91/05/03
  *
  */
-/* $XFree86: xc/programs/xfs/include/fsevents.h,v 1.3 1998/10/25 12:48:04 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _EVENTS_H_
 #define _EVENTS_H_
diff --git a/include/fsresource.h b/include/fsresource.h
index 3f4c204..d68343e 100644
--- a/include/fsresource.h
+++ b/include/fsresource.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from the X Consortium.
  * @(#)resource.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/fsresource.h,v 1.4 1999/03/07 11:41:01 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/fsresource.h,v 1.3 1998/10/25 12:48:04 dawes Exp $ */
 
 #ifndef _RESOURCE_H_
 #define _RESOURCE_H_
diff --git a/include/misc.h b/include/misc.h
index a6de816..43d8733 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/misc.h,v 3.9 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/misc.h,v 3.8 2001/07/25 15:05:21 dawes Exp $ */
 
 #ifndef _MISC_H_
 #define _MISC_H_
diff --git a/include/os.h b/include/os.h
index 4bd4a4d..bfc1074 100644
--- a/include/os.h
+++ b/include/os.h
@@ -105,7 +105,6 @@ extern	void	CloseSockets(void);
 extern	void	StopListening(void);
 
 /* os/daemon.c */
-extern	void	BecomeOrphan(void);
 extern	void	BecomeDaemon(void);
 
 /* os/error.c */
diff --git a/include/osstruct.h b/include/osstruct.h
index be758b3..686f4da 100644
--- a/include/osstruct.h
+++ b/include/osstruct.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)osstruct.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.4 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.3 2001/07/29 22:08:16 tsi Exp $ */
 
 #ifndef _OSSTRUCT_H_
 #define _OSSTRUCT_H_
diff --git a/include/servermd.h b/include/servermd.h
index a2b8cf9..72c48af 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.5 2001/12/19 21:37:35 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.4 2001/12/14 20:01:38 dawes Exp $ */
 
 #ifndef _SERVERMD_H_
 #define _SERVERMD_H_
diff --git a/include/swaprep.h b/include/swaprep.h
index df15318..ca91141 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/swaprep.h,v 1.1 1998/10/25 07:12:32 dawes Exp $
+ * $XFree86$
  */
 
 /************************************************************
diff --git a/include/swapreq.h b/include/swapreq.h
index 698aa34..b3d4e3d 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/swapreq.h,v 1.2 2001/06/25 20:40:18 paulo Exp $
+ * $XFree86: xc/programs/xfs/include/swapreq.h,v 1.1 1998/10/25 07:12:32 dawes Exp $
  */
 
 /************************************************************
diff --git a/os/access.c b/os/access.c
index 83103da..c500728 100644
--- a/os/access.c
+++ b/os/access.c
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/access.c,v 3.8 2003/07/09 15:27:40 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/os/access.c,v 3.7tsi Exp $ */
 
 #include	<X11/Xos.h>
 #ifndef Lynx
diff --git a/os/config.c b/os/config.c
index 64f8992..795455b 100644
--- a/os/config.c
+++ b/os/config.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)config.c,v 4.6 1991/07/09 14:08:09 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/config.c,v 3.16 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/config.c,v 3.15 2002/05/31 18:46:12 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/os/configstr.h b/os/configstr.h
index 9000acc..9c1a8af 100644
--- a/os/configstr.h
+++ b/os/configstr.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)configstr.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.5 2001/12/14 20:01:41 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.4 2001/01/17 23:45:32 dawes Exp $ */
 #ifndef _CONFIGSTR_H_
 #define _CONFIGSTR_H_
 #include	"config.h"
diff --git a/os/connection.c b/os/connection.c
index d17de6d..5d17773 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -67,7 +67,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/connection.c,v 3.26 2003/07/09 15:27:40 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/os/connection.c,v 3.25tsi Exp $ */
 
 #include	<stdlib.h>
 #include	<X11/Xtrans.h>
diff --git a/os/daemon.c b/os/daemon.c
index 0e5ce3e..2b23de3 100644
--- a/os/daemon.c
+++ b/os/daemon.c
@@ -34,16 +34,7 @@ from the X Consortium.
 #include <errno.h>
 #include <stdlib.h>
 
-#ifndef __GLIBC__
-# if defined(__osf__) || \
-     defined(__GNU__) || \
-     defined(__CYGWIN__) || \
-     defined(linux)
-#  define setpgrp setpgid
-# endif
-#endif
-
-#if defined(SVR4) || defined(USG) || defined(__GLIBC__)
+#if defined(USG)
 # include <termios.h>
 #else
 # include <sys/ioctl.h>
@@ -60,108 +51,88 @@ from the X Consortium.
 
 #include "os.h"
 
-void
-BecomeOrphan ()
-{
-    Pid_t child_id;
+#if defined(__GLIBC__) || defined(CSRG_BASED)
+#define HAS_DAEMON
+#endif
 
-    chdir("/");
-    /*
-     * fork so that the process goes into the background automatically. Also
-     * has a nice side effect of having the child process get inherited by
-     * init (pid 1).
-     * Separate the child into its own process group before the parent
-     * exits.  This eliminates the possibility that the child might get
-     * killed when the init script that's running xfs exits.
-     */
+#ifndef X_NOT_POSIX
+#define HAS_SETSID
+#endif
 
-    child_id = fork();
-    switch (child_id) {
-    case 0:
-	/* child */
-	break;
-    case -1:
-	/* error */
-	FatalError("daemon fork failed, %s\n", strerror(errno));
-	break;
+#ifndef HAS_SETSID
 
-    default:
-	/* parent */
+#define setsid() MySetsid()
+
+static Pid_t
+MySetsid(void)
+{
+#if defined(TIOCNOTTY) || defined(TCCLRCTTY) || defined(TIOCTTY)
+    int fd;
+#endif
+    int stat;
 
-#if defined(CSRG_BASED) || \
-    defined(SYSV) || \
-    defined(SVR4) || \
-    defined(__QNXNTO__) || \
-    defined(__GLIBC__) || \
-    defined(linux)
-	{
-	    int stat;
-# if defined(SVR4) || defined(__QNXNTO__)
-	    /* This gets error EPERM.  Why? */
-	    stat = setpgid (child_id, child_id);
-# elif defined(SYSV)
-	    stat = 0;	/* don't know how to set child's process group */
-# elif defined(__GLIBC__)
-	    stat = setpgrp ();
-# else
-	    stat = setpgrp (child_id, child_id);
-# endif
-	    if (stat != 0)
-		FatalError("setting process group for daemon failed: %s\n",
-			   strerror(errno));
-	}
-#endif /* ! (CSRG_BASED || SYSV || SVR4 || __QNXNTO__ || __GLIBC__) */
-	exit (0);
+    fd = open("/dev/tty", O_RDWR);
+    if (fd >= 0) {
+#if defined(USG) && defined(TCCLRCTTY)
+	int zero = 0;
+	(void) ioctl (fd, TCCLRCTTY, &zero);
+#elif (defined(SYSV) || defined(SVR4)) && defined(TIOCTTY)
+	int zero = 0;
+	(void) ioctl (i, TIOCTTY, &zero);
+#elif defined(TIOCNOTTY)
+	(void) ioctl (i, TIOCNOTTY, (char *) 0);    /* detach, BSD style */
+#endif
+        close(fd);
     }
+
+#if defined(SYSV) || defined(__QNXNTO__)
+    return setpgrp();
+#else
+    return setpgid(0, getpid());
+#endif
 }
 
+#endif /* !HAS_SETSID */
+
+
+/* detach */
 void
 BecomeDaemon ()
 {
-    /*
-     * Close standard file descriptors and get rid of controlling tty.
-     */
-
     /* If our C library has the daemon() function, just use it. */
-#if defined(__GLIBC__) || defined(CSRG_BASED)
+#ifdef HAS_DAEMON
     daemon (0, 0);
 #else
-    register int i;
 
-# if defined(SYSV) || defined(SVR4) || defined(__QNXNTO__)
-    setpgrp ();
-# else
-    setpgrp (0, getpid());
-# endif
+    switch (fork()) {
+    case -1:
+	/* error */
+	FatalError("daemon fork failed, %s\n", strerror(errno));
+	break;
+    case 0:
+	/* child */
+	break;
+    default:
+	/* parent */
+	exit(0);
+    }
+
+    if (setsid() == -1)
+	FatalError("setting session id for daemon failed: %s\n",
+		   strerror(errno));
+
+    chdir("/");
 
     close (0);
     close (1);
     close (2);
 
-# if !defined(__UNIXOS2__) && !defined(__CYGWIN__)
-#  if !((defined(SYSV) || defined(SVR4)) && defined(i386))
-    if ((i = open ("/dev/tty", O_RDWR)) >= 0) {	/* did open succeed? */
-#   if defined(USG) && defined(TCCLRCTTY)
-	int zero = 0;
-	(void) ioctl (i, TCCLRCTTY, &zero);
-#   else
-#    if (defined(SYSV) || defined(SVR4)) && defined(TIOCTTY)
-	int zero = 0;
-	(void) ioctl (i, TIOCTTY, &zero);
-#    else
-	(void) ioctl (i, TIOCNOTTY, (char *) 0);    /* detach, BSD style */
-#    endif
-#   endif
-	(void) close (i);
-    }
-#  endif /* !((SYSV || SVR4) && i386) */
-# endif /* !__UNIXOS2__ && !__CYGWIN__ */
-
     /*
      * Set up the standard file descriptors.
      */
-    (void) open ("/", O_RDONLY);	/* root inode already in core */
+    (void) open ("/dev/null", O_RDWR);
     (void) dup2 (0, 1);
     (void) dup2 (0, 2);
-#endif
+
+#endif /* HAS_DAEMON */
 }
diff --git a/os/error.c b/os/error.c
index c6adcaf..3d21b10 100644
--- a/os/error.c
+++ b/os/error.c
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/error.c,v 1.11 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: error.c,v 1.11 2002/10/15 01:45:03 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
@@ -95,7 +95,7 @@ abort_server(void)
 #ifdef SABER
     saber_stop();
 #else
-    abort();
+    _exit(1);
 #endif
 }
 
diff --git a/os/io.c b/os/io.c
index 4345907..80b89e5 100644
--- a/os/io.c
+++ b/os/io.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/io.c,v 3.19 2002/05/31 18:46:12 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/io.c,v 3.18 2001/12/14 20:01:41 dawes Exp $ */
 
 #include	<X11/Xtrans.h>
 #include	<stdio.h>
diff --git a/os/osdep.h b/os/osdep.h
index ae3798b..e8bd527 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)osdep.h	4.1	5/2/91
  *
  */
-/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.12 2002/05/31 18:46:12 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.11 2001/12/14 20:01:41 dawes Exp $ */
 
 #ifndef _OSDEP_H_
 #define	_OSDEP_H_
diff --git a/os/osglue.c b/os/osglue.c
index 67f784c..6c1b1ac 100644
--- a/os/osglue.c
+++ b/os/osglue.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)osglue.c,v 4.6 1991/07/09 14:07:30 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.19 2002/10/19 20:04:20 herrb Exp $ */
+/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.18 2002/10/15 01:45:03 dawes Exp $ */
 
 /*
  * this is miscellaneous OS specific stuff.
diff --git a/os/osinit.c b/os/osinit.c
index 7d0a068..a12bb00 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)osinit.c	4.3	5/7/91
  *
  */
-/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.5 2001/12/14 20:01:41 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.4 2001/01/17 23:45:33 dawes Exp $ */
 
 #include	"os.h"
 
diff --git a/os/utils.c b/os/utils.c
index 4dc46a1..fcc1c2a 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -526,7 +526,6 @@ SetDaemonState(void)
     int	    oldpid;
 
     if (becomeDaemon) {
-	BecomeOrphan();
 	BecomeDaemon();
 	if ((oldpid = StorePid ())) {
 	    if (oldpid == -1)
diff --git a/os/waitfor.c b/os/waitfor.c
index c5f1f23..1c3ebef 100644
--- a/os/waitfor.c
+++ b/os/waitfor.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.16 2002/05/31 18:46:12 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.15 2001/12/14 20:01:41 dawes Exp $ */
 
 #include	<X11/Xos.h>	/* strings, time, etc */
 
diff --git a/xfs.man b/xfs.man
index f1d15c0..50e6734 100644
--- a/xfs.man
+++ b/xfs.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/xfs/xfs.man,v 3.16 2001/12/14 20:01:32 dawes Exp $
+.\" $XFree86: xc/programs/xfs/xfs.man,v 3.15 2001/04/18 16:13:22 dawes Exp $
 .\"
 .\" Copyright 1991, 1998  The Open Group
 .\"
author	Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>	2004-03-17 20:32:50 +0000
committer	Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>	2004-03-17 20:32:50 +0000
commit	58efad794ce23c0756364c642b28519fb0ab6580 (patch)
tree	1eb8957aef48c95a8d09ee024c118c854ba1a616
parent	f5e3434d55f055fb7a0cb6ed2ce48e7d52f90668 (diff)