patches.tar.gz

mesa20230212.patch0000600002417700241770000004456714372157352012633 0ustar  u0_a367u0_a367Mesa
Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


bin/install_megadrivers.py
based on https://github.com/Grima04/mesa-turnip-kgsl/commit/7a82edc

# Copyright 2017-2018 Intel Corporation

# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:

# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.


src/gallium/drivers/zink/meson.build
# Copyright © 2018 Collabora Ltd

# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:

# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.


src/gallium/drivers/zink/zink_kopper.c
/*
 * Copyright 2020 Red Hat, Inc.
 * Copyright © 2021 Valve Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 */
 
src/gallium/drivers/zink/zink_resource.c src/gallium/drivers/zink/zink_screen.c src/gallium/drivers/zink/zink_resource.h src/gallium/drivers/zink/zink_screen.h
 /*
 * Copyright 2018 Collabora Ltd.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * on the rights to use, copy, modify, merge, publish, distribute, sub
 * license, and/or sell copies of the Software, and to permit persons to whom
 * the Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
 * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 * USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 src/gallium/drivers/zink/zink_types.h
 /*
 * Copyright © 2022 Valve Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 * 
 * Authors:
 *    Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
 */
 
src/gallium/targets/dri/meson.build 
# Copyright © 2017 Dylan Baker
# Copyright © 2018 Intel Corporation

# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:

# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.


src/virtio/vtest/vtest_protocol.h
/**************************************************************************
 *
 * Copyright (C) 2015 Red Hat Inc.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included
 * in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 * OTHER DEALINGS IN THE SOFTWARE.
 *
 **************************************************************************/
----------
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
index 60ee4576..d91ace68 100644
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
@@ -23,7 +23,13 @@
 """Script to install megadriver symlinks for meson."""
 
 import argparse
-import os
+import os, shutil
+def link(src, dest):
+    shutil.copyfile(src, dest)
+def unlink(src):
+    os.remove(src)
+os.link = link
+os.unlink = unlink
 
 
 def main():
diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build
index e054f5a2..6bef364f 100644
--- a/src/gallium/drivers/zink/meson.build
+++ b/src/gallium/drivers/zink/meson.build
@@ -28,7 +28,7 @@ files_libzink = files(
   'zink_clear.c',
   'zink_compiler.c',
   'zink_context.c',
-  'zink_kopper.c',
+  'zink_nopper.c',
   'zink_descriptors.c',
   'zink_draw.cpp',
   'zink_fence.c',
diff --git a/src/gallium/drivers/zink/zink_nopper.c b/src/gallium/drivers/zink/zink_nopper.c
new file mode 100644
index 00000000..b6e0e937
--- /dev/null
+++ b/src/gallium/drivers/zink/zink_nopper.c
@@ -0,0 +1,88 @@
+#include "zink_context.h"
+#include "zink_screen.h"
+#include "zink_resource.h"
+#include "zink_kopper.h"
+#include "vk_enum_to_str.h"
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#endif
+
+VkSemaphore
+zink_kopper_acquire_submit(struct zink_screen *screen, struct zink_resource *res)
+{
+   return 0;
+}
+VkSemaphore
+zink_kopper_present(struct zink_screen *screen, struct zink_resource *res)
+{
+  return 0;
+}
+bool
+zink_kopper_acquire_readback(struct zink_context *ctx, struct zink_resource *res)
+{
+   return false;
+}
+bool
+zink_kopper_present_readback(struct zink_context *ctx, struct zink_resource *res)
+{
+   return false;
+}
+bool
+zink_kopper_acquire(struct zink_context *ctx, struct zink_resource *res, uint64_t timeout)
+{
+   return false;
+}
+void
+zink_kopper_displaytarget_destroy(struct zink_screen *screen, struct kopper_displaytarget *cdt)
+{
+  return;
+}
+void
+zink_kopper_deinit_displaytarget(struct zink_screen *screen, struct kopper_displaytarget *cdt)
+{
+  return;
+}
+void
+zink_kopper_fixup_depth_buffer(struct zink_context *ctx)
+{
+  return;
+}
+bool
+zink_kopper_check(struct pipe_resource *pres)
+{
+  return false;
+}
+bool
+zink_kopper_is_cpu(const struct pipe_screen *pscreen)
+{
+  return false;
+}
+void
+zink_kopper_set_swap_interval(struct pipe_screen *pscreen, struct pipe_resource *pres, int interval)
+{
+  return;
+}
+bool
+zink_kopper_update(struct pipe_screen *pscreen, struct pipe_resource *pres, int *w, int *h)
+{
+  return false;
+}
+int
+zink_kopper_query_buffer_age(struct pipe_context *pctx, struct pipe_resource *pres)
+{
+  return 0;
+}
+void
+zink_kopper_present_queue(struct zink_screen *screen, struct zink_resource *res)
+{
+  return;
+}
+struct kopper_displaytarget *
+zink_kopper_displaytarget_create(struct zink_screen *screen, unsigned tex_usage,
+                                 enum pipe_format format, unsigned width,
+                                 unsigned height, unsigned alignment,
+                                 const void *loader_private, unsigned *stride)
+{
+   mesa_loge("zink_nopper.c:86");
+   return NULL;
+}
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 3397b631..d93480b8 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -47,6 +47,7 @@
 #include "util/os_file.h"
 #include "frontend/winsys_handle.h"
 
+#include "frontend/sw_winsys.h"
 #if !defined(__APPLE__)
 #define ZINK_USE_DMABUF
 #endif
@@ -1233,6 +1234,17 @@ resource_create(struct pipe_screen *pscreen,
       res->aspect = aspect_from_format(templ->format);
    }
 
+   if (screen->winsys && (templ->bind & PIPE_BIND_DISPLAY_TARGET)) {
+      struct sw_winsys *winsys = screen->winsys;
+      res->dt = winsys->displaytarget_create(screen->winsys,
+                                             res->base.b.bind,
+                                             res->base.b.format,
+                                             templ->width0,
+                                             templ->height0,
+                                             64, NULL,
+                                             &res->dt_stride);
+   }
+
    if (loader_private) {
       if (templ->bind & PIPE_BIND_DISPLAY_TARGET) {
          /* backbuffer */
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 98abc241..0ad3a458 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -47,7 +47,7 @@
 #include "util/perf/u_trace.h"
 #include "util/u_transfer_helper.h"
 #include "util/xmlconfig.h"
-
+#include "frontend/sw_winsys.h"
 #include "util/u_cpu_detect.h"
 
 static int num_screens = 0;
@@ -59,7 +59,7 @@ static int num_screens = 0;
 #include <unistd.h>
 #if DETECT_OS_APPLE
 #define VK_LIBNAME "libvulkan.1.dylib"
-#elif DETECT_OS_ANDROID
+#elif __ANDROID__
 #define VK_LIBNAME "libvulkan.so"
 #else
 #define VK_LIBNAME "libvulkan.so.1"
@@ -1609,22 +1609,9 @@ zink_flush_frontbuffer(struct pipe_screen *pscreen,
    struct zink_resource *res = zink_resource(pres);
    struct zink_context *ctx = zink_context(pctx);
 
-   /* if the surface is no longer a swapchain, this is a no-op */
-   if (!zink_is_swapchain(res))
-      return;
+   struct sw_winsys *winsys = screen->winsys;
 
    ctx = zink_tc_context_unwrap(pctx, screen->threaded);
-
-   if (!zink_kopper_acquired(res->obj->dt, res->obj->dt_idx)) {
-      /* swapbuffers to an undefined surface: acquire and present garbage */
-      zink_kopper_acquire(ctx, res, UINT64_MAX);
-      ctx->needs_present = res;
-      /* set batch usage to submit acquire semaphore */
-      zink_batch_resource_usage_set(&ctx->batch, res, true, false);
-      /* ensure the resource is set up to present garbage */
-      ctx->base.flush_resource(&ctx->base, pres);
-   }
-
    /* handle any outstanding acquire submits (not just from above) */
    if (ctx->batch.swapchain || ctx->needs_present) {
       ctx->batch.has_work = true;
@@ -1634,10 +1621,25 @@ zink_flush_frontbuffer(struct pipe_screen *pscreen,
          util_queue_fence_wait(&bs->flush_completed);
       }
    }
-
-   /* always verify that this was acquired */
-   assert(zink_kopper_acquired(res->obj->dt, res->obj->dt_idx));
-   zink_kopper_present_queue(screen, res);
+   if (!winsys)
+     return;
+   void *map = winsys->displaytarget_map(winsys, res->dt, 0);
+
+   if (map) {
+      struct pipe_transfer *transfer = NULL;
+      void *res_map = pipe_texture_map(pctx, pres, level, layer, PIPE_MAP_READ, 0, 0,
+                                        u_minify(pres->width0, level),
+                                        u_minify(pres->height0, level),
+                                        &transfer);
+      if (res_map) {
+         util_copy_rect((ubyte*)map, pres->format, res->dt_stride, 0, 0,
+                        transfer->box.width, transfer->box.height,
+                        (const ubyte*)res_map, transfer->stride, 0, 0);
+         pipe_texture_unmap(pctx, transfer);
+      }
+   winsys->displaytarget_unmap(winsys, res->dt);
+   }
+winsys->displaytarget_display(winsys, res->dt, winsys_drawable_handle, sub_box);
 }
 
 bool
@@ -2988,6 +2990,7 @@ zink_create_screen(struct sw_winsys *winsys, const struct pipe_screen_config *co
 {
    struct zink_screen *ret = zink_internal_create_screen(config);
    if (ret) {
+      ret->winsys = winsys;
       ret->drm_fd = -1;
    }
 
diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h
index 0c81b9ee..15857fcb 100644
--- a/src/gallium/drivers/zink/zink_types.h
+++ b/src/gallium/drivers/zink/zink_types.h
@@ -1173,6 +1173,7 @@ struct zink_resource {
    struct threaded_resource base;
 
    enum pipe_format internal_format:16;
+   struct sw_displaytarget *dt;
 
    struct zink_resource_object *obj;
    union {
@@ -1280,7 +1281,7 @@ struct zink_screen {
 
    struct hash_table dts;
    simple_mtx_t dt_lock;
-
+   struct sw_winsys *winsys;
    bool device_lost;
    int drm_fd;
 
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index ddf67e99..21e9d0b4 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -123,7 +123,7 @@ endforeach
 
 # This only works on Unix-like oses, which is probably fine for dri
 prog_ln = find_program('ln', required : false)
-if prog_ln.found()
+if false
   devenv.set('LIBGL_DRIVERS_PATH', meson.current_build_dir())
 
   foreach d : gallium_dri_drivers
diff --git a/src/virtio/vtest/vtest_protocol.h b/src/virtio/vtest/vtest_protocol.h
index c48be146..351b312d 100644
--- a/src/virtio/vtest/vtest_protocol.h
+++ b/src/virtio/vtest/vtest_protocol.h
@@ -25,7 +25,7 @@
 #ifndef VTEST_PROTOCOL
 #define VTEST_PROTOCOL
 
-#define VTEST_DEFAULT_SOCKET_NAME "/tmp/.virgl_test"
+#define VTEST_DEFAULT_SOCKET_NAME "/data/data/com.termux/files/usr/tmp/.virgl_test"
 
 #ifdef VIRGL_RENDERER_UNSTABLE_APIS
 #define VTEST_PROTOCOL_VERSION 3
virglrenderer.diff0000600002417700241770000000235014403077751013534 0ustar  u0_a367u0_a367diff --git a/src/virgl_hw.h b/src/virgl_hw.h
index dfbcf81..8344a94 100644
--- a/src/virgl_hw.h
+++ b/src/virgl_hw.h
@@ -645,8 +645,6 @@ struct virgl_caps_v2 {
         uint32_t max_texture_image_units;
         struct virgl_supported_format_mask supported_multisample_formats;
         uint32_t max_const_buffer_size[6]; // PIPE_SHADER_TYPES
-        uint32_t num_video_caps;
-        struct virgl_video_caps video_caps[32];
         uint32_t max_uniform_block_size;
 };
 
diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index 4b7ee36..0d487d9 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -11790,7 +11790,6 @@ static void vrend_renderer_fill_caps_v2(int gl_ver, int gles_ver,  union virgl_c
 #ifdef ENABLE_VIDEO
    vrend_video_fill_caps(caps);
 #else
-   caps->v2.num_video_caps = 0;
 #endif
 }
 
diff --git a/vtest/vtest_protocol.h b/vtest/vtest_protocol.h
index c48be14..351b312 100644
--- a/vtest/vtest_protocol.h
+++ b/vtest/vtest_protocol.h
@@ -25,7 +25,7 @@
 #ifndef VTEST_PROTOCOL
 #define VTEST_PROTOCOL
 
-#define VTEST_DEFAULT_SOCKET_NAME "/tmp/.virgl_test"
+#define VTEST_DEFAULT_SOCKET_NAME "/data/data/com.termux/files/usr/tmp/.virgl_test"
 
 #ifdef VIRGL_RENDERER_UNSTABLE_APIS
 #define VTEST_PROTOCOL_VERSION 3
xserver.patch0000600002417700241770000032627514372030232012552 0ustar  u0_a367u0_a367diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 529595bb7..4a56ad0a6 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -1,730 +1,730 @@
 /*
  * BIGFONT extension for sharing font metrics between clients (if possible)
  * and for transmitting font metrics to clients in a compressed form.
  *
  * Copyright (c) 1999-2000  Bruno Haible
  * Copyright (c) 1999-2000  The XFree86 Project, Inc.
  */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
 /*
  * Big fonts suffer from the following: All clients that have opened a
  * font can access the complete glyph metrics array (the XFontStruct member
  * `per_char') directly, without going through a macro. Moreover these
  * glyph metrics are ink metrics, i.e. are not redundant even for a
  * fixed-width font. For a Unicode font, the size of this array is 768 KB.
  *
  * Problems: 1. It eats a lot of memory in each client. 2. All this glyph
  * metrics data is piped through the socket when the font is opened.
  *
  * This extension addresses these two problems for local clients, by using
  * shared memory. It also addresses the second problem for non-local clients,
  * by compressing the data before transmit by a factor of nearly 6.
  *
  * If you use this extension, your OS ought to nicely support shared memory.
  * This means: Shared memory should be swappable to the swap, and the limits
  * should be high enough (SHMMNI at least 64, SHMMAX at least 768 KB,
  * SHMALL at least 48 MB). It is a plus if your OS allows shmat() calls
  * on segments that have already been marked "removed", because it permits
  * these segments to be cleaned up by the OS if the X server is killed with
  * signal SIGKILL.
  *
  * This extension is transparently exploited by Xlib (functions XQueryFont,
  * XLoadQueryFont).
  */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
 #include <sys/types.h>
 #ifdef HAS_SHM
 #ifdef SVR4
 #include <sys/sysmacros.h>
 #endif
 #if defined(__CYGWIN__)
 #include <sys/param.h>
 #include <sys/sysmacros.h>
 #endif
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 #include <errno.h>
 #endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "dixfontstr.h"
 #include "extnsionst.h"
 #include "extinit.h"
 #include "protocol-versions.h"
 
 #include <X11/extensions/xf86bigfproto.h>
 #include "xf86bigfontsrv.h"
 
 static void XF86BigfontResetProc(ExtensionEntry *       /* extEntry */
     );
 
 #ifdef HAS_SHM
 
 /* A random signature, transmitted to the clients so they can verify that the
    shared memory segment they are attaching to was really established by the
    X server they are talking to. */
 static CARD32 signature;
 
 /* Index for additional information stored in a FontRec's devPrivates array. */
 static int FontShmdescIndex;
 
 static unsigned int pagesize;
 
 static Bool badSysCall = FALSE;
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__)
 
 static void
 SigSysHandler(int signo)
 {
     badSysCall = TRUE;
 }
 
 static Bool
 CheckForShmSyscall(void)
 {
     void (*oldHandler) (int);
     int shmid = -1;
 
     /* If no SHM support in the kernel, the bad syscall will generate SIGSYS */
     oldHandler = OsSignal(SIGSYS, SigSysHandler);
 
     badSysCall = FALSE;
     shmid = shmget(IPC_PRIVATE, 4096, IPC_CREAT);
     if (shmid != -1) {
         /* Successful allocation - clean up */
         shmctl(shmid, IPC_RMID, NULL);
     }
     else {
         /* Allocation failed */
         badSysCall = TRUE;
     }
     OsSignal(SIGSYS, oldHandler);
     return !badSysCall;
 }
 
 #define MUST_CHECK_FOR_SHM_SYSCALL
 
 #endif
 
 #endif
 
 /* ========== Management of shared memory segments ========== */
 
 #ifdef HAS_SHM
 
 #ifdef __linux__
 /* On Linux, shared memory marked as "removed" can still be attached.
    Nice feature, because the kernel will automatically free the associated
    storage when the server and all clients are gone. */
 #define EARLY_REMOVE
 #endif
 
 typedef struct _ShmDesc {
     struct _ShmDesc *next;
     struct _ShmDesc **prev;
     int shmid;
     char *attach_addr;
 } ShmDescRec, *ShmDescPtr;
 
 static ShmDescPtr ShmList = (ShmDescPtr) NULL;
 
 static ShmDescPtr
 shmalloc(unsigned int size)
 {
     ShmDescPtr pDesc;
     int shmid;
     char *addr;
 
 #ifdef MUST_CHECK_FOR_SHM_SYSCALL
     if (pagesize == 0)
         return (ShmDescPtr) NULL;
 #endif
 
     /* On some older Linux systems, the number of shared memory segments
        system-wide is 127. In Linux 2.4, it is 4095.
        Therefore there is a tradeoff to be made between allocating a
        shared memory segment on one hand, and allocating memory and piping
        the glyph metrics on the other hand. If the glyph metrics size is
        small, we prefer the traditional way. */
     if (size < 3500)
         return (ShmDescPtr) NULL;
 
     pDesc = malloc(sizeof(ShmDescRec));
     if (!pDesc)
         return (ShmDescPtr) NULL;
 
     size = (size + pagesize - 1) & -pagesize;
     shmid = shmget(IPC_PRIVATE, size, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
     if (shmid == -1) {
         ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, %s\n",
                size, strerror(errno));
         free(pDesc);
         return (ShmDescPtr) NULL;
     }
 
     if ((addr = shmat(shmid, 0, 0)) == (char *) -1) {
         ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, %s\n",
                size, strerror(errno));
         shmctl(shmid, IPC_RMID, (void *) 0);
         free(pDesc);
         return (ShmDescPtr) NULL;
     }
 
 #ifdef EARLY_REMOVE
     shmctl(shmid, IPC_RMID, (void *) 0);
 #endif
 
     pDesc->shmid = shmid;
     pDesc->attach_addr = addr;
     if (ShmList)
         ShmList->prev = &pDesc->next;
     pDesc->next = ShmList;
     pDesc->prev = &ShmList;
     ShmList = pDesc;
 
     return pDesc;
 }
 
 static void
 shmdealloc(ShmDescPtr pDesc)
 {
 #ifndef EARLY_REMOVE
     shmctl(pDesc->shmid, IPC_RMID, (void *) 0);
 #endif
     shmdt(pDesc->attach_addr);
 
     if (pDesc->next)
         pDesc->next->prev = pDesc->prev;
     *pDesc->prev = pDesc->next;
     free(pDesc);
 }
 
 #endif
 
 /* Called when a font is closed. */
 void
 XF86BigfontFreeFontShm(FontPtr pFont)
 {
 #ifdef HAS_SHM
     ShmDescPtr pDesc;
 
     /* If during shutdown of the server, XF86BigfontCleanup() has already
      * called shmdealloc() for all segments, we don't need to do it here.
      */
     if (!ShmList)
         return;
 
     pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
     if (pDesc)
         shmdealloc(pDesc);
 #endif
 }
 
 /* Called upon fatal signal. */
 void
 XF86BigfontCleanup(void)
 {
 #ifdef HAS_SHM
     while (ShmList)
         shmdealloc(ShmList);
 #endif
 }
 
 /* Called when a server generation dies. */
 static void
 XF86BigfontResetProc(ExtensionEntry * extEntry)
 {
     /* This function is normally called from CloseDownExtensions(), called
      * from main(). It will be followed by a call to FreeAllResources(),
      * which will call XF86BigfontFreeFontShm() for each font. Thus it
      * appears that we do not need to do anything in this function. --
      * But I prefer to write robust code, and not keep shared memory lying
      * around when it's not needed any more. (Someone might close down the
      * extension without calling FreeAllResources()...)
      */
     XF86BigfontCleanup();
 }
 
 /* ========== Handling of extension specific requests ========== */
 
 static int
 ProcXF86BigfontQueryVersion(ClientPtr client)
 {
     xXF86BigfontQueryVersionReply reply;
 
     REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq);
     reply = (xXF86BigfontQueryVersionReply) {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
         .length = 0,
         .majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION,
         .minorVersion = SERVER_XF86BIGFONT_MINOR_VERSION,
         .uid = geteuid(),
         .gid = getegid(),
 #ifdef HAS_SHM
         .signature = signature,
         .capabilities = (client->local && !client->swapped)
                          ? XF86Bigfont_CAP_LocalShm : 0
 #else
         .signature = 0,
         .capabilities = 0
 #endif
     };
     if (client->swapped) {
         swaps(&reply.sequenceNumber);
         swapl(&reply.length);
         swaps(&reply.majorVersion);
         swaps(&reply.minorVersion);
         swapl(&reply.uid);
         swapl(&reply.gid);
         swapl(&reply.signature);
     }
     WriteToClient(client, sizeof(xXF86BigfontQueryVersionReply), &reply);
     return Success;
 }
 
 static void
 swapCharInfo(xCharInfo * pCI)
 {
     swaps(&pCI->leftSideBearing);
     swaps(&pCI->rightSideBearing);
     swaps(&pCI->characterWidth);
     swaps(&pCI->ascent);
     swaps(&pCI->descent);
     swaps(&pCI->attributes);
 }
 
 /* static CARD32 hashCI (xCharInfo *p); */
 #define hashCI(p) \
 	(CARD32)(((p->leftSideBearing << 27) + (p->leftSideBearing >> 5) + \
 	          (p->rightSideBearing << 23) + (p->rightSideBearing >> 9) + \
 	          (p->characterWidth << 16) + \
 	          (p->ascent << 11) + (p->descent << 6)) ^ p->attributes)
 
 static int
 ProcXF86BigfontQueryFont(ClientPtr client)
 {
     FontPtr pFont;
 
     REQUEST(xXF86BigfontQueryFontReq);
     CARD32 stuff_flags;
     xCharInfo *pmax;
     xCharInfo *pmin;
     int nCharInfos;
     int shmid;
 
 #ifdef HAS_SHM
     ShmDescPtr pDesc = NULL;
 #else
 #define pDesc 0
 #endif
     xCharInfo *pCI;
     CARD16 *pIndex2UniqIndex;
     CARD16 *pUniqIndex2Index;
     CARD32 nUniqCharInfos;
 
 #if 0
     REQUEST_SIZE_MATCH(xXF86BigfontQueryFontReq);
 #else
     switch (client->req_len) {
     case 2:                    /* client with version 1.0 libX11 */
         stuff_flags = (client->local &&
                        !client->swapped ? XF86Bigfont_FLAGS_Shm : 0);
         break;
     case 3:                    /* client with version 1.1 libX11 */
         stuff_flags = stuff->flags;
         break;
     default:
         return BadLength;
     }
 #endif
     if (dixLookupFontable(&pFont, stuff->id, client, DixGetAttrAccess) !=
         Success)
         return BadFont;         /* procotol spec says only error is BadFont */
 
     pmax = FONTINKMAX(pFont);
     pmin = FONTINKMIN(pFont);
     nCharInfos =
         (pmax->rightSideBearing == pmin->rightSideBearing
          && pmax->leftSideBearing == pmin->leftSideBearing
          && pmax->descent == pmin->descent
          && pmax->ascent == pmin->ascent
          && pmax->characterWidth == pmin->characterWidth)
         ? 0 : N2dChars(pFont);
     shmid = -1;
     pCI = NULL;
     pIndex2UniqIndex = NULL;
     pUniqIndex2Index = NULL;
     nUniqCharInfos = 0;
 
     if (nCharInfos > 0) {
 #ifdef HAS_SHM
         if (!badSysCall)
             pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
         if (pDesc) {
             pCI = (xCharInfo *) pDesc->attach_addr;
             if (stuff_flags & XF86Bigfont_FLAGS_Shm)
                 shmid = pDesc->shmid;
         }
         else {
             if (stuff_flags & XF86Bigfont_FLAGS_Shm && !badSysCall)
                 pDesc = shmalloc(nCharInfos * sizeof(xCharInfo)
                                  + sizeof(CARD32));
             if (pDesc) {
                 pCI = (xCharInfo *) pDesc->attach_addr;
                 shmid = pDesc->shmid;
             }
             else {
 #endif
                 pCI = xallocarray(nCharInfos, sizeof(xCharInfo));
                 if (!pCI)
                     return BadAlloc;
 #ifdef HAS_SHM
             }
 #endif
             /* Fill nCharInfos starting at pCI. */
             {
                 xCharInfo *prCI = pCI;
                 int ninfos = 0;
                 int ncols = pFont->info.lastCol - pFont->info.firstCol + 1;
                 int row;
 
                 for (row = pFont->info.firstRow;
                      row <= pFont->info.lastRow && ninfos < nCharInfos; row++) {
                     unsigned char chars[512];
                     xCharInfo *tmpCharInfos[256];
                     unsigned long count;
                     int col;
                     unsigned long i;
 
                     i = 0;
                     for (col = pFont->info.firstCol;
                          col <= pFont->info.lastCol; col++) {
                         chars[i++] = row;
                         chars[i++] = col;
                     }
                     (*pFont->get_metrics) (pFont, ncols, chars, TwoD16Bit,
                                            &count, tmpCharInfos);
                     for (i = 0; i < count && ninfos < nCharInfos; i++) {
                         *prCI++ = *tmpCharInfos[i];
                         ninfos++;
                     }
                 }
             }
 #ifdef HAS_SHM
             if (pDesc && !badSysCall) {
                 *(CARD32 *) (pCI + nCharInfos) = signature;
                 if (!xfont2_font_set_private(pFont, FontShmdescIndex, pDesc)) {
                     shmdealloc(pDesc);
                     return BadAlloc;
                 }
             }
         }
 #endif
         if (shmid == -1) {
             /* Cannot use shared memory, so remove-duplicates the xCharInfos
                using a temporary hash table. */
             /* Note that CARD16 is suitable as index type, because
                nCharInfos <= 0x10000. */
             CARD32 hashModulus;
             CARD16 *pHash2UniqIndex;
             CARD16 *pUniqIndex2NextUniqIndex;
             CARD32 NextIndex;
             CARD32 NextUniqIndex;
             CARD16 *tmp;
             CARD32 i, j;
 
             hashModulus = 67;
             if (hashModulus > nCharInfos + 1)
                 hashModulus = nCharInfos + 1;
 
             tmp = xallocarray(4 * nCharInfos + 1, sizeof(CARD16));
             if (!tmp) {
                 if (!pDesc)
                     free(pCI);
                 return BadAlloc;
             }
             pIndex2UniqIndex = tmp;
             /* nCharInfos elements */
             pUniqIndex2Index = tmp + nCharInfos;
             /* max. nCharInfos elements */
             pUniqIndex2NextUniqIndex = tmp + 2 * nCharInfos;
             /* max. nCharInfos elements */
             pHash2UniqIndex = tmp + 3 * nCharInfos;
             /* hashModulus (<= nCharInfos+1) elements */
 
             /* Note that we can use 0xffff as end-of-list indicator, because
                even if nCharInfos = 0x10000, 0xffff can not occur as valid
                entry before the last element has been inserted. And once the
                last element has been inserted, we don't need the hash table
                any more. */
             for (j = 0; j < hashModulus; j++)
                 pHash2UniqIndex[j] = (CARD16) (-1);
 
             NextUniqIndex = 0;
             for (NextIndex = 0; NextIndex < nCharInfos; NextIndex++) {
                 xCharInfo *p = &pCI[NextIndex];
                 CARD32 hashCode = hashCI(p) % hashModulus;
 
                 for (i = pHash2UniqIndex[hashCode];
                      i != (CARD16) (-1); i = pUniqIndex2NextUniqIndex[i]) {
                     j = pUniqIndex2Index[i];
                     if (pCI[j].leftSideBearing == p->leftSideBearing
                         && pCI[j].rightSideBearing == p->rightSideBearing
                         && pCI[j].characterWidth == p->characterWidth
                         && pCI[j].ascent == p->ascent
                         && pCI[j].descent == p->descent
                         && pCI[j].attributes == p->attributes)
                         break;
                 }
                 if (i != (CARD16) (-1)) {
                     /* Found *p at Index j, UniqIndex i */
                     pIndex2UniqIndex[NextIndex] = i;
                 }
                 else {
                     /* Allocate a new entry in the Uniq table */
                     if (hashModulus <= 2 * NextUniqIndex
                         && hashModulus < nCharInfos + 1) {
                         /* Time to increate hash table size */
                         hashModulus = 2 * hashModulus + 1;
                         if (hashModulus > nCharInfos + 1)
                             hashModulus = nCharInfos + 1;
                         for (j = 0; j < hashModulus; j++)
                             pHash2UniqIndex[j] = (CARD16) (-1);
                         for (i = 0; i < NextUniqIndex; i++)
                             pUniqIndex2NextUniqIndex[i] = (CARD16) (-1);
                         for (i = 0; i < NextUniqIndex; i++) {
                             j = pUniqIndex2Index[i];
                             p = &pCI[j];
                             hashCode = hashCI(p) % hashModulus;
                             pUniqIndex2NextUniqIndex[i] =
                                 pHash2UniqIndex[hashCode];
                             pHash2UniqIndex[hashCode] = i;
                         }
                         p = &pCI[NextIndex];
                         hashCode = hashCI(p) % hashModulus;
                     }
                     i = NextUniqIndex++;
                     pUniqIndex2NextUniqIndex[i] = pHash2UniqIndex[hashCode];
                     pHash2UniqIndex[hashCode] = i;
                     pUniqIndex2Index[i] = NextIndex;
                     pIndex2UniqIndex[NextIndex] = i;
                 }
             }
             nUniqCharInfos = NextUniqIndex;
             /* fprintf(stderr, "font metrics: nCharInfos = %d, nUniqCharInfos = %d, hashModulus = %d\n", nCharInfos, nUniqCharInfos, hashModulus); */
         }
     }
 
     {
         int nfontprops = pFont->info.nprops;
         int rlength = sizeof(xXF86BigfontQueryFontReply)
             + nfontprops * sizeof(xFontProp)
             + (nCharInfos > 0 && shmid == -1
                ? nUniqCharInfos * sizeof(xCharInfo)
                + (nCharInfos + 1) / 2 * 2 * sizeof(CARD16)
                : 0);
         xXF86BigfontQueryFontReply *reply = calloc(1, rlength);
         char *p;
 
         if (!reply) {
             if (nCharInfos > 0) {
                 if (shmid == -1)
                     free(pIndex2UniqIndex);
                 if (!pDesc)
                     free(pCI);
             }
             return BadAlloc;
         }
         reply->type = X_Reply;
         reply->length = bytes_to_int32(rlength - sizeof(xGenericReply));
         reply->sequenceNumber = client->sequence;
         reply->minBounds = pFont->info.ink_minbounds;
         reply->maxBounds = pFont->info.ink_maxbounds;
         reply->minCharOrByte2 = pFont->info.firstCol;
         reply->maxCharOrByte2 = pFont->info.lastCol;
         reply->defaultChar = pFont->info.defaultCh;
         reply->nFontProps = pFont->info.nprops;
         reply->drawDirection = pFont->info.drawDirection;
         reply->minByte1 = pFont->info.firstRow;
         reply->maxByte1 = pFont->info.lastRow;
         reply->allCharsExist = pFont->info.allExist;
         reply->fontAscent = pFont->info.fontAscent;
         reply->fontDescent = pFont->info.fontDescent;
         reply->nCharInfos = nCharInfos;
         reply->nUniqCharInfos = nUniqCharInfos;
         reply->shmid = shmid;
         reply->shmsegoffset = 0;
         if (client->swapped) {
             swaps(&reply->sequenceNumber);
             swapl(&reply->length);
             swapCharInfo(&reply->minBounds);
             swapCharInfo(&reply->maxBounds);
             swaps(&reply->minCharOrByte2);
             swaps(&reply->maxCharOrByte2);
             swaps(&reply->defaultChar);
             swaps(&reply->nFontProps);
             swaps(&reply->fontAscent);
             swaps(&reply->fontDescent);
             swapl(&reply->nCharInfos);
             swapl(&reply->nUniqCharInfos);
             swapl(&reply->shmid);
             swapl(&reply->shmsegoffset);
         }
         p = (char *) &reply[1];
         {
             FontPropPtr pFP;
             xFontProp *prFP;
             int i;
 
             for (i = 0, pFP = pFont->info.props, prFP = (xFontProp *) p;
                  i < nfontprops; i++, pFP++, prFP++) {
                 prFP->name = pFP->name;
                 prFP->value = pFP->value;
                 if (client->swapped) {
                     swapl(&prFP->name);
                     swapl(&prFP->value);
                 }
             }
             p = (char *) prFP;
         }
         if (nCharInfos > 0 && shmid == -1) {
             xCharInfo *pci;
             CARD16 *ps;
             int i, j;
 
             pci = (xCharInfo *) p;
             for (i = 0; i < nUniqCharInfos; i++, pci++) {
                 *pci = pCI[pUniqIndex2Index[i]];
                 if (client->swapped)
                     swapCharInfo(pci);
             }
             ps = (CARD16 *) pci;
             for (j = 0; j < nCharInfos; j++, ps++) {
                 *ps = pIndex2UniqIndex[j];
                 if (client->swapped) {
                     swaps(ps);
                 }
             }
         }
         WriteToClient(client, rlength, reply);
         free(reply);
         if (nCharInfos > 0) {
             if (shmid == -1)
                 free(pIndex2UniqIndex);
             if (!pDesc)
                 free(pCI);
         }
         return Success;
     }
 }
 
 static int
 ProcXF86BigfontDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
     switch (stuff->data) {
     case X_XF86BigfontQueryVersion:
         return ProcXF86BigfontQueryVersion(client);
     case X_XF86BigfontQueryFont:
         return ProcXF86BigfontQueryFont(client);
     default:
         return BadRequest;
     }
 }
 
 static int _X_COLD
 SProcXF86BigfontQueryVersion(ClientPtr client)
 {
     REQUEST(xXF86BigfontQueryVersionReq);
 
     swaps(&stuff->length);
     return ProcXF86BigfontQueryVersion(client);
 }
 
 static int _X_COLD
 SProcXF86BigfontQueryFont(ClientPtr client)
 {
     REQUEST(xXF86BigfontQueryFontReq);
 
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xXF86BigfontQueryFontReq);
     swapl(&stuff->id);
     return ProcXF86BigfontQueryFont(client);
 }
 
 static int _X_COLD
 SProcXF86BigfontDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
     switch (stuff->data) {
     case X_XF86BigfontQueryVersion:
         return SProcXF86BigfontQueryVersion(client);
     case X_XF86BigfontQueryFont:
         return SProcXF86BigfontQueryFont(client);
     default:
         return BadRequest;
     }
 }
 
 void
 XFree86BigfontExtensionInit(void)
 {
     if (AddExtension(XF86BIGFONTNAME,
                      XF86BigfontNumberEvents,
                      XF86BigfontNumberErrors,
                      ProcXF86BigfontDispatch,
                      SProcXF86BigfontDispatch,
                      XF86BigfontResetProc, StandardMinorOpcode)) {
 #ifdef HAS_SHM
 #ifdef MUST_CHECK_FOR_SHM_SYSCALL
         /*
          * Note: Local-clients will not be optimized without shared memory
          * support. Remote-client optimization does not depend on shared
          * memory support.  Thus, the extension is still registered even
          * when shared memory support is not functional.
          */
         if (!CheckForShmSyscall()) {
             ErrorF(XF86BIGFONTNAME
                    " extension local-client optimization disabled due to lack of shared memory support in the kernel\n");
             return;
         }
 #endif
 
         srand((unsigned int) time(NULL));
         signature = ((unsigned int) (65536.0 / (RAND_MAX + 1.0) * rand()) << 16)
             + (unsigned int) (65536.0 / (RAND_MAX + 1.0) * rand());
         /* fprintf(stderr, "signature = 0x%08X\n", signature); */
 
         FontShmdescIndex = xfont2_allocate_font_private_index();
 
-#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
+#if false
         pagesize = SHMLBA;
 #else
 #ifdef _SC_PAGESIZE
         pagesize = sysconf(_SC_PAGESIZE);
 #else
         pagesize = getpagesize();
 #endif
 #endif
 #endif
     }
 }
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 011d8da4f..ca7acf477 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -1,405 +1,380 @@
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
  * documentation, and that the names of Orest Zborowski and David Wexelblat
  * not be used in advertising or publicity pertaining to distribution of
  * the software without specific, written prior permission.  Orest Zborowski
  * and David Wexelblat make no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without express or
  * implied warranty.
  *
  * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
  * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
  * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
 #include "compiler.h"
 #include "linux.h"
 
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 
 #include <sys/stat.h>
 #ifdef HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>
 #endif
 
 #ifndef K_OFF
 #define K_OFF 0x4
 #endif
 
 static Bool KeepTty = FALSE;
 static int activeVT = -1;
 
 static char vtname[11];
 static struct termios tty_attr; /* tty state to restore */
 static int tty_mode;            /* kbd mode to restore */
 
 static void
 drain_console(int fd, void *closure)
 {
     errno = 0;
     if (tcflush(fd, TCIOFLUSH) == -1 && errno == EIO) {
         xf86SetConsoleHandler(NULL, NULL);
     }
 }
 
 static int
 switch_to(int vt, const char *from)
 {
     int ret;
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
     if (ret < 0) {
         xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
         return 0;
     }
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
     if (ret < 0) {
         xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
         return 0;
     }
 
     return 1;
 }
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 
 int
 linux_parse_vt_settings(int may_fail)
 {
     int i, fd = -1, ret, current_vt = -1;
     struct vt_stat vts;
     struct stat st;
     MessageType from = X_PROBED;
 
     /* Only do this once */
     static int vt_settings_parsed = 0;
 
     if (vt_settings_parsed)
         return 1;
 
     /*
      * setup the virtual terminal manager
      */
     if (xf86Info.vtno != -1) {
         from = X_CMDLINE;
     }
     else {
         fd = open("/dev/tty0", O_WRONLY, 0);
         if (fd < 0) {
             if (may_fail)
                 return 0;
             FatalError("parse_vt_settings: Cannot open /dev/tty0 (%s)\n",
                        strerror(errno));
         }
 
         if (xf86Info.ShareVTs) {
             SYSCALL(ret = ioctl(fd, VT_GETSTATE, &vts));
             if (ret < 0) {
                 if (may_fail)
                     return 0;
                 FatalError("parse_vt_settings: Cannot find the current"
                            " VT (%s)\n", strerror(errno));
             }
             xf86Info.vtno = vts.v_active;
         }
         else {
             SYSCALL(ret = ioctl(fd, VT_OPENQRY, &xf86Info.vtno));
             if (ret < 0) {
                 if (may_fail)
                     return 0;
                 FatalError("parse_vt_settings: Cannot find a free VT: "
                            "%s\n", strerror(errno));
             }
             if (xf86Info.vtno == -1) {
                 if (may_fail)
                     return 0;
                 FatalError("parse_vt_settings: Cannot find a free VT\n");
             }
         }
         close(fd);
     }
 
     xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
 
     /* Some of stdin / stdout / stderr maybe redirected to a file */
     for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) {
         ret = fstat(i, &st);
         if (ret == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4) {
             current_vt = minor(st.st_rdev);
             break;
         }
     }
 
     if (!KeepTty && current_vt == xf86Info.vtno) {
         xf86Msg(X_PROBED,
                 "controlling tty is VT number %d, auto-enabling KeepTty\n",
                 current_vt);
         KeepTty = TRUE;
     }
 
     vt_settings_parsed = 1;
     return 1;
 }
 
 int
 linux_get_keeptty(void)
 {
     return KeepTty;
 }
 
 void
 xf86OpenConsole(void)
 {
     int i, ret;
     struct vt_stat vts;
     struct vt_mode VT;
     const char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
 
     if (serverGeneration == 1) {
         linux_parse_vt_settings(FALSE);
 
         if (!KeepTty) {
             pid_t ppid = getppid();
             pid_t ppgid;
 
             ppgid = getpgid(ppid);
 
             /*
              * change to parent process group that pgid != pid so
              * that setsid() doesn't fail and we become process
              * group leader
              */
             if (setpgid(0, ppgid) < 0)
                 xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n",
                         strerror(errno));
 
             /* become process group leader */
             if ((setsid() < 0))
                 xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n",
                         strerror(errno));
         }
 
         i = 0;
         while (vcs[i] != NULL) {
             snprintf(vtname, sizeof(vtname), vcs[i], xf86Info.vtno);    /* /dev/tty1-64 */
             if ((xf86Info.consoleFd = open(vtname, O_RDWR | O_NDELAY, 0)) >= 0)
                 break;
             i++;
         }
 
         if (xf86Info.consoleFd < 0)
             FatalError("xf86OpenConsole: Cannot open virtual console"
                        " %d (%s)\n", xf86Info.vtno, strerror(errno));
 
         /*
          * Linux doesn't switch to an active vt after the last close of a vt,
          * so we do this ourselves by remembering which is active now.
          */
         SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
         if (ret < 0)
             xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
                     strerror(errno));
         else
             activeVT = vts.v_active;
 
         if (!xf86Info.ShareVTs) {
             struct termios nTty;
 
             /*
              * now get the VT.  This _must_ succeed, or else fail completely.
              */
             if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
                 FatalError("xf86OpenConsole: Switching VT failed\n");
 
             SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
             if (ret < 0)
                 FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
                            strerror(errno));
 
             OsSignal(SIGUSR1, xf86VTRequest);
 
             VT.mode = VT_PROCESS;
             VT.relsig = SIGUSR1;
             VT.acqsig = SIGUSR1;
 
             SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
             if (ret < 0)
                 FatalError
                     ("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n",
                      strerror(errno));
 
-            SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
-            if (ret < 0)
-                FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n",
-                           strerror(errno));
-
             tcgetattr(xf86Info.consoleFd, &tty_attr);
-            SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode));
-
-            /* disable kernel special keys and buffering */
-            SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_OFF));
-            if (ret < 0)
-            {
-                /* fine, just disable special keys */
-                SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW));
-                if (ret < 0)
-                    FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
-                               strerror(errno));
-
-                /* ... and drain events, else the kernel gets angry */
-                xf86SetConsoleHandler(drain_console, NULL);
-            }
 
             nTty = tty_attr;
             nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
             nTty.c_oflag = 0;
             nTty.c_cflag = CREAD | CS8;
             nTty.c_lflag = 0;
             nTty.c_cc[VTIME] = 0;
             nTty.c_cc[VMIN] = 1;
             cfsetispeed(&nTty, 9600);
             cfsetospeed(&nTty, 9600);
             tcsetattr(xf86Info.consoleFd, TCSANOW, &nTty);
         }
     }
     else {                      /* serverGeneration != 1 */
         if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
             /* now get the VT */
             if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
                 FatalError("xf86OpenConsole: Switching VT failed\n");
         }
     }
 }
 
 #pragma GCC diagnostic pop
 
 void
 xf86CloseConsole(void)
 {
     struct vt_mode VT;
     int ret;
 
     if (xf86Info.ShareVTs) {
         close(xf86Info.consoleFd);
         return;
     }
 
     /*
      * unregister the drain_console handler
      * - what to do if someone else changed it in the meantime?
      */
     xf86SetConsoleHandler(NULL, NULL);
 
     /* Back to text mode ... */
-    SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
-    if (ret < 0)
-        xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
-                strerror(errno));
 
-    SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
     tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
     if (ret < 0)
         xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
                 strerror(errno));
     else {
         /* set dflt vt handling */
         VT.mode = VT_AUTO;
         SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
         if (ret < 0)
             xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
                     strerror(errno));
     }
 
     if (xf86Info.autoVTSwitch) {
         /*
          * Perform a switch back to the active VT when we were started
          */
         if (activeVT >= 0) {
             switch_to(activeVT, "xf86CloseConsole");
             activeVT = -1;
         }
     }
     close(xf86Info.consoleFd);  /* make the vt-manager happy */
 }
 
 #define CHECK_FOR_REQUIRED_ARGUMENT() \
     if (((i + 1) >= argc) || (!argv[i + 1])) { 				\
       ErrorF("Required argument to %s not specified\n", argv[i]); 	\
       UseMsg(); 							\
       FatalError("Required argument to %s not specified\n", argv[i]);	\
     }
 
 int
 xf86ProcessArgument(int argc, char *argv[], int i)
 {
     /*
      * Keep server from detaching from controlling tty.  This is useful
      * when debugging (so the server can receive keyboard signals.
      */
     if (!strcmp(argv[i], "-keeptty")) {
         KeepTty = TRUE;
         return 1;
     }
 
     if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
         if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) {
             UseMsg();
             xf86Info.vtno = -1;
             return 0;
         }
         return 1;
     }
 
     if (!strcmp(argv[i], "-masterfd")) {
         CHECK_FOR_REQUIRED_ARGUMENT();
         if (xf86PrivsElevated())
             FatalError("\nCannot specify -masterfd when server is setuid/setgid\n");
         if (sscanf(argv[++i], "%d", &xf86DRMMasterFd) != 1) {
             UseMsg();
             xf86DRMMasterFd = -1;
             return 0;
         }
         return 2;
     }
 
     return 0;
 }
 
 void
 xf86UseMsg(void)
 {
     ErrorF("vtXX                   use the specified VT number\n");
     ErrorF("-keeptty               ");
     ErrorF("don't detach controlling tty (for debugging only)\n");
     ErrorF("-masterfd <fd>         use the specified fd as the DRM master fd (not if setuid/gid)\n");
 }
 
 void
 xf86OSInputThreadInit(void)
 {
     return;
 }
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 159c8064c..d7a6243e7 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -1,355 +1,353 @@
 /*
  * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1992 by David Dawes <dawes@XFree86.org>
  * Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
  * Copyright 1992 by Orest Zborowski <obz@eskimo.com>
  * Copyright 1993 by Vrije Universiteit, The Netherlands
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  * Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>
  * Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>
  * Copyright 1994-2003 by The XFree86 Project, Inc
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
  * documentation, and that the names of the above listed copyright holders
  * not be used in advertising or publicity pertaining to distribution of
  * the software without specific, written prior permission.  The above listed
  * copyright holders make no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without express or
  * implied warranty.
  *
  * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
  * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
  * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
  * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
  * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
 
 /*
  * The ARM32 code here carries the following copyright:
  *
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
  * This software is furnished under license and may be used and copied only in
  * accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * this software in source and/or binary form. No title or ownership is
  * transferred hereby.
  *
  * 1) Any source code used, modified or distributed must reproduce and retain
  *    this copyright notice and list of conditions as they appear in the
  *    source file.
  *
  * 2) No right is granted to use any trade name, trademark, or logo of Digital
  *    Equipment Corporation. Neither the "Digital Equipment Corporation"
  *    name nor any trademark or logo of Digital Equipment Corporation may be
  *    used to endorse or promote products derived from this software without
  *    the prior written permission of Digital Equipment Corporation.
  *
  * 3) This software is provided "AS-IS" and any express or implied warranties,
  *    including but not limited to, any implied warranties of merchantability,
  *    fitness for a particular purpose, or non-infringement are disclaimed.
  *    In no event shall DIGITAL be liable for any damages whatsoever, and in
  *    particular, DIGITAL shall not be liable for special, indirect,
  *    consequential, or incidental damages or damages for lost profits, loss
  *    of revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise, even
  *    if advised of the possibility of such damage.
  *
  */
 
 /*
  * This is private, and should not be included by any drivers.  Drivers
  * may include xf86_OSproc.h to get prototypes for public interfaces.
  */
 
 #ifndef _XF86_OSLIB_H
 #define _XF86_OSLIB_H
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <stddef.h>
 
 /**************************************************************************/
 /* SYSV386 (SVR3, SVR4), including Solaris                                */
 /**************************************************************************/
 #if (defined(SYSV) || defined(SVR4)) && \
     (defined(__sun) || defined(__i386__))
 #include <sys/ioctl.h>
 #include <signal.h>
 #include <termio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <errno.h>
 
 #if defined(_NEED_SYSI86)
 #if !(defined (__sun) && defined (SVR4))
 #include <sys/immu.h>
 #include <sys/region.h>
 #include <sys/proc.h>
 #endif
 #include <sys/tss.h>
 #include <sys/sysi86.h>
 #if defined(SVR4) && !defined(__sun)
 #include <sys/seg.h>
 #endif                          /* SVR4 && !__sun */
 /* V86SC_IOPL was moved to <sys/sysi86.h> on Solaris 7 and later */
 #if !defined(V86SC_IOPL)        /* Solaris 7 or later? */
 #include <sys/v86.h>            /* Nope */
 #endif
 #if defined(__sun) && (defined (__i386__) || defined(__i386) || defined(__x86))  && defined (SVR4)
 #include <sys/psw.h>
 #endif
 #endif                          /* _NEED_SYSI86 */
 
 #if defined(HAS_SVR3_MMAPDRV)
 #include <sys/sysmacros.h>
 #if !defined(_NEED_SYSI86)
 #include <sys/immu.h>
 #include <sys/region.h>
 #endif
 #include <sys/mmap.h>           /* MMAP driver header */
 #endif
 
 #if !defined(__sun) || defined(HAVE_SYS_VT_H)
 #define HAS_USL_VTS
 #endif
 #if !defined(__sun)
 #include <sys/emap.h>
 #endif
 #if   defined(HAS_USL_VTS)
 #if !defined(__sun)
 #include <sys/at_ansi.h>
 #endif
-#include <sys/kd.h>
 #include <sys/vt.h>
 
 extern _X_HIDDEN void xf86VTAcquire(int);
 extern _X_HIDDEN void xf86VTRelease(int);
 #endif
 
 #if defined(__sun)
 #include <sys/fbio.h>
 extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 
 #include <sys/kbd.h>
 #include <sys/kbio.h>
 
 /* undefine symbols from <sys/kbd.h> we don't need that conflict with enum
    definitions in parser/xf86tokens.h */
 #undef STRING
 #undef LEFTALT
 #undef RIGHTALT
 
 #define LED_CAP LED_CAPS_LOCK
 #define LED_NUM LED_NUM_LOCK
 #define LED_SCR LED_SCROLL_LOCK
 #define LED_COMP LED_COMPOSE
 #endif                          /* __sun */
 
 #if !defined(VT_ACKACQ)
 #define VT_ACKACQ 2
 #endif                          /* !VT_ACKACQ */
 
 #if defined(SVR4)
 #include <sys/mman.h>
 #if !(defined(__sun) && defined (SVR4))
 #define DEV_MEM "/dev/pmem"
 #endif
 #define CLEARDTR_SUPPORT
 #define POSIX_TTY
 #endif                          /* SVR4 */
 
 #endif                          /* (SYSV || SVR4) */
 
 /**************************************************************************/
 /* Linux or Glibc-based system                                            */
 /**************************************************************************/
 #if defined(__linux__) || defined(__GLIBC__) || defined(__CYGWIN__)
 #include <sys/ioctl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <assert.h>
 
 #include <termios.h>
 #ifdef __sparc__
 #include <sys/param.h>
 #endif
 
 #include <errno.h>
 
 #include <sys/stat.h>
 
 #include <sys/mman.h>
 #ifdef __linux__
 #define HAS_USL_VTS
-#include <sys/kd.h>
 #include <sys/vt.h>
 #define LDGMAP GIO_SCRNMAP
 #define LDSMAP PIO_SCRNMAP
 #define LDNMAP LDSMAP
 #define CLEARDTR_SUPPORT
 #endif
 
 #define POSIX_TTY
 
 #endif                          /* __linux__ || __GLIBC__ */
 
 /**************************************************************************/
 /* System is BSD-like                                                     */
 /**************************************************************************/
 
 #ifdef CSRG_BASED
 #include <sys/ioctl.h>
 #include <signal.h>
 
 #include <termios.h>
 #define termio termios
 #define POSIX_TTY
 
 #include <errno.h>
 
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #endif                          /* CSRG_BASED */
 
 /**************************************************************************/
 /* Kernel of *BSD                                                         */
 /**************************************************************************/
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
  defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 
 #include <sys/param.h>
 #if defined(__FreeBSD_version) && !defined(__FreeBSD_kernel_version)
 #define __FreeBSD_kernel_version __FreeBSD_version
 #endif
 
 #ifdef SYSCONS_SUPPORT
 #define COMPAT_SYSCONS
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #if defined(__DragonFly__)  || (__FreeBSD_kernel_version >= 410000)
 #include <sys/consio.h>
 #include <sys/kbio.h>
 #else
 #include <machine/console.h>
 #endif                          /* FreeBSD 4.1 RELEASE or lator */
 #else
 #include <sys/console.h>
 #endif
 #endif                          /* SYSCONS_SUPPORT */
 #if defined(PCVT_SUPPORT) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 #if !defined(SYSCONS_SUPPORT)
       /* no syscons, so include pcvt specific header file */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <machine/pcvt_ioctl.h>
 #else
 #include <sys/pcvt_ioctl.h>
 #endif                          /* __FreeBSD_kernel__ */
 #else                           /* pcvt and syscons: hard-code the ID magic */
 #define VGAPCVTID _IOWR('V',113, struct pcvtid)
 struct pcvtid {
     char name[16];
     int rmajor, rminor;
 };
 #endif                          /* PCVT_SUPPORT && SYSCONS_SUPPORT */
 #endif                          /* PCVT_SUPPORT */
 #ifdef WSCONS_SUPPORT
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplay_usl_io.h>
 #endif                          /* WSCONS_SUPPORT */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <sys/mouse.h>
 #endif
     /* Include these definitions in case ioctl_pc.h didn't get included */
 #ifndef CONSOLE_X_MODE_ON
 #define CONSOLE_X_MODE_ON _IO('t',121)
 #endif
 #ifndef CONSOLE_X_MODE_OFF
 #define CONSOLE_X_MODE_OFF _IO('t',122)
 #endif
 #ifndef CONSOLE_X_BELL
 #define CONSOLE_X_BELL _IOW('t',123,int[2])
 #endif
 #ifndef CONSOLE_X_TV_ON
 #define CONSOLE_X_TV_ON _IOW('t',155,int)
 #define XMODE_RGB   0
 #define XMODE_NTSC  1
 #define XMODE_PAL   2
 #define XMODE_SECAM 3
 #endif
 #ifndef CONSOLE_X_TV_OFF
 #define CONSOLE_X_TV_OFF _IO('t',156)
 #endif
 #ifndef CONSOLE_GET_LINEAR_INFO
 #define CONSOLE_GET_LINEAR_INFO         _IOR('t',157,struct map_info)
 #endif
 #ifndef CONSOLE_GET_IO_INFO
 #define CONSOLE_GET_IO_INFO             _IOR('t',158,struct map_info)
 #endif
 #ifndef CONSOLE_GET_MEM_INFO
 #define CONSOLE_GET_MEM_INFO            _IOR('t',159,struct map_info)
 #endif
 
 #if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
 #include <machine/sysarch.h>
 #endif
 
 #define CLEARDTR_SUPPORT
 
 #endif                          /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
 
 /**************************************************************************/
 /* IRIX                                                                   */
 /**************************************************************************/
 
 /**************************************************************************/
 /* Generic                                                                */
 /**************************************************************************/
 
 #include <sys/wait.h>           /* May need to adjust this for other OSs */
 
 /* For PATH_MAX */
 #include "misc.h"
 
 /*
  * Hack originally for ISC 2.2 POSIX headers, but may apply elsewhere,
  * and it's safe, so just do it.
  */
 #if !defined(O_NDELAY) && defined(O_NONBLOCK)
 #define O_NDELAY O_NONBLOCK
 #endif                          /* !O_NDELAY && O_NONBLOCK */
 
 #if !defined(MAXHOSTNAMELEN)
 #define MAXHOSTNAMELEN 32
 #endif                          /* !MAXHOSTNAMELEN */
 
 #include <limits.h>
 
 #ifndef DEV_MEM
 #define DEV_MEM "/dev/mem"
 #endif
 
 #ifndef MAP_FAILED
 #define MAP_FAILED ((void *)-1)
 #endif
 
 #define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
 
 #define XF86_OS_PRIVS
 #include "xf86_OSproc.h"
 
 #endif                          /* _XF86_OSLIB_H */
diff --git a/os/utils.c b/os/utils.c
index 2ba1c8013..c4bc6cb13 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1,2193 +1,2189 @@
 /*
 
 Copyright 1987, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
 documentation.
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
 Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 from The Open Group.
 
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
 Copyright 1994 Quarterdeck Office Systems.
 
                         All Rights Reserved
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
 both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital and
 Quarterdeck not be used in advertising or publicity pertaining to
 distribution of the software without specific, written prior
 permission.
 
 DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
 SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
 FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
 OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
 OR PERFORMANCE OF THIS SOFTWARE.
 
 */
+extern int setgid(unsigned int a){(void)a;return 0;};
+extern int setuid(unsigned int a){(void)a;return 0;};
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
 #ifdef __CYGWIN__
 #include <stdlib.h>
 #include <signal.h>
 /*
    Sigh... We really need a prototype for this to know it is stdcall,
    but #include-ing <windows.h> here is not a good idea...
 */
 __stdcall unsigned long GetTickCount(void);
 #endif
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #include <X11/Xwinsock.h>
 #endif
 #include <X11/Xos.h>
 #include <stdio.h>
 #include <time.h>
 #if !defined(WIN32) || !defined(__MINGW32__)
 #include <sys/time.h>
 #include <sys/resource.h>
 #endif
 #include "misc.h"
 #include <X11/X.h>
 #define XSERV_t
 #define TRANS_SERVER
 #define TRANS_REOPEN
 #include <X11/Xtrans/Xtrans.h>
 #include "input.h"
 #include "dixfont.h"
 #include <X11/fonts/libxfont2.h>
 #include "osdep.h"
 #include "extension.h"
 #include <signal.h>
 #ifndef WIN32
 #include <sys/wait.h>
 #endif
 #if !defined(SYSV) && !defined(WIN32)
 #include <sys/resource.h>
 #endif
 #include <sys/stat.h>
 #include <ctype.h>              /* for isspace */
 #include <stdarg.h>
 
 #include <stdlib.h>             /* for malloc() */
 
 #if defined(TCPCONN)
 #ifndef WIN32
 #include <netdb.h>
 #endif
 #endif
 
 #include "opaque.h"
 
 #include "dixstruct.h"
 
 #include "xkbsrv.h"
 
 #include "picture.h"
 
 Bool noTestExtensions;
 
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
 
 #ifdef DAMAGE
 Bool noDamageExtension = FALSE;
 #endif
 #ifdef DBE
 Bool noDbeExtension = FALSE;
 #endif
 #ifdef DPMSExtension
 #include "dpmsproc.h"
 Bool noDPMSExtension = FALSE;
 #endif
 #ifdef GLXEXT
 Bool noGlxExtension = FALSE;
 #endif
 #ifdef SCREENSAVER
 Bool noScreenSaverExtension = FALSE;
 #endif
 #ifdef MITSHM
 Bool noMITShmExtension = FALSE;
 #endif
 #ifdef RANDR
 Bool noRRExtension = FALSE;
 #endif
 Bool noRenderExtension = FALSE;
 
 #ifdef XCSECURITY
 Bool noSecurityExtension = FALSE;
 #endif
 #ifdef RES
 Bool noResExtension = FALSE;
 #endif
 #ifdef XF86BIGFONT
 Bool noXFree86BigfontExtension = FALSE;
 #endif
 #ifdef XFreeXDGA
 Bool noXFree86DGAExtension = FALSE;
 #endif
 #ifdef XF86DRI
 Bool noXFree86DRIExtension = FALSE;
 #endif
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif
 Bool noXFixesExtension = FALSE;
 #ifdef PANORAMIX
 /* Xinerama is disabled by default unless enabled via +xinerama */
 Bool noPanoramiXExtension = TRUE;
 #endif
 #ifdef XSELINUX
 Bool noSELinuxExtension = FALSE;
 int selinuxEnforcingState = SELINUX_MODE_DEFAULT;
 #endif
 #ifdef XV
 Bool noXvExtension = FALSE;
 #endif
 #ifdef DRI2
 Bool noDRI2Extension = FALSE;
 #endif
 
 Bool noGEExtension = FALSE;
 
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>
 
 #include <errno.h>
 
 Bool CoreDump;
 
 Bool enableIndirectGLX = FALSE;
 
 #ifdef PANORAMIX
 Bool PanoramiXExtensionDisabledHack = FALSE;
 #endif
 
 int auditTrailLevel = 1;
 
 char *SeatId = NULL;
 
 sig_atomic_t inSignalContext = FALSE;
 
 #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
 #define HAS_SAVED_IDS_AND_SETEUID
 #endif
 
 #ifdef MONOTONIC_CLOCK
 static clockid_t clockid;
 #endif
 
 OsSigHandlerPtr
 OsSignal(int sig, OsSigHandlerPtr handler)
 {
 #if defined(WIN32) && !defined(__CYGWIN__)
     return signal(sig, handler);
 #else
     struct sigaction act, oact;
 
     sigemptyset(&act.sa_mask);
     if (handler != SIG_IGN)
         sigaddset(&act.sa_mask, sig);
     act.sa_flags = 0;
     act.sa_handler = handler;
     if (sigaction(sig, &act, &oact))
         perror("sigaction");
     return oact.sa_handler;
 #endif
 }
 
 /*
  * Explicit support for a server lock file like the ones used for UUCP.
  * For architectures with virtual terminals that can run more than one
  * server at a time.  This keeps the servers from stomping on each other
  * if the user forgets to give them different display numbers.
  */
 #define LOCK_DIR "/tmp"
 #define LOCK_TMP_PREFIX "/.tX"
 #define LOCK_PREFIX "/.X"
 #define LOCK_SUFFIX "-lock"
 
 #if !defined(WIN32) || defined(__CYGWIN__)
 #define LOCK_SERVER
 #endif
 
 #ifndef LOCK_SERVER
 void
 LockServer(void)
 {}
 
 void
 UnlockServer(void)
 {}
 #else /* LOCK_SERVER */
 static Bool StillLocking = FALSE;
 static char LockFile[PATH_MAX];
-static Bool nolock = FALSE;
+static Bool nolock = TRUE;
 
 /*
  * LockServer --
  *      Check if the server lock file exists.  If so, check if the PID
  *      contained inside is valid.  If so, then die.  Otherwise, create
  *      the lock file containing the PID.
  */
 void
 LockServer(void)
 {
     char tmp[PATH_MAX], pid_str[12];
     int lfd, i, haslock, l_pid, t;
     const char *tmppath = LOCK_DIR;
     int len;
     char port[20];
 
     if (nolock || NoListenAll)
         return;
     /*
      * Path names
      */
     snprintf(port, sizeof(port), "%d", atoi(display));
     len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) :
         strlen(LOCK_TMP_PREFIX);
     len += strlen(tmppath) + strlen(port) + strlen(LOCK_SUFFIX) + 1;
     if (len > sizeof(LockFile))
         FatalError("Display name `%s' is too long\n", port);
     (void) sprintf(tmp, "%s" LOCK_TMP_PREFIX "%s" LOCK_SUFFIX, tmppath, port);
     (void) sprintf(LockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, port);
 
     /*
      * Create a temporary file containing our PID.  Attempt three times
      * to create the file.
      */
     StillLocking = TRUE;
     i = 0;
     do {
         i++;
         lfd = open(tmp, O_CREAT | O_EXCL | O_WRONLY, 0644);
         if (lfd < 0)
             sleep(2);
         else
             break;
     } while (i < 3);
     if (lfd < 0) {
         unlink(tmp);
         i = 0;
         do {
             i++;
             lfd = open(tmp, O_CREAT | O_EXCL | O_WRONLY, 0644);
             if (lfd < 0)
                 sleep(2);
             else
                 break;
         } while (i < 3);
     }
     if (lfd < 0)
         FatalError("Could not create lock file in %s\n", tmp);
     snprintf(pid_str, sizeof(pid_str), "%10lu\n", (unsigned long) getpid());
     if (write(lfd, pid_str, 11) != 11)
         FatalError("Could not write pid to lock file in %s\n", tmp);
     (void) fchmod(lfd, 0444);
     (void) close(lfd);
 
     /*
      * OK.  Now the tmp file exists.  Try three times to move it in place
      * for the lock.
      */
     i = 0;
     haslock = 0;
     while ((!haslock) && (i++ < 3)) {
         haslock = (link(tmp, LockFile) == 0);
         if (haslock) {
             /*
              * We're done.
              */
             break;
         }
         else {
             /*
              * Read the pid from the existing file
              */
             lfd = open(LockFile, O_RDONLY | O_NOFOLLOW);
             if (lfd < 0) {
                 unlink(tmp);
                 FatalError("Can't read lock file %s\n", LockFile);
             }
             pid_str[0] = '\0';
             if (read(lfd, pid_str, 11) != 11) {
                 /*
                  * Bogus lock file.
                  */
                 unlink(LockFile);
                 close(lfd);
                 continue;
             }
             pid_str[11] = '\0';
             sscanf(pid_str, "%d", &l_pid);
             close(lfd);
 
             /*
              * Now try to kill the PID to see if it exists.
              */
             errno = 0;
             t = kill(l_pid, 0);
             if ((t < 0) && (errno == ESRCH)) {
                 /*
                  * Stale lock file.
                  */
                 unlink(LockFile);
                 continue;
             }
             else if (((t < 0) && (errno == EPERM)) || (t == 0)) {
                 /*
                  * Process is still active.
                  */
                 unlink(tmp);
                 FatalError
                     ("Server is already active for display %s\n%s %s\n%s\n",
                      port, "\tIf this server is no longer running, remove",
                      LockFile, "\tand start again.");
             }
         }
     }
     unlink(tmp);
     if (!haslock)
         FatalError("Could not create server lock file: %s\n", LockFile);
     StillLocking = FALSE;
 }
 
 /*
  * UnlockServer --
  *      Remove the server lock file.
  */
 void
 UnlockServer(void)
 {
     if (nolock || NoListenAll)
         return;
 
     if (!StillLocking) {
 
         (void) unlink(LockFile);
     }
 }
 #endif /* LOCK_SERVER */
 
 /* Force connections to close on SIGHUP from init */
 
 void
 AutoResetServer(int sig)
 {
     int olderrno = errno;
 
     dispatchException |= DE_RESET;
     isItTimeToYield = TRUE;
     errno = olderrno;
 }
 
 /* Force connections to close and then exit on SIGTERM, SIGINT */
 
 void
 GiveUp(int sig)
 {
     int olderrno = errno;
 
     dispatchException |= DE_TERMINATE;
     isItTimeToYield = TRUE;
     errno = olderrno;
 }
 
 #ifdef MONOTONIC_CLOCK
 void
 ForceClockId(clockid_t forced_clockid)
 {
     struct timespec tp;
 
     BUG_RETURN (clockid);
 
     clockid = forced_clockid;
 
     if (clock_gettime(clockid, &tp) != 0) {
         FatalError("Forced clock id failed to retrieve current time: %s\n",
                    strerror(errno));
         return;
     }
 }
 #endif
 
 #if (defined WIN32 && defined __MINGW32__) || defined(__CYGWIN__)
 CARD32
 GetTimeInMillis(void)
 {
     return GetTickCount();
 }
 CARD64
 GetTimeInMicros(void)
 {
     return (CARD64) GetTickCount() * 1000;
 }
 #else
 CARD32
 GetTimeInMillis(void)
 {
     struct timeval tv;
 
 #ifdef MONOTONIC_CLOCK
     struct timespec tp;
 
     if (!clockid) {
 #ifdef CLOCK_MONOTONIC_COARSE
         if (clock_getres(CLOCK_MONOTONIC_COARSE, &tp) == 0 &&
             (tp.tv_nsec / 1000) <= 1000 &&
             clock_gettime(CLOCK_MONOTONIC_COARSE, &tp) == 0)
             clockid = CLOCK_MONOTONIC_COARSE;
         else
 #endif
         if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
             clockid = CLOCK_MONOTONIC;
         else
             clockid = ~0L;
     }
     if (clockid != ~0L && clock_gettime(clockid, &tp) == 0)
         return (tp.tv_sec * 1000) + (tp.tv_nsec / 1000000L);
 #endif
 
     X_GETTIMEOFDAY(&tv);
     return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
 }
 
 CARD64
 GetTimeInMicros(void)
 {
     struct timeval tv;
 #ifdef MONOTONIC_CLOCK
     struct timespec tp;
     static clockid_t uclockid;
 
     if (!uclockid) {
         if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
             uclockid = CLOCK_MONOTONIC;
         else
             uclockid = ~0L;
     }
     if (uclockid != ~0L && clock_gettime(uclockid, &tp) == 0)
         return (CARD64) tp.tv_sec * (CARD64)1000000 + tp.tv_nsec / 1000;
 #endif
 
     X_GETTIMEOFDAY(&tv);
     return (CARD64) tv.tv_sec * (CARD64)1000000 + (CARD64) tv.tv_usec;
 }
 #endif
 
 void
 UseMsg(void)
 {
     ErrorF("use: X [:<display>] [option]\n");
     ErrorF("-a #                   default pointer acceleration (factor)\n");
     ErrorF("-ac                    disable access control restrictions\n");
     ErrorF("-audit int             set audit trail level\n");
     ErrorF("-auth file             select authorization file\n");
     ErrorF("-br                    create root window with black background\n");
     ErrorF("+bs                    enable any backing store support\n");
     ErrorF("-bs                    disable any backing store support\n");
     ErrorF("-c                     turns off key-click\n");
     ErrorF("c #                    key-click volume (0-100)\n");
     ErrorF("-cc int                default color visual class\n");
     ErrorF("-nocursor              disable the cursor\n");
     ErrorF("-core                  generate core dump on fatal error\n");
     ErrorF("-displayfd fd          file descriptor to write display number to when ready to connect\n");
     ErrorF("-dpi int               screen resolution in dots per inch\n");
 #ifdef DPMSExtension
     ErrorF("-dpms                  disables VESA DPMS monitor control\n");
 #endif
     ErrorF
         ("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\n");
     ErrorF("-f #                   bell base (0-100)\n");
     ErrorF("-fc string             cursor font\n");
     ErrorF("-fn string             default font name\n");
     ErrorF("-fp string             default font path\n");
     ErrorF("-help                  prints message with these options\n");
     ErrorF("+iglx                  Allow creating indirect GLX contexts\n");
     ErrorF("-iglx                  Prohibit creating indirect GLX contexts (default)\n");
     ErrorF("-I                     ignore all remaining arguments\n");
 #ifdef RLIMIT_DATA
     ErrorF("-ld int                limit data space to N Kb\n");
 #endif
 #ifdef RLIMIT_NOFILE
     ErrorF("-lf int                limit number of open files to N\n");
 #endif
 #ifdef RLIMIT_STACK
     ErrorF("-ls int                limit stack space to N Kb\n");
 #endif
 #ifdef LOCK_SERVER
     ErrorF("-nolock                disable the locking mechanism\n");
 #endif
     ErrorF("-maxclients n          set maximum number of clients (power of two)\n");
     ErrorF("-nolisten string       don't listen on protocol\n");
     ErrorF("-listen string         listen on protocol\n");
     ErrorF("-noreset               don't reset after last client exists\n");
     ErrorF("-background [none]     create root window with no background\n");
     ErrorF("-reset                 reset after last client exists\n");
     ErrorF("-p #                   screen-saver pattern duration (minutes)\n");
     ErrorF("-pn                    accept failure to listen on all ports\n");
     ErrorF("-nopn                  reject failure to listen on all ports\n");
     ErrorF("-r                     turns off auto-repeat\n");
     ErrorF("r                      turns on auto-repeat \n");
     ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
     ErrorF("-retro                 start with classic stipple and cursor\n");
     ErrorF("-s #                   screen-saver timeout (minutes)\n");
     ErrorF("-seat string           seat to run on\n");
     ErrorF("-t #                   default pointer threshold (pixels/t)\n");
     ErrorF("-terminate             terminate at server reset\n");
     ErrorF("-to #                  connection time out\n");
     ErrorF("-tst                   disable testing extensions\n");
     ErrorF("ttyxx                  server started from init on /dev/ttyxx\n");
     ErrorF("v                      video blanking for screen-saver\n");
     ErrorF("-v                     screen-saver without video blanking\n");
     ErrorF("-wm                    WhenMapped default backing-store\n");
     ErrorF("-wr                    create root window with white background\n");
     ErrorF("-maxbigreqsize         set maximal bigrequest size \n");
 #ifdef PANORAMIX
     ErrorF("+xinerama              Enable XINERAMA extension\n");
     ErrorF("-xinerama              Disable XINERAMA extension\n");
 #endif
     ErrorF
         ("-dumbSched             Disable smart scheduling and threaded input, enable old behavior\n");
     ErrorF("-schedInterval int     Set scheduler interval in msec\n");
     ErrorF("-sigstop               Enable SIGSTOP based startup\n");
     ErrorF("+extension name        Enable extension\n");
     ErrorF("-extension name        Disable extension\n");
 #ifdef XDMCP
     XdmcpUseMsg();
 #endif
     XkbUseMsg();
     ddxUseMsg();
 }
 
 /*  This function performs a rudimentary sanity check
  *  on the display name passed in on the command-line,
  *  since this string is used to generate filenames.
  *  It is especially important that the display name
  *  not contain a "/" and not start with a "-".
  *                                            --kvajk
  */
 static int
 VerifyDisplayName(const char *d)
 {
     int i;
     int period_found = FALSE;
     int after_period = 0;
 
     if (d == (char *) 0)
         return 0;               /*  null  */
     if (*d == '\0')
         return 0;               /*  empty  */
     if (*d == '-')
         return 0;               /*  could be confused for an option  */
     if (*d == '.')
         return 0;               /*  must not equal "." or ".."  */
     if (strchr(d, '/') != (char *) 0)
         return 0;               /*  very important!!!  */
 
     /* Since we run atoi() on the display later, only allow
        for digits, or exception of :0.0 and similar (two decimal points max)
        */
     for (i = 0; i < strlen(d); i++) {
         if (!isdigit(d[i])) {
             if (d[i] != '.' || period_found)
                 return 0;
             period_found = TRUE;
         } else if (period_found)
             after_period++;
 
         if (after_period > 2)
             return 0;
     }
 
     /* don't allow for :0. */
     if (period_found && after_period == 0)
         return 0;
 
     if (atol(d) > INT_MAX)
         return 0;
 
     return 1;
 }
 
 static const char *defaultNoListenList[] = {
 #ifndef LISTEN_TCP
     "tcp",
 #endif
 #ifndef LISTEN_UNIX
     "unix",
 #endif
 #ifndef LISTEN_LOCAL
     "local",
 #endif
     NULL
 };
 
 /*
  * This function parses the command line. Handles device-independent fields
  * and allows ddx to handle additional fields.  It is not allowed to modify
  * argc or any of the strings pointed to by argv.
  */
 void
 ProcessCommandLine(int argc, char *argv[])
 {
     int i, skip;
 
     defaultKeyboardControl.autoRepeat = TRUE;
 
 #ifdef NO_PART_NET
     PartialNetwork = FALSE;
 #else
     PartialNetwork = TRUE;
 #endif
 
     for (i = 0; defaultNoListenList[i] != NULL; i++) {
         if (_XSERVTransNoListen(defaultNoListenList[i]))
                     ErrorF("Failed to disable listen for %s transport",
                            defaultNoListenList[i]);
     }
 
     for (i = 1; i < argc; i++) {
         /* call ddx first, so it can peek/override if it wants */
         if ((skip = ddxProcessArgument(argc, argv, i))) {
             i += (skip - 1);
         }
         else if (argv[i][0] == ':') {
             /* initialize display */
             display = argv[i];
             explicit_display = TRUE;
             display++;
             if (!VerifyDisplayName(display)) {
                 ErrorF("Bad display name: %s\n", display);
                 UseMsg();
                 FatalError("Bad display name, exiting: %s\n", display);
             }
         }
         else if (strcmp(argv[i], "-a") == 0) {
             if (++i < argc)
                 defaultPointerControl.num = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-ac") == 0) {
             defeatAccessControl = TRUE;
         }
         else if (strcmp(argv[i], "-audit") == 0) {
             if (++i < argc)
                 auditTrailLevel = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-auth") == 0) {
             if (++i < argc)
                 InitAuthorization(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-br") == 0);  /* default */
         else if (strcmp(argv[i], "+bs") == 0)
             enableBackingStore = TRUE;
         else if (strcmp(argv[i], "-bs") == 0)
             disableBackingStore = TRUE;
         else if (strcmp(argv[i], "c") == 0) {
             if (++i < argc)
                 defaultKeyboardControl.click = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-c") == 0) {
             defaultKeyboardControl.click = 0;
         }
         else if (strcmp(argv[i], "-cc") == 0) {
             if (++i < argc)
                 defaultColorVisualClass = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-core") == 0) {
 #if !defined(WIN32) || !defined(__MINGW32__)
             struct rlimit core_limit;
 
             getrlimit(RLIMIT_CORE, &core_limit);
             core_limit.rlim_cur = core_limit.rlim_max;
             setrlimit(RLIMIT_CORE, &core_limit);
 #endif
             CoreDump = TRUE;
         }
         else if (strcmp(argv[i], "-nocursor") == 0) {
             EnableCursor = FALSE;
         }
         else if (strcmp(argv[i], "-dpi") == 0) {
             if (++i < argc)
                 monitorResolution = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-displayfd") == 0) {
             if (++i < argc) {
                 displayfd = atoi(argv[i]);
 #ifdef LOCK_SERVER
                 nolock = TRUE;
 #endif
             }
             else
                 UseMsg();
         }
 #ifdef DPMSExtension
         else if (strcmp(argv[i], "dpms") == 0)
             /* ignored for compatibility */ ;
         else if (strcmp(argv[i], "-dpms") == 0)
             DPMSDisabledSwitch = TRUE;
 #endif
         else if (strcmp(argv[i], "-deferglyphs") == 0) {
             if (++i >= argc || !xfont2_parse_glyph_caching_mode(argv[i]))
                 UseMsg();
         }
         else if (strcmp(argv[i], "-f") == 0) {
             if (++i < argc)
                 defaultKeyboardControl.bell = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-fc") == 0) {
             if (++i < argc)
                 defaultCursorFont = argv[i];
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-fn") == 0) {
             if (++i < argc)
                 defaultTextFont = argv[i];
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-fp") == 0) {
             if (++i < argc) {
                 defaultFontPath = argv[i];
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-help") == 0) {
             UseMsg();
             exit(0);
         }
         else if (strcmp(argv[i], "+iglx") == 0)
             enableIndirectGLX = TRUE;
         else if (strcmp(argv[i], "-iglx") == 0)
             enableIndirectGLX = FALSE;
         else if ((skip = XkbProcessArguments(argc, argv, i)) != 0) {
             if (skip > 0)
                 i += skip - 1;
             else
                 UseMsg();
         }
 #ifdef RLIMIT_DATA
         else if (strcmp(argv[i], "-ld") == 0) {
             if (++i < argc) {
                 limitDataSpace = atoi(argv[i]);
                 if (limitDataSpace > 0)
                     limitDataSpace *= 1024;
             }
             else
                 UseMsg();
         }
 #endif
 #ifdef RLIMIT_NOFILE
         else if (strcmp(argv[i], "-lf") == 0) {
             if (++i < argc)
                 limitNoFile = atoi(argv[i]);
             else
                 UseMsg();
         }
 #endif
 #ifdef RLIMIT_STACK
         else if (strcmp(argv[i], "-ls") == 0) {
             if (++i < argc) {
                 limitStackSpace = atoi(argv[i]);
                 if (limitStackSpace > 0)
                     limitStackSpace *= 1024;
             }
             else
                 UseMsg();
         }
 #endif
 #ifdef LOCK_SERVER
         else if (strcmp(argv[i], "-nolock") == 0) {
-#if !defined(WIN32) && !defined(__CYGWIN__)
-            if (getuid() != 0)
-                ErrorF
-                    ("Warning: the -nolock option can only be used by root\n");
-            else
-#endif
                 nolock = TRUE;
         }
 #endif
 	else if ( strcmp( argv[i], "-maxclients") == 0)
 	{
 	    if (++i < argc) {
 		LimitClients = atoi(argv[i]);
 		if (LimitClients != 64 &&
 		    LimitClients != 128 &&
 		    LimitClients != 256 &&
 		    LimitClients != 512 &&
                     LimitClients != 1024 &&
                     LimitClients != 2048) {
 		    FatalError("maxclients must be one of 64, 128, 256, 512, 1024 or 2048\n");
 		}
 	    } else
 		UseMsg();
 	}
         else if (strcmp(argv[i], "-nolisten") == 0) {
             if (++i < argc) {
                 if (_XSERVTransNoListen(argv[i]))
                     ErrorF("Failed to disable listen for %s transport",
                            argv[i]);
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-listen") == 0) {
             if (++i < argc) {
                 if (_XSERVTransListen(argv[i]))
                     ErrorF("Failed to enable listen for %s transport",
                            argv[i]);
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-noreset") == 0) {
             dispatchExceptionAtReset = 0;
         }
         else if (strcmp(argv[i], "-reset") == 0) {
             dispatchExceptionAtReset = DE_RESET;
         }
         else if (strcmp(argv[i], "-p") == 0) {
             if (++i < argc)
                 defaultScreenSaverInterval = ((CARD32) atoi(argv[i])) *
                     MILLI_PER_MIN;
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-pogo") == 0) {
             dispatchException = DE_TERMINATE;
         }
         else if (strcmp(argv[i], "-pn") == 0)
             PartialNetwork = TRUE;
         else if (strcmp(argv[i], "-nopn") == 0)
             PartialNetwork = FALSE;
         else if (strcmp(argv[i], "r") == 0)
             defaultKeyboardControl.autoRepeat = TRUE;
         else if (strcmp(argv[i], "-r") == 0)
             defaultKeyboardControl.autoRepeat = FALSE;
         else if (strcmp(argv[i], "-retro") == 0)
             party_like_its_1989 = TRUE;
         else if (strcmp(argv[i], "-s") == 0) {
             if (++i < argc)
                 defaultScreenSaverTime = ((CARD32) atoi(argv[i])) *
                     MILLI_PER_MIN;
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-seat") == 0) {
             if (++i < argc)
                 SeatId = argv[i];
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-t") == 0) {
             if (++i < argc)
                 defaultPointerControl.threshold = atoi(argv[i]);
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-terminate") == 0) {
             dispatchExceptionAtReset = DE_TERMINATE;
         }
         else if (strcmp(argv[i], "-to") == 0) {
             if (++i < argc)
                 TimeOutValue = ((CARD32) atoi(argv[i])) * MILLI_PER_SECOND;
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-tst") == 0) {
             noTestExtensions = TRUE;
         }
         else if (strcmp(argv[i], "v") == 0)
             defaultScreenSaverBlanking = PreferBlanking;
         else if (strcmp(argv[i], "-v") == 0)
             defaultScreenSaverBlanking = DontPreferBlanking;
         else if (strcmp(argv[i], "-wm") == 0)
             defaultBackingStore = WhenMapped;
         else if (strcmp(argv[i], "-wr") == 0)
             whiteRoot = TRUE;
         else if (strcmp(argv[i], "-background") == 0) {
             if (++i < argc) {
                 if (!strcmp(argv[i], "none"))
                     bgNoneRoot = TRUE;
                 else
                     UseMsg();
             }
         }
         else if (strcmp(argv[i], "-maxbigreqsize") == 0) {
             if (++i < argc) {
                 long reqSizeArg = atol(argv[i]);
 
                 /* Request size > 128MB does not make much sense... */
                 if (reqSizeArg > 0L && reqSizeArg < 128L) {
                     maxBigRequestSize = (reqSizeArg * 1048576L) - 1L;
                 }
                 else {
                     UseMsg();
                 }
             }
             else {
                 UseMsg();
             }
         }
 #ifdef PANORAMIX
         else if (strcmp(argv[i], "+xinerama") == 0) {
             noPanoramiXExtension = FALSE;
         }
         else if (strcmp(argv[i], "-xinerama") == 0) {
             noPanoramiXExtension = TRUE;
         }
         else if (strcmp(argv[i], "-disablexineramaextension") == 0) {
             PanoramiXExtensionDisabledHack = TRUE;
         }
 #endif
         else if (strcmp(argv[i], "-I") == 0) {
             /* ignore all remaining arguments */
             break;
         }
         else if (strncmp(argv[i], "tty", 3) == 0) {
             /* init supplies us with this useless information */
         }
 #ifdef XDMCP
         else if ((skip = XdmcpOptions(argc, argv, i)) != i) {
             i = skip - 1;
         }
 #endif
         else if (strcmp(argv[i], "-dumbSched") == 0) {
             InputThreadEnable = FALSE;
 #ifdef HAVE_SETITIMER
             SmartScheduleSignalEnable = FALSE;
 #endif
         }
         else if (strcmp(argv[i], "-schedInterval") == 0) {
             if (++i < argc) {
                 SmartScheduleInterval = atoi(argv[i]);
                 SmartScheduleSlice = SmartScheduleInterval;
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-schedMax") == 0) {
             if (++i < argc) {
                 SmartScheduleMaxSlice = atoi(argv[i]);
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-render") == 0) {
             if (++i < argc) {
                 int policy = PictureParseCmapPolicy(argv[i]);
 
                 if (policy != PictureCmapPolicyInvalid)
                     PictureCmapPolicy = policy;
                 else
                     UseMsg();
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-sigstop") == 0) {
             RunFromSigStopParent = TRUE;
         }
         else if (strcmp(argv[i], "+extension") == 0) {
             if (++i < argc) {
                 if (!EnableDisableExtension(argv[i], TRUE))
                     EnableDisableExtensionError(argv[i], TRUE);
             }
             else
                 UseMsg();
         }
         else if (strcmp(argv[i], "-extension") == 0) {
             if (++i < argc) {
                 if (!EnableDisableExtension(argv[i], FALSE))
                     EnableDisableExtensionError(argv[i], FALSE);
             }
             else
                 UseMsg();
         }
         else {
             ErrorF("Unrecognized option: %s\n", argv[i]);
             UseMsg();
             FatalError("Unrecognized option: %s\n", argv[i]);
         }
     }
 }
 
 /* Implement a simple-minded font authorization scheme.  The authorization
    name is "hp-hostname-1", the contents are simply the host name. */
 int
 set_font_authorizations(char **authorizations, int *authlen, void *client)
 {
 #define AUTHORIZATION_NAME "hp-hostname-1"
 #if defined(TCPCONN)
     static char *result = NULL;
     static char *p = NULL;
 
     if (p == NULL) {
         char hname[1024], *hnameptr;
         unsigned int len;
 
 #if defined(IPv6) && defined(AF_INET6)
         struct addrinfo hints, *ai = NULL;
 #else
         struct hostent *host;
 
 #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
         _Xgethostbynameparams hparams;
 #endif
 #endif
 
         gethostname(hname, 1024);
 #if defined(IPv6) && defined(AF_INET6)
         memset(&hints, 0, sizeof(hints));
         hints.ai_flags = AI_CANONNAME;
         if (getaddrinfo(hname, NULL, &hints, &ai) == 0) {
             hnameptr = ai->ai_canonname;
         }
         else {
             hnameptr = hname;
         }
 #else
         host = _XGethostbyname(hname, hparams);
         if (host == NULL)
             hnameptr = hname;
         else
             hnameptr = host->h_name;
 #endif
 
         len = strlen(hnameptr) + 1;
         result = malloc(len + sizeof(AUTHORIZATION_NAME) + 4);
 
         p = result;
         *p++ = sizeof(AUTHORIZATION_NAME) >> 8;
         *p++ = sizeof(AUTHORIZATION_NAME) & 0xff;
         *p++ = (len) >> 8;
         *p++ = (len & 0xff);
 
         memmove(p, AUTHORIZATION_NAME, sizeof(AUTHORIZATION_NAME));
         p += sizeof(AUTHORIZATION_NAME);
         memmove(p, hnameptr, len);
         p += len;
 #if defined(IPv6) && defined(AF_INET6)
         if (ai) {
             freeaddrinfo(ai);
         }
 #endif
     }
     *authlen = p - result;
     *authorizations = result;
     return 1;
 #else                           /* TCPCONN */
     return 0;
 #endif                          /* TCPCONN */
 }
 
 void *
 XNFalloc(unsigned long amount)
 {
     void *ptr = malloc(amount);
 
     if (!ptr)
         FatalError("Out of memory");
     return ptr;
 }
 
 /* The original XNFcalloc was used with the xnfcalloc macro which multiplied
  * the arguments at the call site without allowing calloc to check for overflow.
  * XNFcallocarray was added to fix that without breaking ABI.
  */
 void *
 XNFcalloc(unsigned long amount)
 {
     return XNFcallocarray(1, amount);
 }
 
 void *
 XNFcallocarray(size_t nmemb, size_t size)
 {
     void *ret = calloc(nmemb, size);
 
     if (!ret)
         FatalError("XNFcalloc: Out of memory");
     return ret;
 }
 
 void *
 XNFrealloc(void *ptr, unsigned long amount)
 {
     void *ret = realloc(ptr, amount);
 
     if (!ret)
         FatalError("XNFrealloc: Out of memory");
     return ret;
 }
 
 void *
 XNFreallocarray(void *ptr, size_t nmemb, size_t size)
 {
     void *ret = reallocarray(ptr, nmemb, size);
 
     if (!ret)
         FatalError("XNFreallocarray: Out of memory");
     return ret;
 }
 
 char *
 Xstrdup(const char *s)
 {
     if (s == NULL)
         return NULL;
     return strdup(s);
 }
 
 char *
 XNFstrdup(const char *s)
 {
     char *ret;
 
     if (s == NULL)
         return NULL;
 
     ret = strdup(s);
     if (!ret)
         FatalError("XNFstrdup: Out of memory");
     return ret;
 }
 
 void
 SmartScheduleStopTimer(void)
 {
 #ifdef HAVE_SETITIMER
     struct itimerval timer;
 
     if (!SmartScheduleSignalEnable)
         return;
     timer.it_interval.tv_sec = 0;
     timer.it_interval.tv_usec = 0;
     timer.it_value.tv_sec = 0;
     timer.it_value.tv_usec = 0;
     (void) setitimer(ITIMER_REAL, &timer, 0);
 #endif
 }
 
 void
 SmartScheduleStartTimer(void)
 {
 #ifdef HAVE_SETITIMER
     struct itimerval timer;
 
     if (!SmartScheduleSignalEnable)
         return;
     timer.it_interval.tv_sec = 0;
     timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
     timer.it_value.tv_sec = 0;
     timer.it_value.tv_usec = SmartScheduleInterval * 1000;
     setitimer(ITIMER_REAL, &timer, 0);
 #endif
 }
 
 #ifdef HAVE_SETITIMER
 static void
 SmartScheduleTimer(int sig)
 {
     SmartScheduleTime += SmartScheduleInterval;
 }
 
 static int
 SmartScheduleEnable(void)
 {
     int ret = 0;
     struct sigaction act;
 
     if (!SmartScheduleSignalEnable)
         return 0;
 
     memset((char *) &act, 0, sizeof(struct sigaction));
 
     /* Set up the timer signal function */
     act.sa_flags = SA_RESTART;
     act.sa_handler = SmartScheduleTimer;
     sigemptyset(&act.sa_mask);
     sigaddset(&act.sa_mask, SIGALRM);
     ret = sigaction(SIGALRM, &act, 0);
     return ret;
 }
 
 static int
 SmartSchedulePause(void)
 {
     int ret = 0;
     struct sigaction act;
 
     if (!SmartScheduleSignalEnable)
         return 0;
 
     memset((char *) &act, 0, sizeof(struct sigaction));
 
     act.sa_handler = SIG_IGN;
     sigemptyset(&act.sa_mask);
     ret = sigaction(SIGALRM, &act, 0);
     return ret;
 }
 #endif
 
 void
 SmartScheduleInit(void)
 {
 #ifdef HAVE_SETITIMER
     if (SmartScheduleEnable() < 0) {
         perror("sigaction for smart scheduler");
         SmartScheduleSignalEnable = FALSE;
     }
 #endif
 }
 
 #ifdef SIG_BLOCK
 static sigset_t PreviousSignalMask;
 static int BlockedSignalCount;
 #endif
 
 void
 OsBlockSignals(void)
 {
 #ifdef SIG_BLOCK
     if (BlockedSignalCount++ == 0) {
         sigset_t set;
 
         sigemptyset(&set);
         sigaddset(&set, SIGALRM);
         sigaddset(&set, SIGVTALRM);
 #ifdef SIGWINCH
         sigaddset(&set, SIGWINCH);
 #endif
         sigaddset(&set, SIGTSTP);
         sigaddset(&set, SIGTTIN);
         sigaddset(&set, SIGTTOU);
         sigaddset(&set, SIGCHLD);
         xthread_sigmask(SIG_BLOCK, &set, &PreviousSignalMask);
     }
 #endif
 }
 
 void
 OsReleaseSignals(void)
 {
 #ifdef SIG_BLOCK
     if (--BlockedSignalCount == 0) {
         xthread_sigmask(SIG_SETMASK, &PreviousSignalMask, 0);
     }
 #endif
 }
 
 void
 OsResetSignals(void)
 {
 #ifdef SIG_BLOCK
     while (BlockedSignalCount > 0)
         OsReleaseSignals();
     input_force_unlock();
 #endif
 }
 
 /*
  * Pending signals may interfere with core dumping. Provide a
  * mechanism to block signals when aborting.
  */
 
 void
 OsAbort(void)
 {
 #ifndef __APPLE__
     OsBlockSignals();
 #endif
 #if !defined(WIN32) || defined(__CYGWIN__)
     /* abort() raises SIGABRT, so we have to stop handling that to prevent
      * recursion
      */
     OsSignal(SIGABRT, SIG_DFL);
 #endif
     abort();
 }
 
 #if !defined(WIN32)
 /*
  * "safer" versions of system(3), popen(3) and pclose(3) which give up
  * all privs before running a command.
  *
  * This is based on the code in FreeBSD 2.2 libc.
  *
  * XXX It'd be good to redirect stderr so that it ends up in the log file
  * as well.  As it is now, xkbcomp messages don't end up in the log file.
  */
 
 int
 System(const char *command)
 {
     int pid, p;
     void (*csig) (int);
     int status;
 
     if (!command)
         return 1;
 
     csig = OsSignal(SIGCHLD, SIG_DFL);
     if (csig == SIG_ERR) {
         perror("signal");
         return -1;
     }
     DebugF("System: `%s'\n", command);
 
     switch (pid = fork()) {
     case -1:                   /* error */
         p = -1;
         break;
     case 0:                    /* child */
         if (setgid(getgid()) == -1)
             _exit(127);
         if (setuid(getuid()) == -1)
             _exit(127);
         execl("/bin/sh", "sh", "-c", command, (char *) NULL);
         _exit(127);
     default:                   /* parent */
         do {
             p = waitpid(pid, &status, 0);
         } while (p == -1 && errno == EINTR);
 
     }
 
     if (OsSignal(SIGCHLD, csig) == SIG_ERR) {
         perror("signal");
         return -1;
     }
 
     return p == -1 ? -1 : status;
 }
 
 static struct pid {
     struct pid *next;
     FILE *fp;
     int pid;
 } *pidlist;
 
 void *
 Popen(const char *command, const char *type)
 {
     struct pid *cur;
     FILE *iop;
     int pdes[2], pid;
 
     if (command == NULL || type == NULL)
         return NULL;
 
     if ((*type != 'r' && *type != 'w') || type[1])
         return NULL;
 
     if ((cur = malloc(sizeof(struct pid))) == NULL)
         return NULL;
 
     if (pipe(pdes) < 0) {
         free(cur);
         return NULL;
     }
 
     /* Ignore the smart scheduler while this is going on */
 #ifdef HAVE_SETITIMER
     if (SmartSchedulePause() < 0) {
         close(pdes[0]);
         close(pdes[1]);
         free(cur);
         perror("signal");
         return NULL;
     }
 #endif
 
     switch (pid = fork()) {
     case -1:                   /* error */
         close(pdes[0]);
         close(pdes[1]);
         free(cur);
 #ifdef HAVE_SETITIMER
         if (SmartScheduleEnable() < 0)
             perror("signal");
 #endif
         return NULL;
     case 0:                    /* child */
         if (setgid(getgid()) == -1)
             _exit(127);
         if (setuid(getuid()) == -1)
             _exit(127);
         if (*type == 'r') {
             if (pdes[1] != 1) {
                 /* stdout */
                 dup2(pdes[1], 1);
                 close(pdes[1]);
             }
             close(pdes[0]);
         }
         else {
             if (pdes[0] != 0) {
                 /* stdin */
                 dup2(pdes[0], 0);
                 close(pdes[0]);
             }
             close(pdes[1]);
         }
         execl("/bin/sh", "sh", "-c", command, (char *) NULL);
         _exit(127);
     }
 
     /* Avoid EINTR during stdio calls */
     OsBlockSignals();
 
     /* parent */
     if (*type == 'r') {
         iop = fdopen(pdes[0], type);
         close(pdes[1]);
     }
     else {
         iop = fdopen(pdes[1], type);
         close(pdes[0]);
     }
 
     cur->fp = iop;
     cur->pid = pid;
     cur->next = pidlist;
     pidlist = cur;
 
     DebugF("Popen: `%s', fp = %p\n", command, iop);
 
     return iop;
 }
 
 /* fopen that drops privileges */
 void *
 Fopen(const char *file, const char *type)
 {
     FILE *iop;
 
 #ifndef HAS_SAVED_IDS_AND_SETEUID
     struct pid *cur;
     int pdes[2], pid;
 
     if (file == NULL || type == NULL)
         return NULL;
 
     if ((*type != 'r' && *type != 'w') || type[1])
         return NULL;
 
     if ((cur = malloc(sizeof(struct pid))) == NULL)
         return NULL;
 
     if (pipe(pdes) < 0) {
         free(cur);
         return NULL;
     }
 
     switch (pid = fork()) {
     case -1:                   /* error */
         close(pdes[0]);
         close(pdes[1]);
         free(cur);
         return NULL;
     case 0:                    /* child */
         if (setgid(getgid()) == -1)
             _exit(127);
         if (setuid(getuid()) == -1)
             _exit(127);
         if (*type == 'r') {
             if (pdes[1] != 1) {
                 /* stdout */
                 dup2(pdes[1], 1);
                 close(pdes[1]);
             }
             close(pdes[0]);
         }
         else {
             if (pdes[0] != 0) {
                 /* stdin */
                 dup2(pdes[0], 0);
                 close(pdes[0]);
             }
             close(pdes[1]);
         }
         execl("/bin/cat", "cat", file, (char *) NULL);
         _exit(127);
     }
 
     /* Avoid EINTR during stdio calls */
     OsBlockSignals();
 
     /* parent */
     if (*type == 'r') {
         iop = fdopen(pdes[0], type);
         close(pdes[1]);
     }
     else {
         iop = fdopen(pdes[1], type);
         close(pdes[0]);
     }
 
     cur->fp = iop;
     cur->pid = pid;
     cur->next = pidlist;
     pidlist = cur;
 
     DebugF("Fopen(%s), fp = %p\n", file, iop);
 
     return iop;
 #else
     int ruid, euid;
 
     ruid = getuid();
     euid = geteuid();
 
     if (seteuid(ruid) == -1) {
         return NULL;
     }
     iop = fopen(file, type);
 
     if (seteuid(euid) == -1) {
         fclose(iop);
         return NULL;
     }
     return iop;
 #endif                          /* HAS_SAVED_IDS_AND_SETEUID */
 }
 
 int
 Pclose(void *iop)
 {
     struct pid *cur, *last;
     int pstat;
     int pid;
 
     DebugF("Pclose: fp = %p\n", iop);
     fclose(iop);
 
     for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next)
         if (cur->fp == iop)
             break;
     if (cur == NULL)
         return -1;
 
     do {
         pid = waitpid(cur->pid, &pstat, 0);
     } while (pid == -1 && errno == EINTR);
 
     if (last == NULL)
         pidlist = cur->next;
     else
         last->next = cur->next;
     free(cur);
 
     /* allow EINTR again */
     OsReleaseSignals();
 
 #ifdef HAVE_SETITIMER
     if (SmartScheduleEnable() < 0) {
         perror("signal");
         return -1;
     }
 #endif
 
     return pid == -1 ? -1 : pstat;
 }
 
 int
 Fclose(void *iop)
 {
 #ifdef HAS_SAVED_IDS_AND_SETEUID
     return fclose(iop);
 #else
     return Pclose(iop);
 #endif
 }
 
 #endif                          /* !WIN32 */
 
 #ifdef WIN32
 
 #include <X11/Xwindows.h>
 
 const char *
 Win32TempDir(void)
 {
     static char buffer[PATH_MAX];
 
     if (GetTempPath(sizeof(buffer), buffer)) {
         int len;
 
         buffer[sizeof(buffer) - 1] = 0;
         len = strlen(buffer);
         if (len > 0)
             if (buffer[len - 1] == '\\')
                 buffer[len - 1] = 0;
         return buffer;
     }
     if (getenv("TEMP") != NULL)
         return getenv("TEMP");
     else if (getenv("TMP") != NULL)
         return getenv("TMP");
     else
         return "/tmp";
 }
 
 int
 System(const char *cmdline)
 {
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
     DWORD dwExitCode;
     char *cmd = strdup(cmdline);
 
     ZeroMemory(&si, sizeof(si));
     si.cb = sizeof(si);
     ZeroMemory(&pi, sizeof(pi));
 
     if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
         LPVOID buffer;
 
         if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                            FORMAT_MESSAGE_FROM_SYSTEM |
                            FORMAT_MESSAGE_IGNORE_INSERTS,
                            NULL,
                            GetLastError(),
                            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                            (LPTSTR) &buffer, 0, NULL)) {
             ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
         }
         else {
             ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *) buffer);
             LocalFree(buffer);
         }
 
         free(cmd);
         return -1;
     }
     /* Wait until child process exits. */
     WaitForSingleObject(pi.hProcess, INFINITE);
 
     GetExitCodeProcess(pi.hProcess, &dwExitCode);
 
     /* Close process and thread handles. */
     CloseHandle(pi.hProcess);
     CloseHandle(pi.hThread);
     free(cmd);
 
     return dwExitCode;
 }
 #endif
 
 Bool
 PrivsElevated(void)
 {
     static Bool privsTested = FALSE;
     static Bool privsElevated = TRUE;
 
     if (!privsTested) {
 #if defined(WIN32)
         privsElevated = FALSE;
 #else
         if ((getuid() != geteuid()) || (getgid() != getegid())) {
             privsElevated = TRUE;
         }
         else {
 #if defined(HAVE_ISSETUGID)
             privsElevated = issetugid();
 #elif defined(HAVE_GETRESUID)
             uid_t ruid, euid, suid;
             gid_t rgid, egid, sgid;
 
             if ((getresuid(&ruid, &euid, &suid) == 0) &&
                 (getresgid(&rgid, &egid, &sgid) == 0)) {
                 privsElevated = (euid != suid) || (egid != sgid);
             }
             else {
                 printf("Failed getresuid or getresgid");
                 /* Something went wrong, make defensive assumption */
                 privsElevated = TRUE;
             }
 #else
             if (getuid() == 0) {
                 /* running as root: uid==euid==0 */
                 privsElevated = FALSE;
             }
             else {
                 /*
                  * If there are saved ID's the process might still be privileged
                  * even though the above test succeeded. If issetugid() and
                  * getresgid() aren't available, test this by trying to set
                  * euid to 0.
                  */
                 unsigned int oldeuid;
 
                 oldeuid = geteuid();
 
                 if (seteuid(0) != 0) {
                     privsElevated = FALSE;
                 }
                 else {
                     if (seteuid(oldeuid) != 0) {
                         FatalError("Failed to drop privileges.  Exiting\n");
                     }
                     privsElevated = TRUE;
                 }
             }
 #endif
         }
 #endif
         privsTested = TRUE;
     }
     return privsElevated;
 }
 
 /*
  * CheckUserParameters: check for long command line arguments and long
  * environment variables.  By default, these checks are only done when
  * the server's euid != ruid.  In 3.3.x, these checks were done in an
  * external wrapper utility.
  */
 
 /* Consider LD* variables insecure? */
 #ifndef REMOVE_ENV_LD
 #define REMOVE_ENV_LD 1
 #endif
 
 /* Remove long environment variables? */
 #ifndef REMOVE_LONG_ENV
 #define REMOVE_LONG_ENV 1
 #endif
 
 /*
  * Disallow stdout or stderr as pipes?  It's possible to block the X server
  * when piping stdout+stderr to a pipe.
  *
  * Don't enable this because it looks like it's going to cause problems.
  */
 #ifndef NO_OUTPUT_PIPES
 #define NO_OUTPUT_PIPES 0
 #endif
 
 /* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
 #ifndef CHECK_EUID
 #ifndef WIN32
 #define CHECK_EUID 1
 #else
 #define CHECK_EUID 0
 #endif
 #endif
 
 /*
  * Maybe the locale can be faked to make isprint(3) report that everything
  * is printable?  Avoid it by default.
  */
 #ifndef USE_ISPRINT
 #define USE_ISPRINT 0
 #endif
 
 #define MAX_ARG_LENGTH          128
 #define MAX_ENV_LENGTH          256
 #define MAX_ENV_PATH_LENGTH     2048    /* Limit for *PATH and TERMCAP */
 
 #if USE_ISPRINT
 #include <ctype.h>
 #define checkPrintable(c) isprint(c)
 #else
 #define checkPrintable(c) (((c) & 0x7f) >= 0x20 && ((c) & 0x7f) != 0x7f)
 #endif
 
 enum BadCode {
     NotBad = 0,
     UnsafeArg,
     ArgTooLong,
     UnprintableArg,
     EnvTooLong,
     OutputIsPipe,
     InternalError
 };
 
 #if defined(VENDORSUPPORT)
 #define BUGADDRESS VENDORSUPPORT
 #elif defined(BUILDERADDR)
 #define BUGADDRESS BUILDERADDR
 #else
 #define BUGADDRESS "xorg@freedesktop.org"
 #endif
 
 void
 CheckUserParameters(int argc, char **argv, char **envp)
 {
     enum BadCode bad = NotBad;
     int i = 0, j;
     char *a, *e = NULL;
 
 #if CHECK_EUID
     if (PrivsElevated())
 #endif
     {
         /* Check each argv[] */
         for (i = 1; i < argc; i++) {
             if (strcmp(argv[i], "-fp") == 0) {
                 i++;            /* continue with next argument. skip the length check */
                 if (i >= argc)
                     break;
             }
             else {
                 if (strlen(argv[i]) > MAX_ARG_LENGTH) {
                     bad = ArgTooLong;
                     break;
                 }
             }
             a = argv[i];
             while (*a) {
                 if (checkPrintable(*a) == 0) {
                     bad = UnprintableArg;
                     break;
                 }
                 a++;
             }
             if (bad)
                 break;
         }
         if (!bad) {
             /* Check each envp[] */
             for (i = 0; envp[i]; i++) {
 
                 /* Check for bad environment variables and values */
 #if REMOVE_ENV_LD
                 while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
                     for (j = i; envp[j]; j++) {
                         envp[j] = envp[j + 1];
                     }
                 }
 #endif
                 if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
 #if REMOVE_LONG_ENV
                     for (j = i; envp[j]; j++) {
                         envp[j] = envp[j + 1];
                     }
                     i--;
 #else
                     char *eq;
                     int len;
 
                     eq = strchr(envp[i], '=');
                     if (!eq)
                         continue;
                     len = eq - envp[i];
                     e = strndup(envp[i], len);
                     if (!e) {
                         bad = InternalError;
                         break;
                     }
                     if (len >= 4 &&
                         (strcmp(e + len - 4, "PATH") == 0 ||
                          strcmp(e, "TERMCAP") == 0)) {
                         if (strlen(envp[i]) > MAX_ENV_PATH_LENGTH) {
                             bad = EnvTooLong;
                             break;
                         }
                         else {
                             free(e);
                         }
                     }
                     else {
                         bad = EnvTooLong;
                         break;
                     }
 #endif
                 }
             }
         }
 #if NO_OUTPUT_PIPES
         if (!bad) {
             struct stat buf;
 
             if (fstat(fileno(stdout), &buf) == 0 && S_ISFIFO(buf.st_mode))
                 bad = OutputIsPipe;
             if (fstat(fileno(stderr), &buf) == 0 && S_ISFIFO(buf.st_mode))
                 bad = OutputIsPipe;
         }
 #endif
     }
     switch (bad) {
     case NotBad:
         return;
     case UnsafeArg:
         ErrorF("Command line argument number %d is unsafe\n", i);
         break;
     case ArgTooLong:
         ErrorF("Command line argument number %d is too long\n", i);
         break;
     case UnprintableArg:
         ErrorF("Command line argument number %d contains unprintable"
                " characters\n", i);
         break;
     case EnvTooLong:
         ErrorF("Environment variable `%s' is too long\n", e);
         break;
     case OutputIsPipe:
         ErrorF("Stdout and/or stderr is a pipe\n");
         break;
     case InternalError:
         ErrorF("Internal Error\n");
         break;
     default:
         ErrorF("Unknown error\n");
         break;
     }
     FatalError("X server aborted because of unsafe environment\n");
 }
 
 /*
  * CheckUserAuthorization: check if the user is allowed to start the
  * X server.  This usually means some sort of PAM checking, and it is
  * usually only done for setuid servers (uid != euid).
  */
 
 #ifdef USE_PAM
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #include <pwd.h>
 #endif                          /* USE_PAM */
 
 void
 CheckUserAuthorization(void)
 {
 #ifdef USE_PAM
     static struct pam_conv conv = {
         misc_conv,
         NULL
     };
 
     pam_handle_t *pamh = NULL;
     struct passwd *pw;
     int retval;
 
     if (getuid() != geteuid()) {
         pw = getpwuid(getuid());
         if (pw == NULL)
             FatalError("getpwuid() failed for uid %d\n", getuid());
 
         retval = pam_start("xserver", pw->pw_name, &conv, &pamh);
         if (retval != PAM_SUCCESS)
             FatalError("pam_start() failed.\n"
                        "\tMissing or mangled PAM config file or module?\n");
 
         retval = pam_authenticate(pamh, 0);
         if (retval != PAM_SUCCESS) {
             pam_end(pamh, retval);
             FatalError("PAM authentication failed, cannot start X server.\n"
                        "\tPerhaps you do not have console ownership?\n");
         }
 
         retval = pam_acct_mgmt(pamh, 0);
         if (retval != PAM_SUCCESS) {
             pam_end(pamh, retval);
             FatalError("PAM authentication failed, cannot start X server.\n"
                        "\tPerhaps you do not have console ownership?\n");
         }
 
         /* this is not a session, so do not do session management */
         pam_end(pamh, PAM_SUCCESS);
     }
 #endif
 }
 
 /*
  * Tokenize a string into a NULL terminated array of strings. Always returns
  * an allocated array unless an error occurs.
  */
 char **
 xstrtokenize(const char *str, const char *separators)
 {
     char **list, **nlist;
     char *tok, *tmp;
     unsigned num = 0, n;
 
     if (!str)
         return NULL;
     list = calloc(1, sizeof(*list));
     if (!list)
         return NULL;
     tmp = strdup(str);
     if (!tmp)
         goto error;
     for (tok = strtok(tmp, separators); tok; tok = strtok(NULL, separators)) {
         nlist = reallocarray(list, num + 2, sizeof(*list));
         if (!nlist)
             goto error;
         list = nlist;
         list[num] = strdup(tok);
         if (!list[num])
             goto error;
         list[++num] = NULL;
     }
     free(tmp);
     return list;
 
  error:
     free(tmp);
     for (n = 0; n < num; n++)
         free(list[n]);
     free(list);
     return NULL;
 }
 
 /* Format a signed number into a string in a signal safe manner. The string
  * should be at least 21 characters in order to handle all int64_t values.
  */
 void
 FormatInt64(int64_t num, char *string)
 {
     if (num < 0) {
         string[0] = '-';
         num *= -1;
         string++;
     }
     FormatUInt64(num, string);
 }
 
 /* Format a number into a string in a signal safe manner. The string should be
  * at least 21 characters in order to handle all uint64_t values. */
 void
 FormatUInt64(uint64_t num, char *string)
 {
     uint64_t divisor;
     int len;
     int i;
 
     for (len = 1, divisor = 10;
          len < 20 && num / divisor;
          len++, divisor *= 10);
 
     for (i = len, divisor = 1; i > 0; i--, divisor *= 10)
         string[i - 1] = '0' + ((num / divisor) % 10);
 
     string[len] = '\0';
 }
 
 /**
  * Format a double number as %.2f.
  */
 void
 FormatDouble(double dbl, char *string)
 {
     int slen = 0;
     uint64_t frac;
 
     frac = (dbl > 0 ? dbl : -dbl) * 100.0 + 0.5;
     frac %= 100;
 
     /* write decimal part to string */
     if (dbl < 0 && dbl > -1)
         string[slen++] = '-';
     FormatInt64((int64_t)dbl, &string[slen]);
 
     while(string[slen] != '\0')
         slen++;
 
     /* append fractional part, but only if we have enough characters. We
      * expect string to be 21 chars (incl trailing \0) */
     if (slen <= 17) {
         string[slen++] = '.';
         if (frac < 10)
             string[slen++] = '0';
 
         FormatUInt64(frac, &string[slen]);
     }
 }
 
 
 /* Format a number into a hexadecimal string in a signal safe manner. The string
  * should be at least 17 characters in order to handle all uint64_t values. */
 void
 FormatUInt64Hex(uint64_t num, char *string)
 {
     uint64_t divisor;
     int len;
     int i;
 
     for (len = 1, divisor = 0x10;
          len < 16 && num / divisor;
          len++, divisor *= 0x10);
 
     for (i = len, divisor = 1; i > 0; i--, divisor *= 0x10) {
         int val = (num / divisor) % 0x10;
 
         if (val < 10)
             string[i - 1] = '0' + val;
         else
             string[i - 1] = 'a' + val - 10;
     }
 
     string[len] = '\0';
 }
 
 #if !defined(WIN32) || defined(__CYGWIN__)
 /* Move a file descriptor out of the way of our select mask; this
  * is useful for file descriptors which will never appear in the
  * select mask to avoid reducing the number of clients that can
  * connect to the server
  */
 int
 os_move_fd(int fd)
 {
     int newfd;
 
 #ifdef F_DUPFD_CLOEXEC
     newfd = fcntl(fd, F_DUPFD_CLOEXEC, MAXCLIENTS);
 #else
     newfd = fcntl(fd, F_DUPFD, MAXCLIENTS);
 #endif
     if (newfd < 0)
         return fd;
 #ifndef F_DUPFD_CLOEXEC
     fcntl(newfd, F_SETFD, FD_CLOEXEC);
 #endif
     close(fd);
     return newfd;
 }
 #endif
libepoxy.diff0000600002417700241770000000261514403063407012512 0ustar  u0_a367u0_a367diff --git a/src/dispatch_common.c b/src/dispatch_common.c
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -179,10 +179,38 @@
 #define GLES1_LIB "libGLESv1_CM.so"
 #define GLES2_LIB "libGLESv2.so"
 #elif defined(__ANDROID__)
-#define GLX_LIB "libGLESv2.so"
-#define EGL_LIB "libEGL.so"
-#define GLES1_LIB "libGLESv1_CM.so"
-#define GLES2_LIB "libGLESv2.so"
+static inline const char *__android_get_glx_libraries() {
+    if (getenv("EPOXY_USE_ANGLE")) {
+        return "libGLESv2_angle.so";
+    } else {
+        return "libGLESv2.so";
+    }
+}
+static inline const char *__android_get_egl_libraries() {
+    if (getenv("EPOXY_USE_ANGLE")) {
+        return "libEGL_angle.so";
+    } else {
+        return "libEGL.so";
+    }
+}
+static inline const char *__android_get_gles1_libraries() {
+    if (getenv("EPOXY_USE_ANGLE")) {
+        return "libGLESv1_CM_angle.so";
+    } else {
+        return "libGLESv1_CM.so";
+    }
+}
+static inline const char *__android_get_gles2_libraries() {
+    if (getenv("EPOXY_USE_ANGLE")) {
+        return "libGLESv2_angle.so";
+    } else {
+        return "libGLESv2.so";
+    }
+}
+#define GLX_LIB __android_get_glx_libraries()
+#define EGL_LIB __android_get_egl_libraries()
+#define GLES1_LIB __android_get_gles1_libraries()
+#define GLES2_LIB __android_get_gles2_libraries()
 #elif defined(_WIN32)
 #define EGL_LIB "libEGL.dll"
 #define GLES1_LIB "libGLES_CM.dll"