X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=file.c;h=372696ca8727dbea673c20fde729ff5b216a4f2a;hp=22eb04859f9cb78146b9450aad9b0ad0fabc1e98;hb=b949545598eaa75b38b4d57c9aea6216bd82256c;hpb=7aec47491eb4b77361d8618cb3860607e2ec80e1

diff --git a/file.c b/file.c
index 22eb048..372696c 100644
--- a/file.c
+++ b/file.c
@@ -18,12 +18,14 @@
  */
 
 #define _BSD_SOURCE
+#define _DARWIN_C_SOURCE
 #define _XOPEN_SOURCE 700
 
 #include <sys/types.h>
 #include <sys/dir.h>
 #include <time.h>
 #include <strings.h>
+#include <dirent.h>
 
 #include <libubox/blobmsg.h>
 
@@ -233,8 +235,10 @@ uh_path_lookup(struct client *cl, const char *url)
 			continue;
 
 		strcpy(pathptr, idx->name);
-		if (!stat(path_phys, &s) && (s.st_mode & S_IFREG))
+		if (!stat(path_phys, &s) && (s.st_mode & S_IFREG)) {
+			memcpy(&p.stat, &s, sizeof(p.stat));
 			break;
+		}
 
 		*pathptr = 0;
 	}
@@ -246,13 +250,9 @@ uh_path_lookup(struct client *cl, const char *url)
 	return p.phys ? &p : NULL;
 }
 
-#ifdef __APPLE__
-time_t timegm (struct tm *tm);
-#endif
-
 static const char * uh_file_mime_lookup(const char *path)
 {
-	struct mimetype *m = &uh_mime_types[0];
+	const struct mimetype *m = &uh_mime_types[0];
 	const char *e;
 
 	while (m->extn) {
@@ -293,11 +293,11 @@ static time_t uh_file_date2unix(const char *date)
 	return 0;
 }
 
-static char * uh_file_unix2date(time_t ts, char *buf)
+static char * uh_file_unix2date(time_t ts, char *buf, int len)
 {
 	struct tm *t = gmtime(&ts);
 
-	strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S GMT", t);
+	strftime(buf, len, "%a, %d %b %Y %H:%M:%S GMT", t);
 
 	return buf;
 }
@@ -317,9 +317,10 @@ static void uh_file_response_ok_hdrs(struct client *cl, struct stat *s)
 	if (s) {
 		ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf));
 		ustream_printf(cl->us, "Last-Modified: %s\r\n",
-			       uh_file_unix2date(s->st_mtime, buf));
+			       uh_file_unix2date(s->st_mtime, buf, sizeof(buf)));
 	}
-	ustream_printf(cl->us, "Date: %s\r\n", uh_file_unix2date(time(NULL), buf));
+	ustream_printf(cl->us, "Date: %s\r\n",
+		       uh_file_unix2date(time(NULL), buf, sizeof(buf)));
 }
 
 static void uh_file_response_200(struct client *cl, struct stat *s)
@@ -435,21 +436,69 @@ static int uh_file_if_unmodified_since(struct client *cl, struct stat *s)
 	return true;
 }
 
+static int dirent_cmp(const struct dirent **a, const struct dirent **b)
+{
+	bool dir_a = !!((*a)->d_type & DT_DIR);
+	bool dir_b = !!((*b)->d_type & DT_DIR);
 
-static int uh_file_scandir_filter_dir(const struct dirent *e)
+	/* directories first */
+	if (dir_a != dir_b)
+		return dir_b - dir_a;
+
+	return alphasort(a, b);
+}
+
+static void list_entries(struct client *cl, struct dirent **files, int count,
+			 const char *path, char *local_path)
 {
-	return strcmp(e->d_name, ".") ? 1 : 0;
+	const char *suffix = "/";
+	const char *type = "directory";
+	unsigned int mode = S_IXOTH;
+	struct stat s;
+	char *file;
+	char buf[128];
+	int i;
+
+	file = local_path + strlen(local_path);
+	for (i = 0; i < count; i++) {
+		const char *name = files[i]->d_name;
+		bool dir = !!(files[i]->d_type & DT_DIR);
+
+		if (name[0] == '.' && name[1] == 0)
+			continue;
+
+		sprintf(file, "%s", name);
+		if (stat(local_path, &s))
+			continue;
+
+		if (!dir) {
+			suffix = "";
+			mode = S_IROTH;
+			type = uh_file_mime_lookup(local_path);
+		}
+
+		if (!(s.st_mode & mode))
+			continue;
+
+		uh_chunk_printf(cl,
+				"<li><strong><a href='%s%s%s'>%s</a>%s"
+				"</strong><br /><small>modified: %s"
+				"<br />%s - %.02f kbyte<br />"
+				"<br /></small></li>",
+				path, name, suffix,
+				name, suffix,
+				uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
+				type, s.st_size / 1024.0);
+
+		*file = 0;
+		free(files[i]);
+	}
 }
 
 static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 {
-	int i;
-	int count = 0;
-	char filename[PATH_MAX];
-	char *pathptr;
 	struct dirent **files = NULL;
-	struct stat s;
-	char buf[128];
+	int count = 0;
 
 	uh_file_response_200(cl, NULL);
 	ustream_printf(cl->us, "Content-Type: text/html\r\n\r\n");
@@ -459,65 +508,15 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 		"<body><h1>Index of %s</h1><hr /><ol>",
 		pi->name, pi->name);
 
-	if ((count = scandir(pi->phys, &files, uh_file_scandir_filter_dir,
-						 alphasort)) > 0)
-	{
-		memset(filename, 0, sizeof(filename));
-		memcpy(filename, pi->phys, sizeof(filename));
-		pathptr = &filename[strlen(filename)];
-
-		/* list subdirs */
-		for (i = 0; i < count; i++) {
-			strncat(filename, files[i]->d_name,
-					sizeof(filename) - strlen(files[i]->d_name));
-
-			if (!stat(filename, &s) &&
-				(s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH))
-				uh_chunk_printf(cl,
-					"<li><strong><a href='%s%s/'>%s</a>/"
-					"</strong><br /><small>modified: %s"
-					"<br />directory - %.02f kbyte<br />"
-					"<br /></small></li>",
-					pi->name, files[i]->d_name,
-					files[i]->d_name,
-					uh_file_unix2date(s.st_mtime, buf),
-					s.st_size / 1024.0);
-
-			*pathptr = 0;
-		}
-
-		/* list files */
-		for (i = 0; i < count; i++) {
-			strncat(filename, files[i]->d_name,
-					sizeof(filename) - strlen(files[i]->d_name));
-
-			if (!stat(filename, &s) &&
-				!(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH))
-				uh_chunk_printf(cl,
-					"<li><strong><a href='%s%s'>%s</a>"
-					"</strong><br /><small>modified: %s"
-					"<br />%s - %.02f kbyte<br />"
-					"<br /></small></li>",
-					pi->name, files[i]->d_name,
-					files[i]->d_name,
-					uh_file_unix2date(s.st_mtime, buf),
-					uh_file_mime_lookup(filename),
-					s.st_size / 1024.0);
-
-			*pathptr = 0;
-		}
+	count = scandir(pi->phys, &files, NULL, dirent_cmp);
+	if (count > 0) {
+		strcpy(uh_buf, pi->phys);
+		list_entries(cl, files, count, pi->name, uh_buf);
 	}
+	free(files);
 
 	uh_chunk_printf(cl, "</ol><hr /></body></html>");
 	uh_request_done(cl);
-
-	if (files)
-	{
-		for (i = 0; i < count; i++)
-			free(files[i]);
-
-		free(files);
-	}
 }
 
 static void file_write_cb(struct client *cl)
@@ -685,7 +684,7 @@ static bool __handle_file_request(struct client *cl, const char *url)
 void uh_handle_request(struct client *cl)
 {
 	struct dispatch_handler *d;
-	const char *url = cl->request.url;
+	const char *url = blobmsg_data(blob_data(cl->hdr.head));;
 
 	d = dispatch_find(url, NULL);
 	if (d) {
@@ -697,5 +696,5 @@ void uh_handle_request(struct client *cl)
 	    __handle_file_request(cl, conf.error_handler))
 		return;
 
-	uh_client_error(cl, 404, "Not Found", "The requested URL %s was not found on this server.", cl->request.url);
+	uh_client_error(cl, 404, "Not Found", "The requested URL %s was not found on this server.", url);
 }