Fix ".." sorting. (#67)

No longer includes ".." when sorting the directory entries for the directory listing, but adds it on top of the listing if the requested directory is not wwwroot. Besides fixing the sorting bug, this should make the sorting faster.

This also does not print the mod date for the ".." entry anymore.

Closes #66

darkhttpd.c

@@ -1888,9 +1888,6 @@ struct dlent {
 };
 
 static int dlent_cmp(const void *a, const void *b) {
-    if (strcmp((*((const struct dlent * const *)a))->name, "..") == 0) {
-        return -1;  /* Special-case ".." to come first. */
-    }
     return strcmp((*((const struct dlent * const *)a))->name,
                   (*((const struct dlent * const *)b))->name);
 }
@@ -1917,11 +1914,8 @@ static ssize_t make_sorted_dirlist(const char *path, struct dlent ***output) {
     while ((ent = readdir(dir)) != NULL) {
         struct stat s;
 
-        if ((strncmp(path, wwwroot, strlen(path) - 1) == 0) &&
-            (strcmp(ent->d_name, "..") == 0))
-            continue; /* skip "..", when in wwwroot */
-        if (strcmp(ent->d_name, ".") == 0)
-            continue; /* skip "." */
+        if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0)
+            continue; /* skip "." and ".." */
         assert(strlen(ent->d_name) <= MAXNAMLEN);
         sprintf(currname, "%s%s", path, ent->d_name);
         if (stat(currname, &s) == -1)
@@ -2062,6 +2056,10 @@ static void generate_dir_listing(struct connection *conn, const char *path,
     spaces = xmalloc(maxlen);
     memset(spaces, ' ', maxlen);
 
+    /* append ".." entry if not in wwwroot */
+    if (strcmp(path, "./") != 0)
+        append(listing, "<a href=\"../\">..</a>/\n");
+
     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.