 @@ -1,14 +1,14 @@
-/*	$NetBSD: bozohttpd.c,v 1.27 2011/03/29 07:22:31 jmmv Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.28 2011/08/27 15:33:59 joerg Exp $	*/
 /*	$eterna: bozohttpd.c,v 1.176 2010/09/20 22:26:28 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -144,30 +144,26 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <grp.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <time.h>
 #include <unistd.h>
 #ifndef __attribute__
 #define __attribute__(x)
 #endif /* __attribute__ */
 #include "bozohttpd.h"
 #ifndef MAX_WAIT_TIME
 #define	MAX_WAIT_TIME	60	/* hang around for 60 seconds max */
 #endif
 /* variables and functions */
 #ifndef LOG_FTP
 #define LOG_FTP LOG_DAEMON
 #endif
 volatile sig_atomic_t	alarmhit;
 @@ -1402,29 +1398,30 @@ bozo_process_request(bozo_httpreq_t *req
 		goto cleanup;
+	}
 	/* validate requested range */
 	if (request->hr_last_byte_pos == -1 ||
 	    request->hr_last_byte_pos >= sb.st_size)
 		request->hr_last_byte_pos = sb.st_size - 1;
 	if (request->hr_have_range &&
 	    request->hr_first_byte_pos > request->hr_last_byte_pos) {
 		request->hr_have_range = 0;	/* punt */
 		request->hr_first_byte_pos = 0;
 		request->hr_last_byte_pos = sb.st_size - 1;
+	}
-	debug((httpd, DEBUG_FAT, "have_range %d first_pos %qd last_pos %qd",
+	debug((httpd, DEBUG_FAT, "have_range %d first_pos %lld last_pos %lld",
 	    request->hr_have_range,
-	    request->hr_first_byte_pos, request->hr_last_byte_pos));
+	    (long long)request->hr_first_byte_pos,
 	    (long long)request->hr_last_byte_pos));
 	if (request->hr_have_range)
 		bozo_printf(httpd, "%s 206 Partial Content\r\n",
 				request->hr_proto);
 	else
 		bozo_printf(httpd, "%s 200 OK\r\n", request->hr_proto);
 	if (request->hr_proto != httpd->consts.http_09) {
 		type = bozo_content_type(request, file);
 		encoding = bozo_content_encoding(request, file);
 		bozo_print_header(request, &sb, type, encoding);
 		bozo_printf(httpd, "\r\n");
+	}
 @@ -1838,27 +1835,27 @@ bozodgetln(bozohttpd_t *httpd, int fd, s
 			 * the same spec defines CRLF as the line
 			 * terminator, it is recommended in section 19.3
 			 * to do the LF trick for tolerance.
 			 */
 			if (got_cr)
 				len -= 2;
 			else
 				len -= 1;
 			break;
+		}
+	}
 	httpd->getln_buffer[len] = '\0';
-	debug((httpd, DEBUG_OBESE, "bozodgetln returns: ``%s'' with len %d",
+	debug((httpd, DEBUG_OBESE, "bozodgetln returns: ``%s'' with len %zd",
 	       httpd->getln_buffer, len));
 	*lenp = len;
 	return httpd->getln_buffer;
+}
 void *
 bozorealloc(bozohttpd_t *httpd, void *ptr, size_t size)
+{
 	void	*p;
 	p = realloc(ptr, size);
 	if (p == NULL) {
 		(void)bozo_http_error(httpd, 500, NULL,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bozohttpd.h,v 1.18 2011/03/29 07:22:31 jmmv Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.19 2011/08/27 15:33:59 joerg Exp $	*/
 /*	$eterna: bozohttpd.h,v 1.37 2010/09/20 22:26:28 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -162,31 +162,36 @@ typedef struct bozoprefs_t {
 #define DEBUG_OBESE	3
 #define DEBUG_EXPLODING	4
 #define	strornull(x)	((x) ? (x) : "<null>")
 #ifndef NO_DEBUG
 void	debug__(bozohttpd_t *, int, const char *, ...)
 			__attribute__((__format__(__printf__, 3, 4)));
 #define debug(x)	debug__ x
 #else
 #define	debug(x)
 #endif /* NO_DEBUG */
 #if defined(__GNUC__) && __GNUC__ >= 3
 #define BOZO_PRINTFLIKE(x,y) __attribute__((__format__(__printf__, x,y)))
 #define BOZO_DEAD __attribute__((__noreturn__))
 #endif
 void	bozo_warn(bozohttpd_t *, const char *, ...)
-		__attribute__((__format__(__printf__, 2, 3)));
+		BOZO_PRINTFLIKE(2, 3);
 void	bozo_err(bozohttpd_t *, int, const char *, ...)
-		__attribute__((__format__(__printf__, 3, 4)))
+		BOZO_PRINTFLIKE(3, 4)
-		__attribute__((__noreturn__));
+		BOZO_DEAD;
 int	bozo_http_error(bozohttpd_t *, int, bozo_httpreq_t *, const char *);
 int	bozo_check_special_files(bozo_httpreq_t *, const char *);
 char	*bozo_http_date(char *, size_t);
 void	bozo_print_header(bozo_httpreq_t *, struct stat *, const char *, const char *);
 char	*bozodgetln(bozohttpd_t *, int, ssize_t *, ssize_t (*)(bozohttpd_t *, int, void *, size_t));
 char	*bozostrnsep(char **, const char *, ssize_t *);
 void	*bozomalloc(bozohttpd_t *, size_t);
 void	*bozorealloc(bozohttpd_t *, void *, size_t);
 char	*bozostrdup(bozohttpd_t *, const char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: daemon-bozo.c,v 1.13 2011/03/29 07:22:31 jmmv Exp $	*/
+/*	$NetBSD: daemon-bozo.c,v 1.14 2011/08/27 15:33:59 joerg Exp $	*/
 /*	$eterna: daemon-bozo.c,v 1.22 2010/06/21 06:45:45 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -67,27 +67,27 @@ static const char* pidfile_path = NULL;
 static pid_t pidfile_pid = 0;
 /* ARGSUSED */
 static void
 sigchild(int signo)
+{
 	while (waitpid(-1, NULL, WNOHANG) > 0) {
+	}
+}
 /* Signal handler to exit in a controlled manner.  This ensures that
  * any atexit(3) handlers are properly executed. */
 /* ARGSUSED */
-static void
+BOZO_DEAD static void
 controlled_exit(int signo)
+{
 	exit(EXIT_SUCCESS);
+}
 static void
 remove_pidfile(void)
+{
 	if (pidfile_path != NULL && pidfile_pid == getpid()) {
 		(void)unlink(pidfile_path);
 		pidfile_path = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.2 2011/03/29 07:22:31 jmmv Exp $	*/
+/*	$NetBSD: main.c,v 1.3 2011/08/27 15:33:59 joerg Exp $	*/
 /*	$eterna: main.c,v 1.4 2010/07/11 00:34:28 mrg Exp $	*/
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp 	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -37,39 +37,35 @@
  * main.c:  C front end to bozohttpd
  */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <time.h>
 #include <unistd.h>
 #ifndef __attribute__
 #define __attribute__(x)
 #endif /* __attribute__ */
 #include "bozohttpd.h"
 /* variables and functions */
 #ifndef LOG_FTP
 #define LOG_FTP LOG_DAEMON
 #endif
 /* print a usage message, and then exit */
-static void
+BOZO_DEAD static void
 usage(bozohttpd_t *httpd, char *progname)
+{
 	bozo_warn(httpd, "usage: %s [options] slashdir [virtualhostname]",
 			progname);
 	bozo_warn(httpd, "options:");
 #ifndef NO_DEBUG
 	bozo_warn(httpd, "   -d\t\t\tenable debug support");
 #endif
 	bozo_warn(httpd, "   -s\t\t\talways log to stderr");
 #ifndef NO_USER_SUPPORT
 	bozo_warn(httpd, "   -u\t\t\tenable ~user/public_html support");
 	bozo_warn(httpd, "   -p dir\t\tchange `public_html' directory name]");
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ssl-bozo.c,v 1.11 2011/08/21 10:45:33 hannken Exp $	*/
+/*	$NetBSD: ssl-bozo.c,v 1.12 2011/08/27 15:33:59 joerg Exp $	*/
 /*	$eterna: ssl-bozo.c,v 1.13 2010/05/12 12:24:58 rtr Exp $	*/
 /*
  * Copyright (c) 1997-2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -54,27 +54,27 @@ typedef struct sslinfo_t {
 	const SSL_METHOD	*ssl_method;
 	SSL			*bozossl;
 	char			*certificate_file;
 	char			*privatekey_file;
 } sslinfo_t;
 /*
  * bozo_ssl_err
+ *
  * bozo_ssl_err works just like bozo_err except in addition to printing
  * the error provided by the caller at the point of error it pops and
  * prints all errors from the SSL error queue.
  */
-static void
+BOZO_DEAD static void
 bozo_ssl_err(bozohttpd_t *httpd, int code, const char *fmt, ...)
+{
         va_list ap;
         va_start(ap, fmt);
         if (httpd->logstderr || isatty(STDERR_FILENO)) {
                 vfprintf(stderr, fmt, ap);
                 fputs("\n", stderr);
         } else
                 vsyslog(LOG_ERR, fmt, ap);
         va_end(ap);
 	unsigned int sslcode = ERR_get_error();