From 8eec40869169ec0163b7714b2849e882e461056d Mon Sep 17 00:00:00 2001
From: Emil Mikulic <emikulic@gmail.com>
Date: Sun, 26 Oct 2008 12:53:34 +0000
Subject: [PATCH] Don't use strlen() in urlencode_filename()

Also move safe_url variable into for loop that uses it.
---
 trunk/darkhttpd.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/trunk/darkhttpd.c b/trunk/darkhttpd.c
index c0d8859..645a05c 100644
--- a/trunk/darkhttpd.c
+++ b/trunk/darkhttpd.c
@@ -1715,11 +1715,9 @@ static int needs_urlencoding(unsigned char c)
 static void urlencode_filename(unsigned char *name, unsigned char *safe_url)
 {
     const static char hex[] = "0123456789ABCDEF";
-    int i, j, len;
+    int i, j;
 
-    len = strlen(name);
-
-    for (i=j=0; i<len; i++)
+    for (i = j = 0; name[i] != '\0'; i++)
     {
         if (needs_urlencoding(name[i]))
         {
@@ -1746,10 +1744,6 @@ static void generate_dir_listing(struct connection *conn, const char *path)
     int i;
     struct apbuf *listing = make_apbuf();
 
-    /* If a filename is made up of entirely unsafe chars,
-       the url would be three times its original length. */
-    char safe_url[MAXNAMLEN*3];
-
     listsize = make_sorted_dirlist(path, &list);
     if (listsize == -1)
     {
@@ -1775,6 +1769,11 @@ static void generate_dir_listing(struct connection *conn, const char *path)
 
     for (i=0; i<listsize; i++)
     {
+        /* If a filename is made up of entirely unsafe chars,
+         * the url would be three times its original length.
+         */
+        char safe_url[MAXNAMLEN*3];
+
         urlencode_filename(list[i]->name, safe_url);
 
         append(listing, "<a href=\"");