diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2018-10-30 00:00:45 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:31:57 +0100 |
commit | b09a72b08c7effeac42652f087f0b8f16bc74763 (patch) | |
tree | 563983a65e7f6b6c7e8acf44f4c30d9f1364fc7b /nx-X11/programs/Xserver/xkb/ddxLoad.c | |
parent | b01e29efffafe9f426eb88ba400e2fa24de548aa (diff) | |
download | nx-libs-b09a72b08c7effeac42652f087f0b8f16bc74763.tar.gz nx-libs-b09a72b08c7effeac42652f087f0b8f16bc74763.tar.bz2 nx-libs-b09a72b08c7effeac42652f087f0b8f16bc74763.zip |
Convert existing Xprintf style calls to asprintf style
This commit + some more adaption in ddxLoad.c which where no longer
present when Alan did the patch. However, our code still has them:
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 20:09:04 2010 -0800
Convert existing Xprintf style calls to asprintf style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/ddxLoad.c')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxLoad.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index fca0cd62f..d63512846 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -248,19 +248,21 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; char *xkbbasedir = XkbBaseDirectory; char *xkbbindir = XkbBinDirectory; - cmd = Xprintf("\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"", + if (asprintf(&cmd,"\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"", xkbbindir, ((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)), xkbbasedir,(map?"-m ":""),(map?map:""), PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1,file, - xkm_output_dir,outFile); + xkm_output_dir,outFile) == -1) + cmd = NULL; } else { - cmd = Xprintf("xkbcomp -w %d -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"", + if (asprintf(&cmd, "xkbcomp -w %d -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"", ((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)), (map?"-m ":""),(map?map:""), PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1,file, - xkm_output_dir,outFile); + xkm_output_dir,outFile) == -1) + cmd = NULL; } #ifdef DEBUG if (xkbDebugFlags) { @@ -336,13 +338,14 @@ char tmpname[PATH_MAX]; char *xkbbasedir = XkbBaseDirectory; char *xkbbindir = XkbBinDirectory; - buf = Xprintf( - "\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm \"%s\" -em1 %s -emp %s -eml %s \"%s%s.xkm\"", + if (asprintf(&buf, + "\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm \"%s\" -em1 %s -emp %s -eml %s \"%s%s.xkm\"", xkbbindir, ((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)), xkbbasedir, xkmfile, PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1, - xkm_output_dir,keymap); + xkm_output_dir,keymap) == -1) + buf = NULL; } else { #ifndef WIN32 @@ -350,12 +353,13 @@ char tmpname[PATH_MAX]; #else char *xkmfile = tmpname; #endif - buf = Xprintf( + if (asprintf(&buf, "xkbcomp -w %d -xkm \"%s\" -em1 %s -emp %s -eml %s \"%s%s.xkm\"", ((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)), xkmfile, PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1, - xkm_output_dir,keymap); + xkm_output_dir,keymap) == -1) + buf = NULL; } #ifdef TEST |