X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Faccesslog.c;h=0c292c818f7b5c0c13c1e2270c26ed8a93fba124;hb=0b6f220fc8ac58b6404e2d45eed52629d549860f;hp=02e5f1ad1a2e3149553f88ad00c337ebc39129c8;hpb=4d2dc22a9a68395a5788ae66c84ae0ced2d0e733;p=ashd.git

diff --git a/src/accesslog.c b/src/accesslog.c
index 02e5f1a..0c292c8 100644
--- a/src/accesslog.c
+++ b/src/accesslog.c
@@ -58,7 +58,7 @@ static void qputs(char *s, FILE *o)
 	} else if(*s == '\t') {
 	    fputs("\\t", o);
 	} else if((*s < 32) || (*s >= 128)) {
-	    fprintf(o, "\\x%02x", *s);
+	    fprintf(o, "\\x%02x", (int)(unsigned char)*s);
 	} else {
 	    fputc(*s, o);
 	}
@@ -255,6 +255,7 @@ static void reopenlog(void)
 	flog(LOG_WARNING, "accesslog: could not reopen log file `%s' on SIGHUP: %s", outname, strerror(errno));
 	return;
     }
+    fcntl(fileno(new), F_SETFD, FD_CLOEXEC);
     if(locklog) {
 	if(lockfile(new)) {
 	    if((errno == EAGAIN) || (errno == EACCES)) {
@@ -326,11 +327,13 @@ int main(int argc, char **argv)
 	outname = argv[optind];
     if(outname == NULL) {
 	out = stdout;
+	locklog = 0;
     } else {
 	if((out = fopen(argv[optind], "a")) == NULL) {
 	    flog(LOG_ERR, "accesslog: could not open %s for logging: %s", argv[optind], strerror(errno));
 	    exit(1);
 	}
+	fcntl(fileno(out), F_SETFD, FD_CLOEXEC);
     }
     if(locklog) {
 	if(lockfile(out)) {
@@ -342,7 +345,6 @@ int main(int argc, char **argv)
 	    }
 	}
     }
-    fcntl(fileno(out), F_SETFD, FD_CLOEXEC);
     if((ch = stdmkchild(argv + optind + 1, NULL, NULL)) < 0) {
 	flog(LOG_ERR, "accesslog: could not fork child: %s", strerror(errno));
 	exit(1);