deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Include slash in CFS web server state field 'filename' (like in the non-CFS web server).

Browse source
This commit is contained in:
oliverschmidt 2010-04-11 15:19:34 +00:00
parent 157a95ef19
commit 62e6882946
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/webserver/httpd-cfs.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: httpd-cfs.c,v 1.19 2010/04/11 12:29:07 oliverschmidt Exp $ * $Id: httpd-cfs.c,v 1.20 2010/04/11 15:19:34 oliverschmidt Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -131,11 +131,11 @@ PT_THREAD(handle_output(struct httpd_state *s))
PT_BEGIN(&s->outputpt); PT_BEGIN(&s->outputpt);
petsciiconv_topetscii(s->filename, sizeof(s->filename)); petsciiconv_topetscii(s->filename, sizeof(s->filename));
s->fd = cfs_open(s->filename, CFS_READ); s->fd = cfs_open(&s->filename[1], CFS_READ);
petsciiconv_toascii(s->filename, sizeof(s->filename)); petsciiconv_toascii(s->filename, sizeof(s->filename));
if(s->fd < 0) { if(s->fd < 0) {
strcpy(s->filename, "notfound.html"); strcpy(s->filename, "/notfound.html");
s->fd = cfs_open(s->filename, CFS_READ); s->fd = cfs_open(&s->filename[1], CFS_READ);
petsciiconv_toascii(s->filename, sizeof(s->filename)); petsciiconv_toascii(s->filename, sizeof(s->filename));
PT_WAIT_THREAD(&s->outputpt, PT_WAIT_THREAD(&s->outputpt,
send_headers(s, http_header_404)); send_headers(s, http_header_404));
@ -175,10 +175,10 @@ PT_THREAD(handle_input(struct httpd_state *s))
} }
if(s->inputbuf[1] == ISO_space) { if(s->inputbuf[1] == ISO_space) {
strncpy(s->filename, &http_index_html[1], sizeof(s->filename)); strncpy(s->filename, http_index_html, sizeof(s->filename));
} else { } else {
s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0; s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0;
strncpy(s->filename, &s->inputbuf[1], sizeof(s->filename)); strncpy(s->filename, s->inputbuf, sizeof(s->filename));
} }
petsciiconv_topetscii(s->filename, sizeof(s->filename)); petsciiconv_topetscii(s->filename, sizeof(s->filename));