22583 Time of check time of use

avoid use of access()
This commit is contained in:
Enno Rehling 2015-11-05 14:05:58 +01:00
parent 5f99288af1
commit 40651d57cd

View file

@ -77,24 +77,26 @@ cp_convert(const char *format, char *buffer, size_t length, int codepage)
void log_rotate(const char *filename, int maxindex) void log_rotate(const char *filename, int maxindex)
{ {
if (_access(filename, 4) == 0) { char buffer[2][MAX_PATH];
char buffer[2][MAX_PATH]; int dst = 1;
int dst = 1; assert(strlen(filename) < sizeof(buffer[0]) - 4);
assert(strlen(filename) < sizeof(buffer[0]) - 4);
sprintf(buffer[dst], "%s.%d", filename, maxindex); sprintf(buffer[dst], "%s.%d", filename, maxindex);
while (maxindex > 0) { #ifdef HAVE_UNISTD_H
int err, src = 1 - dst; /* make sure we don't overwrite an existing file (hard links) */
sprintf(buffer[src], "%s.%d", filename, --maxindex); unlink(buffer[dst]);
err = rename(buffer[src], buffer[dst]); #endif
if (err != 0) { while (maxindex > 0) {
log_error("log rotate %s: %s", buffer[dst], strerror(errno)); int err, src = 1 - dst;
} sprintf(buffer[src], "%s.%d", filename, --maxindex);
dst = src; err = rename(buffer[src], buffer[dst]);
} if (err != 0) {
if (rename(filename, buffer[dst]) != 0) { log_debug("log rotate %s: %s", buffer[dst], strerror(errno));
log_error("log rotate %s: %s", buffer[dst], strerror(errno));
} }
dst = src;
}
if (rename(filename, buffer[dst]) != 0) {
log_debug("log rotate %s: %s", buffer[dst], strerror(errno));
} }
} }