 @@ -1,14 +1,14 @@
-/*	$NetBSD: cgi-bozo.c,v 1.42 2018/11/22 08:54:08 mrg Exp $	*/
+/*	$NetBSD: cgi-bozo.c,v 1.43 2018/11/22 18:42:06 mrg Exp $	*/
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 /*
  * Copyright (c) 1997-2018 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
 @@ -35,26 +35,27 @@
 #ifndef NO_CGIBIN_SUPPORT
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <ctype.h>
 #include <errno.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <assert.h>
 #include <netinet/in.h>
 #include "bozohttpd.h"
 #define CGIBIN_PREFIX		"cgi-bin/"
 #define CGIBIN_PREFIX_LEN	(sizeof(CGIBIN_PREFIX)-1)
 #ifndef USE_ARG
 #define USE_ARG(x)	/*LINTED*/(void)&(x)
 #endif
 /*
 @@ -370,26 +371,27 @@ bozo_setenv(bozohttpd_t *httpd, const ch
  * process the cgi, otherwise just return.  Returns 0 if it did not handle
  * the request.
  */
 int
 bozo_process_cgi(bozo_httpreq_t *request)
+{
 	bozohttpd_t *httpd = request->hr_httpd;
 	char	buf[BOZO_WRSZ];
 	char	date[40];
 	bozoheaders_t *headp;
 	const char *type, *clen, *info, *cgihandler;
 	char	*query, *s, *t, *path, *env, *command, *file, *url;
 	char	**envp, **curenvp, **argv, **search_string_argv = NULL;
 	char	**lastenvp;
 	char	*uri;
 	size_t	i, len, search_string_argc = 0;
 	ssize_t rbytes;
 	pid_t	pid;
 	int	envpsize, ix, nph;
 	int	sv[2];
 	if (!httpd->cgibin && !httpd->process_cgi)
 		return 0;
 #ifndef NO_USER_SUPPORT
 	if (request->hr_user && !httpd->enable_cgi_users)
 		return 0;
 @@ -496,26 +498,27 @@ bozo_process_cgi(bozo_httpreq_t *request
 	    bozo_auth_cgi_count(request) +
 	    (request->hr_serverport && *request->hr_serverport ? 1 : 0);
 	debug((httpd, DEBUG_FAT,
 		"%s: path `%s', cmd `%s', info `%s', "
 		"query `%s', nph `%d', envpsize `%d'", __func__,
 		path, command, strornull(info),
 		strornull(query), nph, envpsize));
 	envp = bozomalloc(httpd, sizeof(*envp) * envpsize);
 	for (ix = 0; ix < envpsize; ix++)
 		envp[ix] = NULL;
 	curenvp = envp;
 	lastenvp = envp + envpsize;
 	SIMPLEQ_FOREACH(headp, &request->hr_headers, h_next) {
 		const char *s2;
 		env = bozomalloc(httpd, 6 + strlen(headp->h_header) + 1 +
 		    strlen(headp->h_value));
 		t = env;
 		strcpy(t, "HTTP_");
 		t += strlen(t);
 		for (s2 = headp->h_header; *s2; t++, s2++)
 			if (islower((unsigned)*s2))
 				*t = toupper((unsigned)*s2);
 			else if (*s2 == '-')
 @@ -577,26 +580,27 @@ bozo_process_cgi(bozo_httpreq_t *request
 	debug((httpd, DEBUG_FAT, "%s: going exec %s with args:", __func__,
 	    path));
 	for (i = 0; argv[i] != NULL; i++) {
 		debug((httpd, DEBUG_FAT, "%s: argv[%zu] = `%s'", __func__,
 		    i, argv[i]));
+	}
 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sv) == -1)
 		bozoerr(httpd, 1, "child socketpair failed: %s",
 				strerror(errno));
 	*curenvp = 0;
 	assert(lastenvp > curenvp);
 	/*
 	 * We create 2 procs: one to become the CGI, one read from
 	 * the CGI and output to the network, and this parent will
 	 * continue reading from the network and writing to the
 	 * CGI procsss.
 	 */
 	switch (fork()) {
 	case -1: /* eep, failure */
 		bozoerr(httpd, 1, "child fork failed: %s", strerror(errno));
 		/*NOTREACHED*/
 	case 0:
 		close(sv[0]);