Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

22440 Unchecked return value from library

Browse source 
rewrite log rotation, check errors
This commit is contained in:
Enno Rehling 2015-11-04 14:16:15 +01:00
parent 30cc5405ae
commit eea0186601
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/util/log.c
View file

@ -76,27 +76,24 @@ 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)
{ {
int n;
if (_access(filename, 4) == 0) { if (_access(filename, 4) == 0) {
char buffer[2][MAX_PATH]; char buffer[2][MAX_PATH];
int src = 1; int dst = 1;
assert(strlen(filename) < sizeof(buffer[0]) - 4); assert(strlen(filename) < sizeof(buffer[0]) - 4);
for (n = 0; n < maxindex; ++n) {
sprintf(buffer[0], "%s.%d", filename, n); sprintf(buffer[dst], "%s.%d", filename, maxindex);
if (_access(filename, 0) != 0) { while (maxindex > 0) {
break; int err, src = dst - 1;
sprintf(buffer[src], "%s.%d", filename, --maxindex);
err = rename(buffer[src], buffer[dst]);
if (err != 0) {
log_error("log rotate %s: %s", buffer[dst], strerror(errno));
} }
dst = src;
} }
if (_access(buffer[0], 0) == 0) { if (rename(filename, buffer[dst]) != 0) {
unlink(buffer[0]); log_error("log rotate %s: %s", buffer[dst], strerror(errno));
} }
while (n--) {
int dst = 1 - src;
sprintf(buffer[src], "%s.%d", filename, n);
rename(buffer[src], buffer[dst]);
src = dst;
}
rename(filename, buffer[1 - src]);
} }
} }