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

Merge 20e158f076 into d403cbd25c

This commit is contained in:
Collin 2025-07-05 01:25:47 +05:30 committed by GitHub
parent d403cbd25c 20e158f076
commit 86a3d785b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
os/log.c
View File

@ -179,9 +179,10 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
FatalError("Cannot allocate space for the log file name\n"); FatalError("Cannot allocate space for the log file name\n");
if (backup && *backup) { if (backup && *backup) {
int fd = open(logFileName, O_RDWR | O_NOFOLLOW);
if (fd != -1) {
struct stat buf; struct stat buf;
if (fstat(fd, &buf) == 0 && S_ISREG(buf.st_mode)) {
if (!stat(logFileName, &buf) && S_ISREG(buf.st_mode)) {
char *suffix; char *suffix;
char *oldLog; char *oldLog;
@ -191,12 +192,14 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
} }
free(suffix); free(suffix);
if (rename(logFileName, oldLog) == -1) { if (renameat(AT_FDCWD, logFileName, AT_FDCWD, oldLog) == -1) {
FatalError("Cannot move old log file \"%s\" to \"%s\"\n", FatalError("Cannot move old log file \"%s\" to \"%s\"\n",
logFileName, oldLog); logFileName, oldLog);
} }
free(oldLog); free(oldLog);
} }
close(fd);
}
} }
else { else {
if (remove(logFileName) != 0 && errno != ENOENT) { if (remove(logFileName) != 0 && errno != ENOENT) {