File xfs-no_config_file.diff of Package xorg-x11
diff -u -p -r ../xfs-1.0.8.orig//os/osglue.c ./os/osglue.c
--- ../xfs-1.0.8.orig//os/osglue.c 2008-10-25 11:34:19.082055835 +0200
+++ ./os/osglue.c 2008-10-25 11:50:19.296627251 +0200
@@ -367,12 +367,20 @@ CloneMyself(void)
}
sprintf (portnum, "%d", ListenPort);
- if (*old_listen_arg != '\0')
- execlp(progname, progname,
- "-ls", old_listen_arg,
- "-cf", configfilename,
- "-port", portnum,
- (void *)NULL);
+ if (*old_listen_arg != '\0') {
+ if (configfilename != NULL) {
+ execlp(progname, progname,
+ "-ls", old_listen_arg,
+ "-cf", configfilename,
+ "-port", portnum,
+ (void *)NULL);
+ } else {
+ execlp(progname, progname,
+ "-ls", old_listen_arg,
+ "-port", portnum,
+ (void *)NULL);
+ }
+ }
InitErrors(); /* reopen errors, since we don't want to lose
* this */