diff options
Diffstat (limited to 'apps/netutils')
-rw-r--r-- | apps/netutils/Makefile | 7 | ||||
-rw-r--r-- | apps/netutils/README.txt | 2 | ||||
-rw-r--r-- | apps/netutils/ftpd/Makefile | 97 | ||||
-rwxr-xr-x | apps/netutils/ftpd/ftpd.h | 4 |
4 files changed, 105 insertions, 5 deletions
diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile index df61f97e8..1313c223d 100644 --- a/apps/netutils/Makefile +++ b/apps/netutils/Makefile @@ -1,8 +1,8 @@ ############################################################################ # apps/netutils/Makefile # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -38,10 +38,11 @@ # Sub-directories ifeq ($(CONFIG_NET),y) -SUBDIRS = uiplib dhcpc dhcpd ftpc resolv smtp telnetd webclient webserver tftpc thttpd +SUBDIRS = uiplib dhcpc dhcpd ftpc ftpd resolv smtp telnetd webclient webserver tftpc thttpd endif all: nothing + .PHONY: nothing context depend clean distclean nothing: diff --git a/apps/netutils/README.txt b/apps/netutils/README.txt index b80444925..26f11b7ce 100644 --- a/apps/netutils/README.txt +++ b/apps/netutils/README.txt @@ -49,6 +49,8 @@ highly influenced by uIP) include: inherited by spawned tasks. ftpc - FTP client. See apps/include/ftpc.h for interface information. + ftpd - FTP server. See apps/include/netutils/ftpd.h for interface + information. thttpd - This is a port of Jef Poskanzer's THTTPD HTPPD server. See http://acme.com/software/thttpd/ for general THTTPD information. See apps/include/netutils/thttpd.h diff --git a/apps/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile new file mode 100644 index 000000000..84e4f79a7 --- /dev/null +++ b/apps/netutils/ftpd/Makefile @@ -0,0 +1,97 @@ +############################################################################ +# apps/netutils/ftpd/Makefile +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# Telnet daemon + +ASRCS = +CSRCS = + +ifeq ($(CONFIG_NET_TCP),y) +CSRCS += ftpd.c +endif + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif + +ROOTDEPPATH = --dep-path . + +# Common build + +VPATH = + +all: .built +.PHONY: context depend clean distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + @( for obj in $(OBJS) ; do \ + $(call ARCHIVE, $(BIN), $${obj}); \ + done ; ) + @touch .built + +context: + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + @rm -f *.o *~ .*.swp .built + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend + +-include Make.dep diff --git a/apps/netutils/ftpd/ftpd.h b/apps/netutils/ftpd/ftpd.h index 938ca4b89..0332b0a19 100755 --- a/apps/netutils/ftpd/ftpd.h +++ b/apps/netutils/ftpd/ftpd.h @@ -76,13 +76,13 @@ enum ftpd_sessiontype_e { - FTPD_SESSIONTYPE_NONE = 0 + FTPD_SESSIONTYPE_NONE = 0, FTPD_SESSIONTYPE_A, FTPD_SESSIONTYPE_I, FTPD_SESSIONTYPE_L8 }; -typedef struct ftpd_pathnode_s +struct ftpd_pathnode_s { struct ftpd_pathnode_s *flink; struct ftpd_pathnode_s *blink; |