diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-04-20 16:42:59 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-04-20 16:42:59 +0000 |
| commit | c8ef90d9bc15e8f128d49e0493d0f702baedd05d (patch) | |
| tree | 7f8645d05ba32ea015d71931a4f1825cfebbd818 /app/xrdb/xrdb.c | |
| parent | 869956e95c111dc12f2411080c446c4f30869963 (diff) | |
update to xrdb 1.0.5
Diffstat (limited to 'app/xrdb/xrdb.c')
| -rw-r--r-- | app/xrdb/xrdb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/xrdb/xrdb.c b/app/xrdb/xrdb.c index 35a45e094..050b4f89b 100644 --- a/app/xrdb/xrdb.c +++ b/app/xrdb/xrdb.c @@ -2,7 +2,7 @@ * xrdb - X resource manager database utility * * $Xorg: xrdb.c,v 1.6 2000/08/17 19:54:56 cpqbld Exp $ - * $XdotOrg: app/xrdb/xrdb.c,v 1.6 2006/04/03 20:32:20 alanc Exp $ + * $XdotOrg: app/xrdb/xrdb.c,v 1.5 2006/04/03 18:23:14 alanc Exp $ */ /* @@ -1203,10 +1203,13 @@ Process(int scrno, Bool doScreen, Bool execute) #else if((cmd = (char *) malloc(strlen(cpp_program) + strlen(includes.val) + 1 + - strlen(defines.val) + 1)) == + strlen(defines.val) + 1 + + strlen(filename ? filename : "") + 1)) == NULL) fatal("%s: Out of memory\n", ProgramName); - sprintf(cmd, "%s%s %s", cpp_program, includes.val, defines.val); + sprintf(cmd, "%s%s %s %s", cpp_program, + includes.val, defines.val, + filename ? filename : ""); if (!(input = popen(cmd, "r"))) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); |