Changeset 154 for uKadecot/trunk/uip/apps/webserver/httpd.c

Timestamp:

Feb 2, 2016, 9:54:35 PM (8 years ago)

Author:

coas-nagasima

Message:

SDカードの中身を/~/でアクセスできるよう変更

File:

• uKadecot/trunk/uip/apps/webserver/httpd.c (modified) (4 diffs)

uKadecot/trunk/uip/apps/webserver/httpd.c

@@ -198 +198 @@
   memcpy(pos, statushdr, len); pos += len;
 
-  len = strlen(http_content_encoding_gzip);
-  memcpy(pos, http_content_encoding_gzip, len); pos += len;
+  if (s->drv == 0) {
+    len = strlen(http_content_encoding_gzip);
+    memcpy(pos, http_content_encoding_gzip, len); pos += len;
+  }
 
   ptr = strrchr(s->message.request_url, ISO_period);
@@ -244 +246 @@
 PT_THREAD(handle_output(struct httpd_state *s))
 {
-  char *ptr;
-
   PT_BEGIN(&s->outputpt);
 
-  if (!httpd_fs_open(s->message.request_url, &s->file)) {
-    httpd_fs_open(http_404_html, &s->file);
+  s->file.fs = ((char *)&s[1]) - 64 - 512;
+
+  if (!httpd_fs_open(s->drv, s->filename, &s->file)) {
+    s->drv = 0;
+    httpd_fs_open(s->drv, http_404_html, &s->file);
     strcpy_s(s->message.request_url, sizeof(s->message.request_url), http_404_html);
     PT_WAIT_THREAD(&s->outputpt,
@@ -259 +262 @@
       send_headers(s,
       http_header_200));
-    ptr = strchr(s->message.request_url, ISO_period);
     PT_WAIT_THREAD(&s->outputpt, send_file(s));
   }
@@ -406 +408 @@
   if ((s->message.request_url[0] == '\0') || ((s->message.request_url[0] == '/') && (s->message.request_url[1] == '\0'))) {
     strncpy_s(s->message.request_url, sizeof(s->message.request_url), http_index_html, sizeof(s->message.request_url));
+    s->filename = s->message.request_url;
+  }
+  /* "/~/"ならSDカードから読み込み */
+  else if ((s->message.request_url[0] == '/') && (s->message.request_url[1] == '~') && (s->message.request_url[2] == '/')) {
+    s->drv = 1;
+    s->filename = &s->message.request_url[2];
+  }
+  else {
+    s->drv = 0;
+    s->filename = s->message.request_url;
   }