Imported nx-X11-3.3.0-6.tar.gznx-X11/3.3.0-6

Summary: Imported nx-X11-3.3.0-6.tar.gz
Keywords:

Imported nx-X11-3.3.0-6.tar.gz
into Git repository

5 files changed, 338 insertions, 2 deletions

diff --git a/nx-X11/programs/Xserver/os/xprintf.c b/nx-X11/programs/Xserver/os/xprintf.c
index 07eaa1f58..a1ee21300 100644
--- a/nx-X11/programs/Xserver/os/xprintf.c
+++ b/nx-X11/programs/Xserver/os/xprintf.c
@@ -43,6 +43,63 @@
 # endif
 #endif
     
+#ifdef NXAGENT_SERVER
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#define START_SIZE  256
+#define END_SIZE   2048
+
+char *
+Xvprintf(const char *format, va_list va)
+{
+    char *ret;
+    char *newret;
+    int size;
+    int r;
+
+    size = 0;
+
+    for (;;)
+    {
+      if (size == 0)
+      {
+        ret = (char *)malloc(START_SIZE);
+        if (ret == NULL)
+          return NULL;
+        size = START_SIZE;
+      }
+      else if (size < END_SIZE &&
+                   (newret = (char *) realloc(ret, 2 * size)) != NULL)
+      {
+        ret = newret;
+        size = 2 * size;
+      }
+      else
+      {
+        free(ret);
+        return NULL;
+      }
+
+      r = vsnprintf(ret, size, format, va);
+
+      if (r == -1 || r == size || r > size || r == size - 1)
+      {
+        continue;
+      }
+      else
+      {
+        ret[r] = 0;
+        return ret;
+      }
+    }
+}
+
+#else
+
 char *
 Xvprintf(const char *format, va_list va)
 {
@@ -63,6 +120,8 @@ Xvprintf(const char *format, va_list va)
     return ret;
 }
 
+#endif
+
 char *Xprintf(const char *format, ...)
 {
     char *ret;
diff --git a/nx-X11/programs/Xserver/os/xprintf.c.NX.original b/nx-X11/programs/Xserver/os/xprintf.c.NX.original
new file mode 100644
index 000000000..a1ee21300
--- /dev/null
+++ b/nx-X11/programs/Xserver/os/xprintf.c.NX.original
@@ -0,0 +1,163 @@
+/* 
+ * printf routines which xalloc their buffer
+ */ 
+/*
+ * Copyright (c) 2004 Alexander Gottwald
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/Xos.h>
+#include "os.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifndef va_copy
+# ifdef __va_copy
+#  define va_copy __va_copy
+# else
+#  error "no working va_copy was found"
+# endif
+#endif
+    
+#ifdef NXAGENT_SERVER
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#define START_SIZE  256
+#define END_SIZE   2048
+
+char *
+Xvprintf(const char *format, va_list va)
+{
+    char *ret;
+    char *newret;
+    int size;
+    int r;
+
+    size = 0;
+
+    for (;;)
+    {
+      if (size == 0)
+      {
+        ret = (char *)malloc(START_SIZE);
+        if (ret == NULL)
+          return NULL;
+        size = START_SIZE;
+      }
+      else if (size < END_SIZE &&
+                   (newret = (char *) realloc(ret, 2 * size)) != NULL)
+      {
+        ret = newret;
+        size = 2 * size;
+      }
+      else
+      {
+        free(ret);
+        return NULL;
+      }
+
+      r = vsnprintf(ret, size, format, va);
+
+      if (r == -1 || r == size || r > size || r == size - 1)
+      {
+        continue;
+      }
+      else
+      {
+        ret[r] = 0;
+        return ret;
+      }
+    }
+}
+
+#else
+
+char *
+Xvprintf(const char *format, va_list va)
+{
+    char *ret;
+    int size;
+    va_list va2;
+
+    va_copy(va2, va);
+    size = vsnprintf(NULL, 0, format, va2);
+    va_end(va2);
+
+    ret = (char *)Xalloc(size + 1);
+    if (ret == NULL)
+        return NULL;
+
+    vsnprintf(ret, size + 1, format, va);
+    ret[size] = 0;
+    return ret;
+}
+
+#endif
+
+char *Xprintf(const char *format, ...)
+{
+    char *ret;
+    va_list va;
+    va_start(va, format);
+    ret = Xvprintf(format, va);
+    va_end(va);
+    return ret;
+}
+
+char *
+XNFvprintf(const char *format, va_list va)
+{
+    char *ret;
+    int size;
+    va_list va2;
+
+    va_copy(va2, va);
+    size = vsnprintf(NULL, 0, format, va2);
+    va_end(va2);
+
+    ret = (char *)XNFalloc(size + 1);
+    if (ret == NULL)
+        return NULL;
+
+    vsnprintf(ret, size + 1, format, va);
+    ret[size] = 0;
+    return ret;
+}
+
+char *XNFprintf(const char *format, ...)
+{
+    char *ret;
+    va_list va;
+    va_start(va, format);
+    ret = XNFvprintf(format, va);
+    va_end(va);
+    return ret;
+}
diff --git a/nx-X11/programs/Xserver/os/xprintf.c.X.original b/nx-X11/programs/Xserver/os/xprintf.c.X.original
new file mode 100644
index 000000000..07eaa1f58
--- /dev/null
+++ b/nx-X11/programs/Xserver/os/xprintf.c.X.original
@@ -0,0 +1,104 @@
+/* 
+ * printf routines which xalloc their buffer
+ */ 
+/*
+ * Copyright (c) 2004 Alexander Gottwald
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/Xos.h>
+#include "os.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifndef va_copy
+# ifdef __va_copy
+#  define va_copy __va_copy
+# else
+#  error "no working va_copy was found"
+# endif
+#endif
+    
+char *
+Xvprintf(const char *format, va_list va)
+{
+    char *ret;
+    int size;
+    va_list va2;
+
+    va_copy(va2, va);
+    size = vsnprintf(NULL, 0, format, va2);
+    va_end(va2);
+
+    ret = (char *)Xalloc(size + 1);
+    if (ret == NULL)
+        return NULL;
+
+    vsnprintf(ret, size + 1, format, va);
+    ret[size] = 0;
+    return ret;
+}
+
+char *Xprintf(const char *format, ...)
+{
+    char *ret;
+    va_list va;
+    va_start(va, format);
+    ret = Xvprintf(format, va);
+    va_end(va);
+    return ret;
+}
+
+char *
+XNFvprintf(const char *format, va_list va)
+{
+    char *ret;
+    int size;
+    va_list va2;
+
+    va_copy(va2, va);
+    size = vsnprintf(NULL, 0, format, va2);
+    va_end(va2);
+
+    ret = (char *)XNFalloc(size + 1);
+    if (ret == NULL)
+        return NULL;
+
+    vsnprintf(ret, size + 1, format, va);
+    ret[size] = 0;
+    return ret;
+}
+
+char *XNFprintf(const char *format, ...)
+{
+    char *ret;
+    va_list va;
+    va_start(va, format);
+    ret = XNFvprintf(format, va);
+    va_end(va);
+    return ret;
+}
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 8e35ab82a..e69d95670 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -719,7 +719,12 @@ char tmpname[PATH_MAX];
     }
     
     #ifdef TEST
-    fprintf(stderr, "XkbDDXCompileKeymapByNames: Executing command [%s].\n", buf);
+    if (buf != NULL)
+        fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+                    "Executing command [%s].\n", buf);
+    else
+        fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+                    "Callin Popen() with null command.\n");
     #endif
 
 #ifndef WIN32
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
index 8e35ab82a..e69d95670 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
@@ -719,7 +719,12 @@ char tmpname[PATH_MAX];
     }
     
     #ifdef TEST
-    fprintf(stderr, "XkbDDXCompileKeymapByNames: Executing command [%s].\n", buf);
+    if (buf != NULL)
+        fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+                    "Executing command [%s].\n", buf);
+    else
+        fprintf(stderr, "XkbDDXCompileKeymapByNames: "
+                    "Callin Popen() with null command.\n");
     #endif
 
 #ifndef WIN32