[rtems-libbsd commit] from-freebsd.sh: Add arpa/ftp.h, clean up syslog. h a bit

Joel Sherrill joel at rtems.org
Fri Aug 3 13:36:48 UTC 2012


Module:    rtems-libbsd
Branch:    master
Commit:    1912d7323cef44eeae4c938b6cae8d3f77165a2b
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=1912d7323cef44eeae4c938b6cae8d3f77165a2b

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Sat Jul 28 07:11:56 2012 -0500

from-freebsd.sh: Add arpa/ftp.h, clean up syslog.h a bit

---

 freebsd-userspace/from-freebsd.sh    |    8 ++-
 freebsd-userspace/include/arpa/ftp.h |  109 ++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/freebsd-userspace/from-freebsd.sh b/freebsd-userspace/from-freebsd.sh
index 1a24008..1323602 100755
--- a/freebsd-userspace/from-freebsd.sh
+++ b/freebsd-userspace/from-freebsd.sh
@@ -123,12 +123,12 @@ include/rpc/svc.h
 include/rpc/svc_auth.h
 include/rpc/svc_soc.h
 include/rpc/xdr.h
+include/arpa/ftp.h
 include/arpa/inet.h
 include/arpa/nameser.h
 sys/net/ethernet.h
 sys/rpc/types.h
 sys/sys/_null.h
-sys/sys/syslog.h
 sys/sys/un.h
 lib/libc/include/libc_private.h
 lib/libc/include/namespace.h
@@ -235,7 +235,8 @@ do
   test -d include/${d}/${d} || mkdir -p include/${d}/${d}
 
   test ${verbose} = "yes" && echo "Generate wrapper $f"
-  echo "#include <freebsd/${f}>" > include/${f}
+  ( echo "#include <freebsd/bsd.h>" ; 
+    echo "#include <freebsd/${f}>" ) > include/${f}
 done <<EOF
 net/if.h
 net/if_dl.h
@@ -261,4 +262,5 @@ EOF
 
 # Fix syslog.h issues...
 echo "#include <sys/syslog.h>" > local/syslog.h
-
+# Should be able to copy this except for printflike issue
+# sys/sys/syslog.h
diff --git a/freebsd-userspace/include/arpa/ftp.h b/freebsd-userspace/include/arpa/ftp.h
new file mode 100644
index 0000000..9a36488
--- /dev/null
+++ b/freebsd-userspace/include/arpa/ftp.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 1983, 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
+ *
+ *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _ARPA_FTP_H_
+#define	_ARPA_FTP_H_
+
+/* Definitions for FTP; see RFC-765. */
+
+/*
+ * Reply codes.
+ */
+#define PRELIM		1	/* positive preliminary */
+#define COMPLETE	2	/* positive completion */
+#define CONTINUE	3	/* positive intermediate */
+#define TRANSIENT	4	/* transient negative completion */
+#define ERROR		5	/* permanent negative completion */
+
+/*
+ * Type codes
+ */
+#define	TYPE_A		1	/* ASCII */
+#define	TYPE_E		2	/* EBCDIC */
+#define	TYPE_I		3	/* image */
+#define	TYPE_L		4	/* local byte size */
+
+#ifdef FTP_NAMES
+char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
+#endif
+
+/*
+ * Form codes
+ */
+#define	FORM_N		1	/* non-print */
+#define	FORM_T		2	/* telnet format effectors */
+#define	FORM_C		3	/* carriage control (ASA) */
+#ifdef FTP_NAMES
+char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
+#endif
+
+/*
+ * Structure codes
+ */
+#define	STRU_F		1	/* file (no record structure) */
+#define	STRU_R		2	/* record structure */
+#define	STRU_P		3	/* page structure */
+#ifdef FTP_NAMES
+char *strunames[] =  {"0", "File", "Record", "Page" };
+#endif
+
+/*
+ * Mode types
+ */
+#define	MODE_S		1	/* stream */
+#define	MODE_B		2	/* block */
+#define	MODE_C		3	/* compressed */
+#ifdef FTP_NAMES
+char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
+#endif
+
+/*
+ * Record Tokens
+ */
+#define	REC_ESC		'\377'	/* Record-mode Escape */
+#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
+#define REC_EOF		'\002'	/* Record-mode End-of-File */
+
+/*
+ * Block Header
+ */
+#define	BLK_EOR		0x80	/* Block is End-of-Record */
+#define	BLK_EOF		0x40	/* Block is End-of-File */
+#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
+#define	BLK_RESTART	0x10	/* Block is Restart Marker */
+
+#define	BLK_BYTECOUNT	2	/* Bytes in this block */
+
+#endif /* !_FTP_H_ */




More information about the vc mailing list