frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: Fix -logfile when used with -displayfd 

Trivial way to reproduce the bug:

$ Xorg -logfile /tmp/mylog -config /etc/xpra/xorg.conf -displayfd 2

The server then moans:

Failed to rename log file "/tmp/mylog" to "/tmp/mylog": No such file or directory

And the log file is created but immediately renamed to "/tmp/mylog.old".
This is caused by the changes to the log file handling introduced by
this commit:

https://cgit.freedesktop.org/xorg/xserver/commit/?id=edcb6426f20c3be5dd5f50b76a686754aef2f64e

To fix this, only rename the logfile if the log filename contains the
magic substitution string "%s".

Signed-off-by: Antoine Martin <antoine@nagafix.co.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Antoine Martin 2018-03-28 15:16:02 -04:00 committed by Adam Jackson
parent b355e55f50
commit c95361465e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/log.c
View File

@ -296,7 +296,7 @@ LogInit(const char *fname, const char *backup)
void void
LogSetDisplay(void) LogSetDisplay(void)
{ {
if (saved_log_fname) { if (saved_log_fname && strstr(saved_log_fname, "%s")) {
char *logFileName; char *logFileName;
logFileName = LogFilePrep(saved_log_fname, saved_log_backup, display); logFileName = LogFilePrep(saved_log_fname, saved_log_backup, display);