From bd433c6487a52f95e6bb949d5698dc5ea0923713 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 10 Oct 2011 17:47:40 +0200 Subject: Imported nx-X11-3.3.0-6.tar.gz Summary: Imported nx-X11-3.3.0-6.tar.gz Keywords: Imported nx-X11-3.3.0-6.tar.gz into Git repository --- nx-X11/programs/Xserver/xkb/ddxLoad.c | 7 ++++++- nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb') 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 -- cgit v1.2.3