Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
accesslog: Fixed non-ASCII logging bug again.
[ashd.git]
/
src
/
accesslog.c
diff --git
a/src/accesslog.c
b/src/accesslog.c
index
0c292c8
..
88b61b3
100644
(file)
--- a/
src/accesslog.c
+++ b/
src/accesslog.c
@@
-46,8
+46,10
@@
static char *format;
static struct timeval now;
static volatile int reopen = 0;
static struct timeval now;
static volatile int reopen = 0;
-static void qputs(char *s, FILE *o)
+static void qputs(char *s
p
, FILE *o)
{
{
+ unsigned char *s = (unsigned char *)sp;
+
for(; *s; s++) {
if(*s == '\"') {
fputs("\\\"", o);
for(; *s; s++) {
if(*s == '\"') {
fputs("\\\"", o);
@@
-58,7
+60,7
@@
static void qputs(char *s, FILE *o)
} else if(*s == '\t') {
fputs("\\t", o);
} else if((*s < 32) || (*s >= 128)) {
} else if(*s == '\t') {
fputs("\\t", o);
} else if((*s < 32) || (*s >= 128)) {
- fprintf(o, "\\x%02x", (int)
(unsigned char)
*s);
+ fprintf(o, "\\x%02x", (int)*s);
} else {
fputc(*s, o);
}
} else {
fputc(*s, o);
}
@@
-395,6
+397,7
@@
int main(int argc, char **argv)
if(pfd[1].revents & POLLHUP)
break;
}
if(pfd[1].revents & POLLHUP)
break;
}
+ fclose(out);
if(pidfile != NULL)
unlink(pidfile);
return(0);
if(pidfile != NULL)
unlink(pidfile);
return(0);