Changeset 445 for EcnlProtoTool/trunk/ntshell
- Timestamp:
- Jul 15, 2020, 7:43:12 AM (4 years ago)
- Location:
- EcnlProtoTool/trunk/ntshell
- Files:
-
- 7 added
- 1 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
EcnlProtoTool/trunk/ntshell/Debug/Makefile
r442 r445 221 221 APPL_COBJS := main.o fdtable.o stdio_stub.o pipe_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o base64.o http-strings.o http_parser.o httpd.o httpd-fs.o sha1.o websocket.o websocket_fbs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntstdio.o ntopt.o syscall.o mbedcall.o ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o netcmd.o newlib_stub.o shellif.o 222 222 endif 223 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o 224 APPL_BINOBJS := httpd_fs.o 223 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o mbed_stub.o rom_fs.o 225 224 APPL_CFLAGS := $(APPL_CFLAGS) 226 225 ifdef APPLDIRS … … 370 369 # 371 370 vpath %.c $(KERNEL_DIRS) $(SYSSVC_DIRS) $(APPL_DIRS) 371 vpath %.cpp $(APPL_DIRS) 372 372 vpath %.S $(KERNEL_DIRS) $(SYSSVC_DIRS) $(APPL_DIRS) 373 373 vpath %.cfg $(APPL_DIRS) … … 689 689 690 690 $(APPL_BINOBJS): $(OBJDIR)/%.o: %.bin 691 $(OBJCOPY) -B arm -I binary -O elf32-littlearm --rename-section .data=.rodata $< $ (OBJDIR)/$*.o691 $(OBJCOPY) -B arm -I binary -O elf32-littlearm --rename-section .data=.rodata $< $@ 692 692 693 693 # -
EcnlProtoTool/trunk/ntshell/fatfs/diskio.c
r434 r445 15 15 #define MAX_DRIVES 1 /* Max number of physical drives to be used */ 16 16 17 #define RamDisk _binary____webserver_httpd_fs_bin_start18 17 extern unsigned char RamDisk[]; 19 18 -
EcnlProtoTool/trunk/ntshell/webserver/httpd.c
r442 r445 203 203 s->filename = &s->message.filename[sizeof(s->message.filename) - 2]; 204 204 strcpy_s(s->filename, sizeof(s->message.request_url) + 2, "0:"); 205 strcat_s(s->filename, sizeof(s->message.request_url) + 2, http_www); 205 206 strcat_s(s->filename, sizeof(s->message.request_url) + 2, http_index_html); 206 207 s->file.redirect = 1; … … 210 211 s->filename = &s->message.filename[sizeof(s->message.filename) - 2 - sizeof(http_www) - 1 + 2]; 211 212 memcpy(s->filename, "1:", 2); 212 memcpy( s->filename, http_www, sizeof(http_www) - 1);213 memcpy(&s->filename[2], http_www, sizeof(http_www) - 1); 213 214 } 214 215 else { 215 s->filename = &s->message.filename[sizeof(s->message.filename) - 2 ];216 s->filename = &s->message.filename[sizeof(s->message.filename) - 2 - sizeof(http_www) - 1 + 2]; 216 217 memcpy(s->filename, "0:", 2); 218 memcpy(&s->filename[2], http_www, sizeof(http_www) - 1); 217 219 } 218 220 return 0;
Note:
See TracChangeset
for help on using the changeset viewer.