aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/xkbcomp.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-04 19:13:27 +0000
committermarha <marha@users.sourceforge.net>2009-10-04 19:13:27 +0000
commit77a4732b0637493966889fe3545966fdc12a1b5e (patch)
tree42ab7f9667a7b3bdd89e6bb5c50793dad170b974 /xkbcomp/xkbcomp.c
parent67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff)
downloadvcxsrv-77a4732b0637493966889fe3545966fdc12a1b5e.tar.gz
vcxsrv-77a4732b0637493966889fe3545966fdc12a1b5e.tar.bz2
vcxsrv-77a4732b0637493966889fe3545966fdc12a1b5e.zip
Updated to
xkeyboard-config-1.7 pixman-0.16.2 libX11-1.3 libXinerama-1.1 xkbcomp-1.1.1 recordproto-1.14 xineramaproto-1.2 inputproto-2.0 compositeproto-0.4.1 xorg-server-1.7.0
Diffstat (limited to 'xkbcomp/xkbcomp.c')
-rw-r--r--xkbcomp/xkbcomp.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/xkbcomp/xkbcomp.c b/xkbcomp/xkbcomp.c
index 988b5c575..bf3f670af 100644
--- a/xkbcomp/xkbcomp.c
+++ b/xkbcomp/xkbcomp.c
@@ -1192,11 +1192,19 @@ main(int argc, char *argv[])
}
if (outputFormat != WANT_X_SERVER)
{
- fclose(out);
- if (!ok)
+ if (fclose(out))
+ {
+ ERROR1("Cannot close \"%s\" properly (not enough space?)\n",
+ outputFile);
+ ok= False;
+ }
+ else if (!ok)
{
ERROR2("%s in %s\n", _XkbErrMessages[_XkbErrCode],
_XkbErrLocation ? _XkbErrLocation : "unknown");
+ }
+ if (!ok)
+ {
ACTION1("Output file \"%s\" removed\n", outputFile);
unlink(outputFile);
}