X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=file.c;h=679755d9754313813808e7bee059a3086399081a;hp=b46f0d671ca9e4861399ab32b3fc842e8c7852c7;hb=9c767787dba81bd5713e1a45eef8b381e7d4b79b;hpb=dd8f306793db60a2d79c7618d012e0466c581bcf

diff --git a/file.c b/file.c
index b46f0d6..679755d 100644
--- a/file.c
+++ b/file.c
@@ -233,8 +233,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,10 +248,6 @@ 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];
@@ -293,11 +291,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 +315,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)
@@ -445,7 +444,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 {
 	int i;
 	int count = 0;
-	char filename[PATH_MAX];
+	char *filename = uh_buf;
 	char *pathptr;
 	struct dirent **files = NULL;
 	struct stat s;
@@ -482,7 +481,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 					"<br /></small></li>",
 					pi->name, files[i]->d_name,
 					files[i]->d_name,
-					uh_file_unix2date(s.st_mtime, buf),
+					uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
 					s.st_size / 1024.0);
 
 			*pathptr = 0;
@@ -501,7 +500,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 					"<br /></small></li>",
 					pi->name, files[i]->d_name,
 					files[i]->d_name,
-					uh_file_unix2date(s.st_mtime, buf),
+					uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
 					uh_file_mime_lookup(filename),
 					s.st_size / 1024.0);