[Nmh-commits] [SCM] The nmh Mail Handling System branch, posix, updated. bc55248f0ff19a688cf94687cd3778e61623d519

[Lyndon Nerenberg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, posix has been updated
       via  bc55248f0ff19a688cf94687cd3778e61623d519 (commit)
       via  6c2d93714b6645b2e44e7d358a3508564a15e84c (commit)
       via  2d9b311611c5d859c27755ee4f7a4d40d91c37c4 (commit)
       via  40753061f95282cbbd03352572d803a982e89f2b (commit)
      from  f0890767d0369a5d2488a2d94ebd379b1bae69d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=bc55248f0ff19a688cf94687cd3778e61623d519


commit bc55248f0ff19a688cf94687cd3778e61623d519
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 18:23:41 2011 -0800

    Elide unused HAVE_WORKING_[V]FORK defines.

diff --git a/config.h b/config.h
index 93e7811..186a310 100644
--- a/config.h
+++ b/config.h
@@ -260,12 +260,6 @@
 /* Define to 1 if you have the `wcwidth' function. */
 #define HAVE_WCWIDTH 1
 
-/* Define to 1 if `fork' works. */
-#define HAVE_WORKING_FORK 1
-
-/* Define to 1 if `vfork' works. */
-#define HAVE_WORKING_VFORK 1
-
 /* Define to 1 if you have the `writev' function. */
 #define HAVE_WRITEV 1
 

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=6c2d93714b6645b2e44e7d358a3508564a15e84c


commit 6c2d93714b6645b2e44e7d358a3508564a15e84c
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 18:18:22 2011 -0800

    Replace <arpa/ftp.h> with "h/arpa_ftp.h".

diff --git a/uip/ftpsbr.c b/uip/ftpsbr.c
index b2c3c42..0ffca35 100644
--- a/uip/ftpsbr.c
+++ b/uip/ftpsbr.c
@@ -9,13 +9,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 
-#ifdef notdef_lyndon_posix
-/*
- * Does this get included indirectly?  Let's find out.  It's not
- * part of Posix.  Mail address@hidden if this breaks your build.
- */
-# include <arpa/ftp.h>
-#endif
+#include "h/arpa_ftp.h"
 
 #define        v_debug debugsw
 #define        v_verbose verbosw

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=2d9b311611c5d859c27755ee4f7a4d40d91c37c4


commit 2d9b311611c5d859c27755ee4f7a4d40d91c37c4
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 18:17:10 2011 -0800

    Import non-Posix <arpa/ftp.h> for uip/ftpsbr.c.

diff --git a/h/arpa_ftp.h b/h/arpa_ftp.h
new file mode 100644
index 0000000..64532b9
--- /dev/null
+++ b/h/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 _FTP_H_
+#define        _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_ */

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=40753061f95282cbbd03352572d803a982e89f2b


commit 40753061f95282cbbd03352572d803a982e89f2b
Author: Lyndon Nerenberg <address@hidden>
Date:   Sat Dec 24 18:15:06 2011 -0800

    Remove HAVE_ARPA_FTP_H and arpa/ftp.h references.

diff --git a/config.h b/config.h
index 9aa2da0..93e7811 100644
--- a/config.h
+++ b/config.h
@@ -142,9 +142,6 @@
 /* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 /* #undef GWINSZ_IN_SYS_IOCTL */
 
-/* Define to 1 if you have the <arpa/ftp.h> header file. */
-#define HAVE_ARPA_FTP_H 1
-
 /* Define to 1 if you have the <crypt.h> header file. */
 /* #undef HAVE_CRYPT_H */
 
diff --git a/uip/ftpsbr.c b/uip/ftpsbr.c
index 57f25ba..b2c3c42 100644
--- a/uip/ftpsbr.c
+++ b/uip/ftpsbr.c
@@ -9,7 +9,11 @@
 #include <h/mh.h>
 #include <h/mime.h>
 
-#ifdef HAVE_ARPA_FTP_H
+#ifdef notdef_lyndon_posix
+/*
+ * Does this get included indirectly?  Let's find out.  It's not
+ * part of Posix.  Mail address@hidden if this breaks your build.
+ */
 # include <arpa/ftp.h>
 #endif
 

-----------------------------------------------------------------------

Summary of changes:
 config.h     |    9 -----
 h/arpa_ftp.h |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 uip/ftpsbr.c |    4 +--
 3 files changed, 110 insertions(+), 12 deletions(-)
 create mode 100644 h/arpa_ftp.h


hooks/post-receive
-- 
The nmh Mail Handling System