Wed Nov 21 10:25:17 2018 UTC ()

two fixes reported by mouse:
- don't check contents of 'st' if stat(2) failed.
- round up instead of truncate.  now 10000 byte files say 10kB not 9kB.


(mrg)

diff -r1.26 -r1.27 src/libexec/httpd/dir-index-bozo.c

--- src/libexec/httpd/dir-index-bozo.c 2018/11/20 01:06:46	1.26
+++ src/libexec/httpd/dir-index-bozo.c 2018/11/21 10:25:17	1.27

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir-index-bozo.c,v 1.26 2018/11/20 01:06:46 mrg Exp $	*/
+/*	$NetBSD: dir-index-bozo.c,v 1.27 2018/11/21 10:25:17 mrg Exp $	*/
 /*	$eterna: dir-index-bozo.c,v 1.20 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
 @@ -147,27 +147,27 @@ bozo_dir_index(bozo_httpreq_t *request,
 		snprintf(buf, sizeof buf, "%s/%s", dirpath, name);
 		if (stat(buf, &sb))
 			nostat = 1;
 		l = 0;
 		urlname = bozo_escape_rfc3986(httpd, name, 0);
 		htmlname = bozo_escape_html(httpd, name);
 		if (htmlname == NULL)
 			htmlname = name;
 		if (strcmp(name, "..") == 0) {
 			bozo_printf(httpd, "<a href=\"../\">");
 			l += bozo_printf(httpd, "Parent Directory");
-		} else if (S_ISDIR(sb.st_mode)) {
+		} else if (!nostat && S_ISDIR(sb.st_mode)) {
 			bozo_printf(httpd, "<a href=\"%s/\">", urlname);
 			l += bozo_printf(httpd, "%s/", htmlname);
 		} else if (strchr(name, ':') != NULL) {
 			/* RFC 3986 4.2 */
 			bozo_printf(httpd, "<a href=\"./%s\">", urlname);
 			l += bozo_printf(httpd, "%s", htmlname);
 		} else {
 			bozo_printf(httpd, "<a href=\"%s\">", urlname);
 			l += bozo_printf(httpd, "%s", htmlname);
+		}
 		if (htmlname != name)
 			free(htmlname);
 		bozo_printf(httpd, "</a>");
 @@ -175,42 +175,45 @@ bozo_dir_index(bozo_httpreq_t *request,
 		/* NAMELEN spaces */
 		/*LINTED*/
 		assert(/*CONSTCOND*/sizeof(spacebuf) > NAMELEN);
 		i = (l < NAMELEN) ? (NAMELEN - l) : 0;
 		i++;
 		memset(spacebuf, ' ', (size_t)i);
 		spacebuf[i] = '\0';
 		bozo_printf(httpd, "%s", spacebuf);
 		l += i;
 		if (nostat)
 			bozo_printf(httpd, "?                         ?");
 		else {
 			unsigned long long len;
 			len = ((unsigned long long)sb.st_size + 1023) / 1024;
 			tm = gmtime(&sb.st_mtime);
 			strftime(buf, sizeof buf, "%d-%b-%Y %R", tm);
 			l += bozo_printf(httpd, "%s", buf);
 			/* LMODLEN spaces */
 			/*LINTED*/
 			assert(/*CONSTCOND*/sizeof(spacebuf) > LMODLEN);
 			i = (l < (LMODLEN+NAMELEN+1)) ?
 				((LMODLEN+NAMELEN+1) - l) : 0;
 			i++;
 			memset(spacebuf, ' ', (size_t)i);
 			spacebuf[i] = '\0';
 			bozo_printf(httpd, "%s", spacebuf);
-			bozo_printf(httpd, "%12llukB",
+			bozo_printf(httpd, "%12llukB", len);
 				    (unsigned long long)sb.st_size >> 10);
+		}
 		bozo_printf(httpd, "\r\n");
+	}
 	closedir(dp);
 	while (k--)
         	free(deo[k]);
 	free(deo);
 	bozo_printf(httpd, "</pre>");
 	directory_hr(httpd);
 	bozo_printf(httpd, "</body></html>\r\n\r\n");
 	bozo_flush(httpd, stdout);