[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_7-71-g4422743
|
From: |
Alfred M. Szmidt |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_7-71-g4422743 |
|
Date: |
Sat, 15 May 2010 11:43:28 +0000 |
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 "GNU Inetutils ".
The branch, master has been updated
via 4422743c3d6e527a3b63b82d90965270af64c5b6 (commit)
via fa48ded461840281d22575a1622a9f0dd5bc7e72 (commit)
via 26b8c43295081326f32ed55e8c4e3c65d4b15dd5 (commit)
via 8f1b2406e3fa4c6bd002a2cf76ba18c6fabd9bf9 (commit)
via edc55aa8e4c4411a2dce4760ad50b047e99aa6d2 (commit)
via 000e9a5410c91e4f1428c1f556fede4a14bd2d98 (commit)
via bebea3b5c141b6fab8431367f4dd115726297609 (commit)
via 078a0bc410bac2a9e487066f755df543f07af064 (commit)
via 34f91cc1f7daa82984d3f2898535e815b0166030 (commit)
via 70addcf8b1eb96b4cc55f74a3f6212de0900f47b (commit)
via 0c3ae5b458eaf2f321c24938e59e44f4d9e5d725 (commit)
via c3aebed664aae411467843609192036b9b98491b (commit)
via 1536ef99260ce5c6aab24c7c6c78595e7be06fff (commit)
via 4915c163025a60b298ae8116078ba5db06b7b434 (commit)
via 82aa9529c1e373f34b3e8973e95c5b0e0d7ba69a (commit)
via 03f28a3500bfe9e6bb282929600105379aa2eb92 (commit)
via 7d5c19f4b6da699663d63f8602c55260bc6af2f9 (commit)
via 7a2c1ae913fdd863dfd2f7d3a1fc4a33e039db0a (commit)
via 3f641ec40cffb5b28aefb7a15bb44556baab5708 (commit)
via 67dcf7ef0e3f2424155208dae8223b1a8164062f (commit)
via 2375a6fa104fc05d1f20d93d305163e65832e37a (commit)
from 85394f7bf791cb6b82132d4317e05d185d86af4e (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/inetutils.git/commit/?id=4422743c3d6e527a3b63b82d90965270af64c5b6
commit 4422743c3d6e527a3b63b82d90965270af64c5b6
Author: Alfred M. Szmidt <address@hidden>
Date: Sat May 15 13:24:37 2010 +0200
Bump version number to 1.7.
diff --git a/ChangeLog b/ChangeLog
index 453d53c..d286558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-05-15 Alfred M. Szmidt <address@hidden>
+ * configure.ac: Bump version number to 1.7.
+ * NEWS: Update.
+
+2010-05-15 Alfred M. Szmidt <address@hidden>
+
* src/uucpd.c: Include <sys/wait.h>, <sys/time.h>, <time.h>
unconditionally.
* src/tftp.c: Include <sys/time.h>, <time.h> unconditionally.
@@ -26,14 +31,20 @@
2010-05-15 Alfred M. Szmidt <address@hidden>
- * ifconfig/system/solaris.c: Include <unistd.h>, <string.h>
unconditionally.
+ * ifconfig/system/solaris.c: Include <unistd.h>, <string.h>
+ unconditionally.
* ifconfig/system/qnx.c: Include <unistd.h> unconditionally.
- * ifconfig/system/osf.c: Include <unistd.h>, <string.h> unconditionally.
- * ifconfig/system/linux.c: Include <unistd.h>, <string.h>
unconditionally.
- * ifconfig/system/hpux.c: Include <unistd.h>, <string.h>
unconditionally.
- * ifconfig/printif.c: Include <unistd.h>, <string.h> unconditionally.
+ * ifconfig/system/osf.c: Include <unistd.h>, <string.h>
+ unconditionally.
+ * ifconfig/system/linux.c: Include <unistd.h>, <string.h>
+ unconditionally.
+ * ifconfig/system/hpux.c: Include <unistd.h>, <string.h>
+ unconditionally.
+ * ifconfig/printif.c: Include <unistd.h>, <string.h>
+ unconditionally.
* ifconfig/options.c: Include <string.h> unconditionally.
- * ifconfig/ifconfig.c: Include <unistd.h>, <string.h> unconditionally.
+ * ifconfig/ifconfig.c: Include <unistd.h>, <string.h>
+ unconditionally.
* ifconfig/flags.c: Include <string.h> unconditionally.
* ifconfig/changeif.c: Include <string.h> unconditionally.
@@ -56,8 +67,10 @@
* libtelnet/shishi.c: Include <string.h> unconditionally.
* libtelnet/read_passwd.c: Don't include <strings.h>.
* libtelnet/kerberos5.c: Include <string.h> unconditionally.
- * libtelnet/kerberos.c: Include <stdlib.h>, <string.h> unconditionally.
- * libtelnet/encrypt.c: Include <stdlib.h>, <string.h>, "genget.h"
unconditionally.
+ * libtelnet/kerberos.c: Include <stdlib.h>, <string.h>
+ unconditionally.
+ * libtelnet/encrypt.c: Include <stdlib.h>, <string.h>, "genget.h"
+ unconditionally.
* libtelnet/enc_des.c: Include <stdlib.h> unconditionally.
* libtelnet/auth.c: Include <stdlib.h> unconditionally.
diff --git a/NEWS b/NEWS
index cbdbaf5..f355040 100644
--- a/NEWS
+++ b/NEWS
@@ -5,18 +5,16 @@ See the end of this file for for license conditions.
Please send inetutils bug reports to <address@hidden>.
-Unreleased
-Version 1.7.90:
-
-* inetutils
+May 15, 2010
+Version 1.7:
-** ftp
+* ftp
New options --active and --passive to enable/disable active transfer
mode. The short option for --prompt has been removed, and is instead
now used to enable passive transfer mode.
-** ifconfig
+* ifconfig
New commands (up and down) to bring up/down an interface using
ifconfig.
@@ -48,7 +46,6 @@ format definitions.
* Man pages for the daemons are now in section 8 instead of 1.
* There is now a man page for ping6 too.
-
December 16, 2009
Version 1.7:
diff --git a/configure.ac b/configure.ac
index 27f8b3b..eb2fb50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
AC_PREREQ(2.59)
-AC_INIT([GNU inetutils], [1.7.90], address@hidden)
+AC_INIT([GNU inetutils], [1.7], address@hidden)
AC_CONFIG_SRCDIR([src/inetd.c])
AC_CONFIG_AUX_DIR([build-aux])
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=fa48ded461840281d22575a1622a9f0dd5bc7e72
commit fa48ded461840281d22575a1622a9f0dd5bc7e72
Author: Alfred M. Szmidt <address@hidden>
Date: Sat May 15 13:01:24 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index 0920e2a..453d53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
2010-05-15 Alfred M. Szmidt <address@hidden>
+ * src/uucpd.c: Include <sys/wait.h>, <sys/time.h>, <time.h>
+ unconditionally.
+ * src/tftp.c: Include <sys/time.h>, <time.h> unconditionally.
+ * src/syslogd.c: Include <sys/time.h>, <time.h>, <stdarg.h>
+ unconditionally.
+ (dbg_printf): Remove redundant va_start call, don't use K&R style
+ variable arguments.
+ * src/rshd.c Include <alloca.h>, <sys/time.h>, <time.h>,
+ <sys/select.h> unconditionally.
+ [!alloca]: Removed macro.
+ * src/rsh.c: Include <sys/time.h>, <time.h>, <sys/select.h>
+ unconditionally.
+ * src/rlogind.c: Include <sys/time.h>, <time.h>, <sys/select.h>
+ unconditionally.
+ * src/rlogin.c: Include <sys/time.h>, <time.h>, <sys/wait.h>,
+ <stdarg.h> unconditionally.
+ (warning): Don't use K&R variable arguments.
+ * src/rexecd.c: Include <sys/time.h>, <time.h>, <sys/select.h>
+ unconditionally.
+ * src/rexec.c: Include <sys/select.h> unconditionally.
+ * src/rcp.c: Include <sys/time.h>, <time.h> unconditionally.
+ * src/inetd.c: Include <sys/wait.h>, <sys/time.h>, <time.h>,
+ <sys/select.h> unconditionally.
+
+2010-05-15 Alfred M. Szmidt <address@hidden>
+
* ifconfig/system/solaris.c: Include <unistd.h>, <string.h>
unconditionally.
* ifconfig/system/qnx.c: Include <unistd.h> unconditionally.
* ifconfig/system/osf.c: Include <unistd.h>, <string.h> unconditionally.
diff --git a/src/inetd.c b/src/inetd.c
index aa98a2c..b9f4d5c 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -107,19 +107,9 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <time.h>
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
@@ -142,9 +132,7 @@
#include <argp.h>
#include <argp-version-etc.h>
#include <progname.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include <grp.h>
#include "libinetutils.h"
diff --git a/src/rcp.c b/src/rcp.c
index fa92d02..32acaa0 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -53,16 +53,9 @@
#include <sys/param.h>
#include <sys/stat.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
+
#include <sys/socket.h>
#include <sys/wait.h>
#include <netinet/in.h>
diff --git a/src/rexec.c b/src/rexec.c
index d31c5bb..3d75001 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -40,9 +40,7 @@
#include <string.h>
#include <unistd.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include <stdarg.h>
#include <progname.h>
diff --git a/src/rexecd.c b/src/rexecd.c
index ab6000d..0bcb8d1 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -58,16 +58,8 @@
# include <sys/filio.h>
#endif
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <netinet/in.h>
@@ -83,9 +75,7 @@
#ifdef HAVE_CRYPT_H
# include <crypt.h>
#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include <stdarg.h>
#ifdef HAVE_SHADOW_H
# include <shadow.h>
diff --git a/src/rlogin.c b/src/rlogin.c
index 8b80596..07acc40 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -58,22 +58,12 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
#include <sys/ioctl.h>
#ifdef HAVE_SYS_STREAM_H
# include <sys/stream.h>
@@ -110,11 +100,8 @@
#include <string.h>
#include <unistd.h>
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
+
#include <progname.h>
#include "libinetutils.h"
@@ -246,10 +233,10 @@ static struct argp_option argp_options[] = {
"an escape character", GRP+1},
{"user", 'l', "USER", 0, "run as USER on the remote system", GRP+1},
#if defined(KERBEROS) || defined(SHISHI)
-#ifdef ENCRYPTION
+# ifdef ENCRYPTION
{"encrypt", 'x', NULL, 0, "turns on DES encryption for all data passed via "
"the rlogin session", GRP+1},
-#endif
+# endif
{"kerberos", 'K', NULL, 0, "turns off all Kerberos authentication", GRP+1},
{"realm", 'k', "REALM", 0, "obtain tickets for the remote host in REALM "
"realm instead of the remote's realm", GRP+1},
@@ -290,14 +277,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
break;
#if defined (KERBEROS) || defined(SHISHI)
-#ifdef ENCRYPTION
+# ifdef ENCRYPTION
case 'x':
doencrypt = 1;
-#ifdef KERBEROS
+# ifdef KERBEROS
des_set_key (cred.session, schedule);
-#endif
+# endif
break;
-#endif
+# endif
case 'K':
use_kerberos = 0;
@@ -1289,22 +1276,12 @@ copytochild (int signo ARG_UNUSED)
#if defined(KERBEROS) || defined(SHISHI)
void
-# if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
warning (const char *fmt, ...)
-# else
-warning (fmt, va_alist)
- char *fmt;
- va_dcl
-# endif
{
va_list ap;
fprintf (stderr, "rlogin: warning, using standard rlogin: ");
-# if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (ap, fmt);
-# else
- va_start (ap);
-# endif
vfprintf (stderr, fmt, ap);
va_end (ap);
fprintf (stderr, ".\n");
diff --git a/src/rlogind.c b/src/rlogind.c
index 5faaa81..42b2d38 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -27,16 +27,8 @@
# include <sys/filio.h>
#endif
#include <termios.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#ifdef HAVE_SYS_STREAM_H
# include <sys/stream.h>
#endif
@@ -70,9 +62,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include <sys/ioctl.h>
#include <sys/stat.h> /* Needed for chmod() */
diff --git a/src/rsh.c b/src/rsh.c
index 97c6621..6f35253 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -58,16 +58,8 @@
# include <sys/filio.h>
#endif
#include <sys/file.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <netinet/in.h>
#include <netdb.h>
@@ -80,9 +72,7 @@
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include <error.h>
#include <progname.h>
diff --git a/src/rshd.c b/src/rshd.c
index 3df9938..9b45ce9 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -60,35 +60,12 @@
# include <config.h>
#endif
-#if !defined (__GNUC__) && defined (_AIX)
-# pragma alloca
-#endif
-#ifndef alloca /* Make alloca work the best possible way. */
-# ifdef __GNUC__
-# define alloca __builtin_alloca
-# else /* not __GNUC__ */
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else /* not __GNUC__ or HAVE_ALLOCA_H */
-# ifndef _AIX /* Already did AIX, up at the top. */
-char *alloca ();
-# endif /* not _AIX */
-# endif /* not HAVE_ALLOCA_H */
-# endif /* not __GNUC__ */
-#endif /* not alloca */
+#include <alloca.h>
#include <sys/param.h>
#include <sys/ioctl.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -110,9 +87,7 @@ char *alloca ();
#include <syslog.h>
#include <unistd.h>
#include <grp.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include <error.h>
#include <progname.h>
#include <argp.h>
diff --git a/src/syslogd.c b/src/syslogd.c
index 5543448..6772a31 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -87,16 +87,8 @@
#include <sys/socket.h>
#include <sys/uio.h>
#include <sys/un.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <sys/resource.h>
#include <poll.h>
#ifdef HAVE_SYS_TYPES_H
@@ -118,11 +110,7 @@
#include <string.h>
#include <unistd.h>
-#ifdef HAVE_STDARG_H
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
#define SYSLOG_NAMES
#include <syslog.h>
@@ -2021,12 +2009,6 @@ dbg_printf (const char *fmt, ...)
if (!(Debug && dbg_output))
return;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
- va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
-
va_start (ap, fmt);
vfprintf (stdout, fmt, ap);
va_end (ap);
diff --git a/src/tftp.c b/src/tftp.c
index 8c92ea0..f3b3760 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -56,16 +56,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/file.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <netinet/in.h>
diff --git a/src/uucpd.c b/src/uucpd.c
index b1b5071..2ce1a17 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -60,9 +60,7 @@
#endif
#include <sys/types.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -70,16 +68,8 @@
#include <netdb.h>
#include <signal.h>
#include <fcntl.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <pwd.h>
#include <unistd.h>
#include <errno.h>
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=26b8c43295081326f32ed55e8c4e3c65d4b15dd5
commit 26b8c43295081326f32ed55e8c4e3c65d4b15dd5
Author: Alfred M. Szmidt <address@hidden>
Date: Sat May 15 12:55:47 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index fe64e4a..0920e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2010-05-15 Alfred M. Szmidt <address@hidden>
+ * ifconfig/system/solaris.c: Include <unistd.h>, <string.h>
unconditionally.
+ * ifconfig/system/qnx.c: Include <unistd.h> unconditionally.
+ * ifconfig/system/osf.c: Include <unistd.h>, <string.h> unconditionally.
+ * ifconfig/system/linux.c: Include <unistd.h>, <string.h>
unconditionally.
+ * ifconfig/system/hpux.c: Include <unistd.h>, <string.h>
unconditionally.
+ * ifconfig/printif.c: Include <unistd.h>, <string.h> unconditionally.
+ * ifconfig/options.c: Include <string.h> unconditionally.
+ * ifconfig/ifconfig.c: Include <unistd.h>, <string.h> unconditionally.
+ * ifconfig/flags.c: Include <string.h> unconditionally.
+ * ifconfig/changeif.c: Include <string.h> unconditionally.
+
+2010-05-15 Alfred M. Szmidt <address@hidden>
+
* libinetutils/utmp_logout.c: Include <sys/time.h>, <time.h>,
<string.h> unconditionally.
* libinetutils/utmp_init.c: Include <sys/time.h>, <time.h>,
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index 4f3bfae..f52ba7d 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -25,11 +25,7 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 602495c..d927da5 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -25,11 +25,7 @@
#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index f216fcd..59377f1 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -55,7 +55,7 @@ int print_if_flags (int flags, const char *avoid, char
seperator);
char *if_list_flags (const char *prefix);
/* Size of the buffer for the if_format_flags call */
-#define IF_FORMAT_FLAGS_BUFSIZE 15
+# define IF_FORMAT_FLAGS_BUFSIZE 15
void if_format_flags (int flags, char *buf, size_t size);
#endif
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index 28a1d69..810244e 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -27,15 +27,9 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 1d46dbc..3e3a196 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -35,11 +35,7 @@
# endif
#endif
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index d3278af..54bc2f6 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -26,15 +26,9 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
@@ -864,11 +858,11 @@ fh_flags (format_data_t form, int argc, char *argv[])
void
fh_map_query (format_data_t form, int argc, char *argv[])
{
-#ifdef SIOCGIFMAP
+# ifdef SIOCGIFMAP
if (ioctl (form->sfd, SIOCGIFMAP, form->ifr) >= 0)
select_arg (form, argc, argv, 0);
else
-#endif
+# endif
select_arg (form, argc, argv, 1);
}
diff --git a/ifconfig/system/hpux.c b/ifconfig/system/hpux.c
index 0841804..5ba5a0b 100644
--- a/ifconfig/system/hpux.c
+++ b/ifconfig/system/hpux.c
@@ -27,15 +27,9 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index 8a72903..fd5a1b2 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -28,15 +28,9 @@
#include <errno.h>
#include <xalloc.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index bd11e5b..5b03581 100644
--- a/ifconfig/system/linux.h
+++ b/ifconfig/system/linux.h
@@ -39,10 +39,10 @@ struct system_ifconfig
/* Output format support. */
-#define _IU_CAT2(a,b) a ## b
-#define _IU_DCL(name,fld) \
+# define _IU_CAT2(a,b) a ## b
+# define _IU_DCL(name,fld) \
{#name, _IU_CAT2(system_fh_,fld) }
-#define _IU_EXTRN(fld) \
+# define _IU_EXTRN(fld) \
extern void _IU_CAT2(system_fh_,fld) (format_data_t, int, char *[]); \
# define SYSTEM_FORMAT_HANDLER \
diff --git a/ifconfig/system/osf.c b/ifconfig/system/osf.c
index 03aca38..4d361d0 100644
--- a/ifconfig/system/osf.c
+++ b/ifconfig/system/osf.c
@@ -27,15 +27,9 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index 05a6b37..a2a3abd 100644
--- a/ifconfig/system/qnx.c
+++ b/ifconfig/system/qnx.c
@@ -25,9 +25,7 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#if STDC_HEADERS
# include <stdlib.h>
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index 81e06c8..2f5884f 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -27,15 +27,9 @@
#include <stdio.h>
#include <errno.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8f1b2406e3fa4c6bd002a2cf76ba18c6fabd9bf9
commit 8f1b2406e3fa4c6bd002a2cf76ba18c6fabd9bf9
Author: Alfred M. Szmidt <address@hidden>
Date: Sat May 15 12:52:09 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index aa2949d..fe64e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2010-05-15 Alfred M. Szmidt <address@hidden>
+ * libinetutils/utmp_logout.c: Include <sys/time.h>, <time.h>,
+ <string.h> unconditionally.
+ * libinetutils/utmp_init.c: Include <sys/time.h>, <time.h>,
+ <string.h> unconditionally.
+ * libinetutils/ttymsg.c (O_NONBLOCK): Removed macro.
+ * libinetutils/setsig.c: Include <stdlib.h> unconditionally.
+ * libinetutils/logwtmp.c: Include <sys/time.h>, <time.h>,
+ <errno.h>, <string.h> unconditionally.
+ * libinetutils/localhost.c: Include <stdlib.h> unconditionally.
+ * libinetutils/cleansess.c: Include <sys/time.h>, <time.h>,
+ <string.h> unconditionally.
+
+2010-05-15 Alfred M. Szmidt <address@hidden>
+
* libtelnet/shishi.c: Include <string.h> unconditionally.
* libtelnet/read_passwd.c: Don't include <strings.h>.
* libtelnet/kerberos5.c: Include <string.h> unconditionally.
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index 9d998d6..32d6c50 100644
--- a/libinetutils/cleansess.c
+++ b/libinetutils/cleansess.c
@@ -25,16 +25,8 @@
#include <unistd.h>
#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#ifdef HAVE_UTMP_H
# include <utmp.h>
#else
@@ -43,9 +35,7 @@
# define utmp utmpx /* make utmpx look more like utmp */
# endif
#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index 7b60f9b..06267b8 100644
--- a/libinetutils/localhost.c
+++ b/libinetutils/localhost.c
@@ -27,9 +27,7 @@
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
-#if defined(STDC_HEADERS) || defined(HAVE_STDLIB_H)
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index e4eddad..56ce74d 100644
--- a/libinetutils/logwtmp.c
+++ b/libinetutils/logwtmp.c
@@ -29,22 +29,12 @@
#include <unistd.h>
#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/file.h>
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
#ifdef HAVE_UTMP_H
# include <utmp.h>
#else
@@ -53,9 +43,7 @@
# define utmp utmpx /* make utmpx look more like utmp */
# endif
#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
#if !HAVE_DECL_ERRNO
extern int errno;
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 5b94f59..ddf09ad 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -23,9 +23,7 @@
# include <config.h>
#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include <signal.h>
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 8b948b7..11bc143 100644
--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -62,10 +62,6 @@
#include <stdlib.h>
#include <sys/wait.h>
-#if !defined (O_NONBLOCK) && defined (O_NDELAY)
-# define O_NONBLOCK O_NDELAY /* O_NDELAY is an old BSD name for this. */
-#endif
-
#define MAX_ERRBUF 1024
static int fork2 (void);
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 0a686c3..ef0ced6 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -46,11 +46,8 @@
#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#else
-# include <time.h>
-#endif
+#include <sys/time.h>
+#include <time.h>
#ifdef HAVE_UTMPX_H
# ifndef __USE_GNU
# define __USE_GNU
@@ -59,11 +56,7 @@
#else
# include <utmp.h>
#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#include <unistd.h>
/* utmp_init - update utmp and wtmp before login */
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index aed9530..6b1b72d 100644
--- a/libinetutils/utmp_logout.c
+++ b/libinetutils/utmp_logout.c
@@ -45,22 +45,15 @@
#endif
#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#else
-# include <time.h>
-#endif
+#include <sys/time.h>
+#include <time.h>
#if defined(UTMPX) && defined(HAVE_UTMPX_H)
# define __USE_GNU
# include <utmpx.h>
#else
# include <utmp.h>
#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
/* utmp_logout - update utmp and wtmp after logout */
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=edc55aa8e4c4411a2dce4760ad50b047e99aa6d2
commit edc55aa8e4c4411a2dce4760ad50b047e99aa6d2
Author: Alfred M. Szmidt <address@hidden>
Date: Sat May 15 12:48:29 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index 20f7374..aa2949d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-05-15 Alfred M. Szmidt <address@hidden>
+ * libtelnet/shishi.c: Include <string.h> unconditionally.
+ * libtelnet/read_passwd.c: Don't include <strings.h>.
+ * libtelnet/kerberos5.c: Include <string.h> unconditionally.
+ * libtelnet/kerberos.c: Include <stdlib.h>, <string.h> unconditionally.
+ * libtelnet/encrypt.c: Include <stdlib.h>, <string.h>, "genget.h"
unconditionally.
+ * libtelnet/enc_des.c: Include <stdlib.h> unconditionally.
+ * libtelnet/auth.c: Include <stdlib.h> unconditionally.
+
+2010-05-15 Alfred M. Szmidt <address@hidden>
+
* libls/fts.c: Include <string.h> unconditionally.
2010-05-14 Alfred M. Szmidt <address@hidden>
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 7147e28..c398bc8 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -77,9 +77,7 @@
# include <signal.h>
# define AUTH_NAMES
# include <arpa/telnet.h>
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
+# include <stdlib.h>
# ifdef NO_STRING_H
# include <strings.h>
# else
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index c7dacb5..94c4eca 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -60,9 +60,7 @@ extern Shishi *shishi_handle;
# endif
# include <arpa/telnet.h>
# include <stdio.h>
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
+# include <stdlib.h>
# include "encrypt.h"
# include "key-proto.h"
@@ -81,7 +79,7 @@ extern int encrypt_debug_mode;
# define FAILED -1
-#include <string.h>
+# include <string.h>
struct fb
{
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index ad6de54..337e314 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -79,17 +79,11 @@
# include "encrypt.h"
# include "misc.h"
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-# ifdef NO_STRING_H
-# include <strings.h>
-# else
-# include <string.h>
-# endif
-
-#include <stdio.h>
-#include "genget.h"
+# include <stdlib.h>
+# include <string.h>
+
+# include <stdio.h>
+# include "genget.h"
/*
* These functions pointers point to the current routines
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index b084142..b615657 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -77,14 +77,8 @@
# include <stdio.h>
# include <des.h> /* BSD wont include this in krb.h, so we do it
here */
# include <krb.h>
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-# ifdef NO_STRING_H
-# include <strings.h>
-# else
-# include <string.h>
-# endif
+# include <stdlib.h>
+# include <string.h>
# include "encrypt.h"
# include "auth.h"
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index d3ba01c..5d19f32 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -33,11 +33,7 @@
# include <netdb.h>
# include <ctype.h>
# include <syslog.h>
-# ifdef HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
+# include <string.h>
# include "auth.h"
# include "misc.h"
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index b22cd2f..2d08085 100644
--- a/libtelnet/read_passwd.c
+++ b/libtelnet/read_passwd.c
@@ -65,7 +65,6 @@
#if defined(RSA_ENCPWD) || defined(KRB4_ENCPWD)
# include <stdio.h>
-# include <strings.h>
# include <sys/ioctl.h>
# include <signal.h>
# include <setjmp.h>
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index d37569e..3ac9dc2 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -33,11 +33,7 @@
# include <netdb.h>
# include <ctype.h>
# include <syslog.h>
-# ifdef HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
+# include <string.h>
# include "auth.h"
# include "misc.h"
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=000e9a5410c91e4f1428c1f556fede4a14bd2d98
commit 000e9a5410c91e4f1428c1f556fede4a14bd2d98
Author: Alfred M. Szmidt <address@hidden>
Date: Sat May 15 12:44:33 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index 4c0487c..20f7374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-15 Alfred M. Szmidt <address@hidden>
+
+ * libls/fts.c: Include <string.h> unconditionally.
+
2010-05-14 Alfred M. Szmidt <address@hidden>
* ftpd/popen.c: Include <sys/wait.h> unconditionally.
diff --git a/libls/fts.c b/libls/fts.c
index 423ae33..2782f1a 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -55,11 +55,7 @@
#include <dirent.h>
#include <errno.h>
#include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
#include <unistd.h>
#include "fts.h"
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=bebea3b5c141b6fab8431367f4dd115726297609
commit bebea3b5c141b6fab8431367f4dd115726297609
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:30:17 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index db28dc2..4c0487c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,27 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * ftpd/popen.c: Include <sys/wait.h> unconditionally.
+ * ftpd/ftpd.c: Include <sys/time.h>, <time.h>, <sys/wait.h>
+ unconditionally.
+ (reply): Don't use K&R variable arguments.
+ (lreply): Don't use K&R variable arguments.
+ * ftpd/ftpcmd.y: Include <sys/time.h>, <time.h>, <sys/utsname.h>
+ unconditionally.
+ * ftpd/auth.c: Include <sys/time.h>, <time.h> unconditionally.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
* talk/msgs.c: Include <sys/time.h>, <time.h> unconditionally.
- * talk/io.c: Include <sys/time.h>, <time.h>, <sys/select.h>
unconditionally.
+ * talk/io.c: Include <sys/time.h>, <time.h>, <sys/select.h>
+ unconditionally.
* talk/invite.c: Include <sys/time.h>, <time.h> unconditionally.
* talk/ctl_transact.c: Include <sys/time.h>, <time.h>,
<sys/select.h> unconditionally.
2010-05-14 Alfred M. Szmidt <address@hidden>
- * Makefile.am (DISTCLEANFILES): Added `$(PACKAGE)-$(VERSION).tar.gz' to
list.
+ * Makefile.am (DISTCLEANFILES): Added
+ `$(PACKAGE)-$(VERSION).tar.gz' to list.
2010-05-14 Alfred M. Szmidt <address@hidden>
diff --git a/ftpd/auth.c b/ftpd/auth.c
index a06d137..b20c04d 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -33,16 +33,8 @@
#ifdef HAVE_SHADOW_H
# include <shadow.h>
#endif
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include "extern.h"
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index 2eab278..9f204f1 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -75,21 +75,11 @@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <unistd.h>
#include <limits.h>
-#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
-#endif
/* Include glob.h last, because it may define "const" which breaks
system headers on some platforms. */
#include <glob.h>
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 3451196..62d35ef 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -60,9 +60,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
#include <netinet/in.h>
#ifdef HAVE_NETINET_IN_SYSTM_H
@@ -91,16 +89,8 @@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <unistd.h>
#ifdef HAVE_MMAP
# include <sys/mman.h>
@@ -1488,11 +1478,7 @@ void
reply (int n, const char *fmt, ...)
{
va_list ap;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
printf ("%d ", n);
vprintf (fmt, ap);
printf ("\r\n");
@@ -1508,11 +1494,7 @@ void
lreply (int n, const char *fmt, ...)
{
va_list ap;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
printf ("%d- ", n);
vprintf (fmt, ap);
printf ("\r\n");
diff --git a/ftpd/popen.c b/ftpd/popen.c
index 9ff67c2..e598bf2 100644
--- a/ftpd/popen.c
+++ b/ftpd/popen.c
@@ -55,9 +55,7 @@
#endif
#include <sys/types.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
#include <errno.h>
#include <signal.h>
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=078a0bc410bac2a9e487066f755df543f07af064
commit 078a0bc410bac2a9e487066f755df543f07af064
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:27:32 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index d00589c..db28dc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * talk/msgs.c: Include <sys/time.h>, <time.h> unconditionally.
+ * talk/io.c: Include <sys/time.h>, <time.h>, <sys/select.h>
unconditionally.
+ * talk/invite.c: Include <sys/time.h>, <time.h> unconditionally.
+ * talk/ctl_transact.c: Include <sys/time.h>, <time.h>,
+ <sys/select.h> unconditionally.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
* Makefile.am (DISTCLEANFILES): Added `$(PACKAGE)-$(VERSION).tar.gz' to
list.
2010-05-14 Alfred M. Szmidt <address@hidden>
@@ -8,8 +16,8 @@
* configure.ac: Use || and && type of test instead of -o and -a
for calls to `test'. Don't check for poll() Include <errno.h>
- unconditionallyincheck for `sys_errlist'. Include <unistd.h> and
- <stdlib.h> in check for `environ'.
+ unconditionally in check for `sys_errlist'. Include <unistd.h>
+ and <stdlib.h> in check for `environ'.
* am/config_paths.m4: Use || and && type of test instead of -o and
-a for calls to `test'.
* am/libcurses.m4: Likewise.
diff --git a/talk/ctl.c b/talk/ctl.c
index 8459bb8..2454bde 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -127,4 +127,3 @@ open_ctl ()
return 0;
}
-
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 33009a9..eb8bfa9 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -53,20 +53,10 @@
#include <sys/types.h>
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <netinet/in.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#ifdef HAVE_OSOCKADDR_H
# include <osockaddr.h>
#endif
diff --git a/talk/display.c b/talk/display.c
index 0bc97b2..dd0ef56 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -222,4 +222,3 @@ display (register xwin_t * win, register char *text, int
size)
return 0;
}
-
diff --git a/talk/invite.c b/talk/invite.c
index 37449fb..b992184 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -55,16 +55,8 @@
#include <sys/types.h>
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <signal.h>
#include <netinet/in.h>
#ifdef HAVE_OSOCKADDR_H
diff --git a/talk/io.c b/talk/io.c
index d485627..ad49b09 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -62,23 +62,13 @@
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include "talk.h"
#define A_LONG_TIME 10000000
diff --git a/talk/look_up.c b/talk/look_up.c
index d07bebf..36158ab 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -137,4 +137,3 @@ check_local ()
return -1;
}
-
diff --git a/talk/msgs.c b/talk/msgs.c
index 2bbf532..38228bf 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -56,16 +56,8 @@
# include <config.h>
#endif
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <signal.h>
#include <stdio.h>
#include "talk.h"
diff --git a/talk/talk.h b/talk/talk.h
index 8f3650c..b220ba4 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -105,5 +105,3 @@ int open_ctl (void);
/* look_up.c */
int check_local (void);
-
-
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=34f91cc1f7daa82984d3f2898535e815b0166030
commit 34f91cc1f7daa82984d3f2898535e815b0166030
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:22:11 2010 +0200
Makefile.am (DISTCLEANFILES): Added `$(PACKAGE)-$(VERSION).tar.gz' to list.
diff --git a/ChangeLog b/ChangeLog
index e7e9e2b..d00589c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * Makefile.am (DISTCLEANFILES): Added `$(PACKAGE)-$(VERSION).tar.gz' to
list.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
Use || and && instead of -o and -a in calls to test.
* configure.ac: Use || and && type of test instead of -o and -a
diff --git a/Makefile.am b/Makefile.am
index 4b41a6c..7af1c56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ SUBDIRS = lib \
doc man \
tests
-DISTCLEANFILES = pathdefs.make paths.defs
+DISTCLEANFILES = pathdefs.make paths.defs $(PACKAGE)-$(VERSION).tar.gz
snapshot:
$(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=70addcf8b1eb96b4cc55f74a3f6212de0900f47b
commit 70addcf8b1eb96b4cc55f74a3f6212de0900f47b
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:21:25 2010 +0200
Use || and && instead of -o and -a in calls to test.
diff --git a/ChangeLog b/ChangeLog
index 0d0b746..e7e9e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ Use || and && instead of -o and -a in calls to test.
+
+ * configure.ac: Use || and && type of test instead of -o and -a
+ for calls to `test'. Don't check for poll() Include <errno.h>
+ unconditionallyincheck for `sys_errlist'. Include <unistd.h> and
+ <stdlib.h> in check for `environ'.
+ * am/config_paths.m4: Use || and && type of test instead of -o and
+ -a for calls to `test'.
+ * am/libcurses.m4: Likewise.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
* ftp/ruserpass.c: Include <stdarg.h> unconditionally.
* ftp/ftp.c: Include <sys/time.h>, <time.h>, <stdarg.h>,
<sys/select.h> unconditionally.
@@ -12,7 +24,7 @@
* telnet/utilities.c: Include <sys/time.h>, <time.h> unconditionally.
Don't include "fdset.h".
* telnet/tn3270.c: Don't include "fdset.h".
- * telnet/telnet.c: Include <stdlib.h> unconditionally.
+ * telnet/telnet.c: Include <stdlib.h> unconditionally.
* telnet/sys_bsd.c: Include <sys/time.h>, <time.h>, <sys/select.h>
unconditionally.
Don't include "fdset.h".
* telnet/network.c: Include <sys/time.h>, <time.h>, <sys/select.h>
unconditionally.
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 17aa1d4..d1979b3 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -61,7 +61,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
iu_tmp_file="$tmpdir/,iu-tmp.$$"
ac_clean_files="$ac_clean_files $iu_cache_file $iu_tmp_file"
while read iu_path iu_search; do
- test "$iu_path" = "#" -o -z "$iu_path" && continue
+ test "$iu_path" = "#" || test -z "$iu_path" && continue
iu_pathvar="`echo $iu_path | sed y/${IU_UCASE}/${iu_lcase}/`"
AC_MSG_CHECKING(for value of $iu_path)
@@ -172,12 +172,12 @@ HAVE_$iu_sym
esac
- test "$iu_val" -o "$iu_hdr" && break
- test "$iu_cross_test" -a "$iu_prev_cross_test" && iu_cross_conflict=yes
+ test "$iu_val" || test "$iu_hdr" && break
+ test "$iu_cross_test" && test "$iu_prev_cross_test" &&
iu_cross_conflict=yes
iu_prev_cross_test=$iu_cross_test
done
- if test -z "$iu_val" -a -z "$iu_hdr"; then
+ if test -z "$iu_val" && test -z "$iu_hdr"; then
if test -z "$iu_default"; then
iu_val=no
else
@@ -189,7 +189,7 @@ HAVE_$iu_sym
if test "$iu_val"; then
AC_MSG_RESULT(${iu_cached}${iu_defaulted}$iu_val)
- test "$iu_cross_conflict" -a "$iu_defaulted" \
+ test "$iu_cross_conflict" && test "$iu_defaulted" \
&& AC_MSG_WARN(may be incorrect because of cross-compilation)
# Put the value in the autoconf cache. We replace $( with @( to avoid
# variable evaluation problems when autoconf reads the cache later.
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 1ac1c54..b1a5e87 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -113,7 +113,9 @@ AC_DEFUN([IU_LIB_CURSES], [
_IU_SAVE_LIBS="$LIBS"
LIBS="$LIBTERMCAP"
AC_CHECK_LIB(curses, initscr, LIBCURSES="-lcurses")
- if test "$LIBCURSES" -a "$LIBTERMCAP" -a "$LIBCURSES" != "$LIBTERMCAP";
then
+ if test "$LIBCURSES" \
+ && test "$LIBTERMCAP" \
+ && test "$LIBCURSES" != "$LIBTERMCAP"; then
AC_CACHE_CHECK(whether curses needs $LIBTERMCAP,
inetutils_cv_curses_needs_termcap,
LIBS="$LIBCURSES"
diff --git a/am/result.m4 b/am/result.m4
index b9b477e..f7d8b66 100644
--- a/am/result.m4
+++ b/am/result.m4
@@ -35,4 +35,3 @@ AC_DEFUN([IU_RESULT_ACTIONS], [
else
]ifelse([$4], , [:], [$4])[
fi]])dnl
-
diff --git a/configure.ac b/configure.ac
index 331b7bb..27f8b3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,7 @@ fi
AC_SUBST(LIBPAM)
# Can we use libls? but we must have fchdir()
-if test "$enable_libls" = yes -a "$ac_cv_func_fchdir" = yes ; then
+if test "$enable_libls" = yes && test "$ac_cv_func_fchdir" = yes ; then
LIBLS="../libls/libls.a"
libls_BUILD="libls.a"
AC_DEFINE([WITH_LIBLS], 1, [Define to one if you have -lls])
@@ -215,7 +215,7 @@ AC_SUBST(libls_BUILD)
if test "$enable_talk" != no; then
IU_LIB_CURSES
fi
-if test "$enable_talk" != no -a "$LIBCURSES"; then
+if test "$enable_talk" != no && test "$LIBCURSES"; then
enable_talk=yes
else
if test "$enable_talk" = yes; then
@@ -228,7 +228,8 @@ fi
dnl FIXME: Make this test case a bit more robust. Remove KRB4
LIBAUTH=
INCAUTH=
-if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
+if test "$enable_encryption" = yes \
+ || test "$enable_authentication" = yes; then
AH_TEMPLATE(KERBEROS, [Define to one if you have Kerberos])
AH_TEMPLATE(KRB4, [Define to one if you have Kerberos IV])
AH_TEMPLATE(KRB5, [Define to one if you have Kerberos V])
@@ -246,12 +247,17 @@ if test "$enable_encryption" = yes -o
"$enable_authentication" = yes; then
[LIBAUTH="$LIBAUTH -ldes"],
-L$KERBEROS_DIR)
dnl FIXME: Fix this to one test case.
- test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes\
- && AC_DEFINE([KRB4])
- test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes
\
- && AC_DEFINE([KERBEROS])
- test "$enable_encryption" = yes -a "$ac_cv_lib_des_des_key_sched" = yes \
- && AC_DEFINE([DES_ENCRYPTION])
+ test "$enable_authentication" = yes \
+ && test "$ac_cv_lib_krb_krb_mk_req" = yes \
+ && AC_DEFINE([KRB4])
+
+ test "$enable_authentication" = yes \
+ && test "$ac_cv_lib_krb_krb_mk_req" = yes \
+ && AC_DEFINE([KERBEROS])
+
+ test "$enable_encryption" = yes \
+ && test "$ac_cv_lib_des_des_key_sched" = yes \
+ && AC_DEFINE([DES_ENCRYPTION])
fi
;;
5)
@@ -309,43 +315,43 @@ AC_ARG_ENABLE([ipv6],
)
working_ipv6=yes
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
IU_CHECK_MACRO(AF_INET6, [#include <sys/socket.h>], , , working_ipv6=no)
fi
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
IU_CHECK_MACRO(IPV6_V6ONLY, [#include <netinet/in.h>], , , working_ipv6=no)
fi
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
AC_CHECK_TYPE(struct sockaddr_storage, , working_ipv6=no, [#include
<sys/socket.h>])
fi
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
AC_CHECK_TYPE(struct sockaddr_in6, , working_ipv6=no, [#include
<netinet/in.h>])
fi
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
AC_CHECK_TYPE(struct addrinfo, , working_ipv6=no, [#include <netdb.h>])
fi
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
AC_CHECK_FUNC(getnameinfo, ,working_ipv6=no, [#include <netdb.h>])
fi
-if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
+if test ! "X$ipv6" = "Xno" && test "X$working_ipv6" = "Xyes"; then
AC_DEFINE([IPV6], 1, [Define to one if you want IPv6.])
-else
+else
if test "X$ipv6" = "Xyes"; then
AC_MSG_FAILURE([IPv6 support not available])
- else
+ else
if test "X$ipv6" = "Xauto"; then
AC_MSG_WARN([IPv6 support not available, disabling IPv6])
fi
fi
fi
-if test "X$ipv6" = "Xno" -o "X$working_ipv6" = "Xno";then
+if test "X$ipv6" = "Xno" || test "X$working_ipv6" = "Xno";then
ping6_BUILD=''
else
working_icmp6=yes
@@ -536,9 +542,9 @@ IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
if test "$ac_cv_header_utmp_h" = yes; then
AC_CHECK_TYPES(struct lastlog, , , [#include <utmp.h>])
- IU_CHECK_MEMBERS([struct utmp.ut_type, struct utmp.ut_pid,
+ IU_CHECK_MEMBERS([struct utmp.ut_type, struct utmp.ut_pid,
struct utmp.ut_id, struct utmp.ut_user,
- struct utmp.ut_host, struct utmp.ut_tv,
+ struct utmp.ut_host, struct utmp.ut_tv,
struct utmp.ut_exit], , ,
[#include <sys/types.h>
#include <utmp.h>])
@@ -615,11 +621,6 @@ AC_CHECK_FUNC(getopt_long)
AC_CHECK_HEADER(poll.h)
-dnl Supply a version of poll() if the libray is missing.
-dnl syslogd uses poll() unconditionnaly.
-AC_CHECK_FUNC(poll, ,
- [AC_DEFINE([HAVE_POLL_H], 1, [Define to one if you have <poll.h>])])
-
dnl See if snprintf exists, otherwise just use a bogus version
AC_CHECK_FUNC(snprintf,
[AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
@@ -637,9 +638,7 @@ if test "$ac_cv_func_strerror" = no; then
if test "$ac_cv_func_sys_errlist" = yes; then
AC_CHECK_DECL(sys_errlist, , ,
[IU_FLUSHLEFT([#include <stdio.h>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #endif])])
+ #include <errno.h>])])
fi
fi
@@ -654,7 +653,8 @@ else
AC_CHECK_DECL(h_errlist, , , [#include <netdb.h>])
fi
fi
-if test "$ac_cv_func_hstrerror" = yes -o "$ac_cv_func_h_errlist" = yes; then
+if test "$ac_cv_func_hstrerror" = yes \
+ || test "$ac_cv_func_h_errlist" = yes; then
# If there's a system hstrerror, or we can reasonably replace it, say so.
# We still provide some definition, regardless, but this allows people to use
# a reasonable alternative if the situation allows, rather than using a
@@ -708,12 +708,8 @@ AC_CHECK_DECLS(htons, , ,
dnl Our home-grown version of setenv needs to use ENVIRON
AC_CHECK_DECLS(environ, , ,
- [IU_FLUSHLEFT([#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif ])])
+ [IU_FLUSHLEFT([#include <unistd.h>
+ #include <stdlib.h>])])
dnl See if we have h_errno (the test is here so we can use -lresolv
dnl if necessary).
@@ -800,7 +796,7 @@ esac
AC_CONFIG_FILES([
Makefile
lib/Makefile
-libinetutils/Makefile
+libinetutils/Makefile
libtelnet/Makefile
libicmp/Makefile
libls/Makefile
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0c3ae5b458eaf2f321c24938e59e44f4d9e5d725
commit 0c3ae5b458eaf2f321c24938e59e44f4d9e5d725
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:17:26 2010 +0200
Removed spurious newlines. (silent change)
diff --git a/ping/ping_common.h b/ping/ping_common.h
index 9ec4406..41e72bb 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -158,4 +158,3 @@ void ping_set_sockopt (PING * ping, int opt, void *val, int
valsize);
void ping_set_interval (PING * ping, size_t interval);
void ping_unset_data (PING * p);
int ping_timeout_p (struct timeval *start_time, int timeout);
-
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=c3aebed664aae411467843609192036b9b98491b
commit c3aebed664aae411467843609192036b9b98491b
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:17:04 2010 +0200
Removed spurious newlines. (silent change)
diff --git a/talkd/talkd.c b/talkd/talkd.c
index a191c3a..f7c4abb 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -162,4 +162,3 @@ talkd_run (int fd)
}
}
}
-
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=1536ef99260ce5c6aab24c7c6c78595e7be06fff
commit 1536ef99260ce5c6aab24c7c6c78595e7be06fff
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:16:40 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index 025a46b..0d0b746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * ftp/ruserpass.c: Include <stdarg.h> unconditionally.
+ * ftp/ftp.c: Include <sys/time.h>, <time.h>, <stdarg.h>,
+ <sys/select.h> unconditionally.
+ (command): Don't use K&R variable arguments.
+ * ftp/cmds.c: <sys/wait.h>, <sys/time.h>, <time.h>
+
* telnetd/telnetd.c: Include <sys/utsname.h>, <strings.h>
unconditionally.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 79df907..7c248eb 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -55,9 +55,7 @@
#endif
#include <sys/param.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -74,26 +72,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <unistd.h>
/* Include glob.h last, because it may define "const" which breaks
system headers on some platforms. */
#include <glob.h>
#if HAVE_LIBREADLINE
-# include <readline/readline.h>
-# include <readline/history.h>
+# include <readline/readline.h>
+# include <readline/history.h>
#else
-# include "readline.h"
+# include "readline.h"
#endif
#include "ftp_var.h"
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 3abf93d..e0e2fab 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -55,16 +55,8 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <sys/file.h>
#include <netinet/in.h>
@@ -89,14 +81,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <stdarg.h>
+#include <sys/select.h>
#include "ftp_var.h"
@@ -354,17 +340,9 @@ cmdabort (int sig ARG_UNUSED)
}
int
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
command (const char *fmt, ...)
-#else
-command (va_alist)
- va_dcl
-#endif
{
va_list ap;
-#if !(defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__)
- const char *fmt;
-#endif
int r;
sig_t oldintr;
@@ -372,12 +350,7 @@ command (va_alist)
if (debug)
{
printf ("---> ");
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (ap, fmt);
-#else
- va_start (ap);
- fmt = va_arg (ap, char *);
-#endif
if (strncmp ("PASS ", fmt, 5) == 0)
printf ("PASS XXXX");
else
@@ -395,12 +368,7 @@ command (va_alist)
oldintr = signal (SIGINT, cmdabort);
/* Under weird circumstances, we get a SIGPIPE from fflush(). */
signal (SIGPIPE, SIG_IGN);
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (ap, fmt);
-#else
- va_start (ap);
- fmt = va_arg (ap, char *);
-#endif
vfprintf (cout, fmt, ap);
va_end (ap);
fprintf (cout, "\r\n");
diff --git a/ftp/main.c b/ftp/main.c
index b05fc1e..8ab8e47 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -79,10 +79,10 @@
#include "libinetutils.h"
#if HAVE_LIBREADLINE
-# include <readline/readline.h>
-# include <readline/history.h>
+# include <readline/readline.h>
+# include <readline/history.h>
#else
-# include "readline.h"
+# include "readline.h"
#endif
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 029c40f..125f13e 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -60,11 +60,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
#include <error.h>
#include "ftp_var.h"
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=4915c163025a60b298ae8116078ba5db06b7b434
commit 4915c163025a60b298ae8116078ba5db06b7b434
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:13:33 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index cfbbc48..025a46b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * telnetd/telnetd.c: Include <sys/utsname.h>, <strings.h>
+ unconditionally.
+
* telnet/utilities.c: Include <sys/time.h>, <time.h> unconditionally.
Don't include "fdset.h".
* telnet/tn3270.c: Don't include "fdset.h".
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index e751831..ec76603 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -22,9 +22,7 @@
#include "telnetd.h"
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
+#include <sys/utsname.h>
#include <argp.h>
#include <progname.h>
#include <error.h>
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 677fcea..4b051d5 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -35,9 +35,7 @@
#include <syslog.h>
#include <string.h>
#include <ctype.h>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
+#include <strings.h>
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=82aa9529c1e373f34b3e8973e95c5b0e0d7ba69a
commit 82aa9529c1e373f34b3e8973e95c5b0e0d7ba69a
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:12:31 2010 +0200
Removed spurious #ifdef's for files that are in gnulib.
diff --git a/ChangeLog b/ChangeLog
index 7589d65..cfbbc48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * telnet/utilities.c: Include <sys/time.h>, <time.h> unconditionally.
+ Don't include "fdset.h".
+ * telnet/tn3270.c: Don't include "fdset.h".
+ * telnet/telnet.c: Include <stdlib.h> unconditionally.
+ * telnet/sys_bsd.c: Include <sys/time.h>, <time.h>, <sys/select.h>
unconditionally.
+ Don't include "fdset.h".
+ * telnet/network.c: Include <sys/time.h>, <time.h>, <sys/select.h>
unconditionally.
+ * telnet/commands.c: Include <fcntl.h>, <stdarg.h>, <stdlib.h>
unconditionally.
+ (call): Don't use K&R variable arguments.
+ * telnet/fdset.h: File removed.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
Silence makefile_at_at_check_exceptions from `make syntax-check'.
* telnetd/Makefile.am (INCLUDES, LDADD): Use $() variables, instead of
@@.
diff --git a/telnet/commands.c b/telnet/commands.c
index 05c6705..d2c8af4 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -63,24 +63,16 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif /* CRAY */
+#include <fcntl.h>
#include <signal.h>
#include <netdb.h>
#include <ctype.h>
#include <pwd.h>
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
#include <errno.h>
-#if defined(STDC_HEADERS) || defined(HAVE_STDLIB_H)
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -2846,26 +2838,13 @@ static Command cmdtab2[] = {
*/
static int
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
call (intrtn_t routine, ...)
-#else
-call (va_alist)
- va_dcl
-#endif
{
va_list ap;
-#if !(defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__)
- intrtn_t routine;
-#endif
char *args[100];
int argno = 0;
-#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
va_start (ap, routine);
-#else
- va_start (ap);
- routine = (va_arg (ap, intrtn_t));
-#endif
while ((args[argno++] = va_arg (ap, char *)) != 0)
{
;
diff --git a/telnet/fdset.h b/telnet/fdset.h
deleted file mode 100644
index d171d0e..0000000
--- a/telnet/fdset.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- Inc.
-
- This file is part of GNU Inetutils.
-
- GNU Inetutils is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or (at
- your option) any later version.
-
- GNU Inetutils is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see `http://www.gnu.org/licenses/'. */
-
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-/*
- * The following is defined just in case someone should want to run
- * this telnet on a 4.2 system.
- *
- */
-
-#ifndef FD_SETSIZE
-
-# define FD_SET(n, p) ((p)->fds_bits[0] |= (1<<(n)))
-# define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1<<(n)))
-# define FD_ISSET(n, p) ((p)->fds_bits[0] & (1<<(n)))
-# define FD_ZERO(p) ((p)->fds_bits[0] = 0)
-
-#endif
diff --git a/telnet/network.c b/telnet/network.c
index 09eb5d5..28e8288 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -55,29 +55,17 @@
#include <sys/types.h>
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <sys/time.h>
+#include <time.h>
#include <errno.h>
#include <arpa/telnet.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include "ring.h"
#include "defines.h"
#include "externs.h"
-#include "fdset.h"
Ring netoring, netiring;
unsigned char netobuf[2 * BUFSIZ], netibuf[BUFSIZ];
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index e913ab9..3faa5b1 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -58,28 +58,16 @@
#include <fcntl.h>
#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
#include <sys/socket.h>
#include <signal.h>
#include <errno.h>
#include <arpa/telnet.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
+#include <sys/select.h>
#include "ring.h"
-#include "fdset.h"
-
#include "defines.h"
#include "externs.h"
#include "types.h"
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 586db9a..68e7953 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -64,9 +64,7 @@
#include <arpa/telnet.h>
#include <ctype.h>
-#if defined(STDC_HEADERS) || defined(HAVE_STDLIB_H)
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include <libinetutils.h>
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index 418e8c5..9299457 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -59,7 +59,6 @@
#include "defines.h"
#include "ring.h"
#include "externs.h"
-#include "fdset.h"
#if defined(TN3270)
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 274f32f..209bcff 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -59,27 +59,13 @@
#include <arpa/telnet.h>
#include <sys/types.h>
#include <sys/socket.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <sys/time.h>
+#include <time.h>
#include <ctype.h>
#include "general.h"
-
-#include "fdset.h"
-
#include "ring.h"
-
#include "defines.h"
-
#include "externs.h"
FILE *NetTrace = 0; /* Not in bss, since needs to stay */
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=03f28a3500bfe9e6bb282929600105379aa2eb92
commit 03f28a3500bfe9e6bb282929600105379aa2eb92
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:08:09 2010 +0200
Silence makefile_at_at_check_exceptions from `make syntax-check'.
diff --git a/ChangeLog b/ChangeLog
index f6b31be..7589d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ Silence makefile_at_at_check_exceptions from `make syntax-check'.
+
+ * telnetd/Makefile.am (INCLUDES, LDADD): Use $() variables, instead of
@@.
+ (LIBTERMCAP, LIBCRYPT, LIBUTIL): Removed variables.
+ * telnet/Makefile.am (noinst_HEADERS): Removed fdset.h from list.
+ (LIBTERMCAP, LIBCRYPT): Removed variables.
+ * src/Makefile.am (LDADD): Use $() variables, instead of @@.
+ * libtelnet/Makefile.am (INCLUDES): Use $() variables, instead of @@.
+ * ftpd/Makefile.am (LIBCRYPT, LIBWRAP, LIBPAM, LIBLS): Variables
removed.
+ * ftp/Makefile.am (READLINE): Use $() variables, instead of @@.
+ * cfg.mk (_makefile_at_at_check_exceptions): New variable.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
* libicmp/.gitignore: Removed file.
2010-05-14 Alfred M. Szmidt <address@hidden>
diff --git a/cfg.mk b/cfg.mk
index ffc7fdc..3c7e146 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -18,6 +18,8 @@
news-check-regexp = '^Version $(VERSION_REGEXP):'
+_makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
+
local-checks-to-skip = \
sc_error_message_period \
sc_error_message_uppercase \
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index 066f824..9693eed 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -30,5 +30,5 @@ noinst_HEADERS = extern.h ftp_var.h
INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
AM_CPPFLAGS = $(PATHDEF_TMP) $(PATHDEF_BSHELL)
address@hidden@ @LIBTERMCAP@ @LIBHISTORY@
+READLINE = $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBGLOB) $(READLINE)
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index cd82c32..861fe61 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -35,11 +35,6 @@ AM_CPPFLAGS = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
$(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
$(PATHDEF_DEVNULL) $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL)
-LIBCRYPT = @LIBCRYPT@
-LIBWRAP = @LIBWRAP@
-LIBPAM = @LIBPAM@
-LIBLS = @LIBLS@
-
LDADD = -L../libinetutils -linetutils $(LIBLS) ../lib/libgnu.a \
$(LIBCRYPT) $(LIBWRAP) $(LIBPAM)
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index 45135c2..0b0c6f1 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
-INCLUDES = @INCAUTH@
+INCLUDES = $(INCAUTH)
noinst_LIBRARIES = libtelnet.a
diff --git a/src/Makefile.am b/src/Makefile.am
index df53858..e19a0ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,7 @@ INCLUDES = -I$(top_srcdir)/lib \
LDADD = -L$(top_builddir)/libicmp -licmp \
-L$(top_builddir)/libinetutils -linetutils \
-L$(top_builddir)/lib ../lib/libgnu.a \
- @LIBAUTH@ @LIBCRYPT@ @LIBUTIL@
+ $(LIBAUTH) $(LIBCRYPT) $(LIBUTIL)
AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP)
$(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR)
$(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF)
$(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN)
$(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UUCICO)
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 7a3204b..1ea413c 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -24,13 +24,10 @@ EXTRA_PROGRAMS = telnet
telnet_SOURCES = authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c
-noinst_HEADERS = defines.h externs.h fdset.h general.h ring.h types.h
+noinst_HEADERS = defines.h externs.h general.h ring.h types.h
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I../lib
-I$(top_srcdir)/libinetutils
AM_CPPFLAGS=-DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
-LIBTERMCAP = @LIBTERMCAP@
-LIBCRYPT = @LIBCRYPT@
-
LDADD = -L../libinetutils -L../libtelnet -linetutils \
-ltelnet ../lib/libgnu.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH)
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 9b9aa77..81704fa 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -29,14 +29,10 @@ noinst_HEADERS = telnetd.h
@PATHDEFS_MAKE@
AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I../lib
-I$(top_srcdir)/libinetutils\
- @INCAUTH@
-
-LIBTERMCAP = @LIBTERMCAP@
-LIBCRYPT = @LIBCRYPT@
-LIBUTIL = @LIBUTIL@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I../lib \
+ -I$(top_srcdir)/libinetutils $(INCAUTH)
LDADD = -L../libinetutils -linetutils \
-L../libtelnet -ltelnet \
../lib/libgnu.a \
- $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) @LIBAUTH@
+ $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=7d5c19f4b6da699663d63f8602c55260bc6af2f9
commit 7d5c19f4b6da699663d63f8602c55260bc6af2f9
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:03:55 2010 +0200
libicmp/.gitignore: Removed file.
diff --git a/ChangeLog b/ChangeLog
index 4bc8f18..f6b31be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * libicmp/.gitignore: Removed file.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
* doc/inetutils.texi: Removed all occurances of @acronym.
(ftp invocation): Document --passive and --active options.
diff --git a/ifconfig/.gitignore b/ifconfig/.gitignore
index e2af53a..f590c4c 100644
--- a/ifconfig/.gitignore
+++ b/ifconfig/.gitignore
@@ -1,2 +1 @@
ifconfig
-
diff --git a/libicmp/.gitignore b/libicmp/.gitignore
deleted file mode 100644
index 5d3c536..0000000
--- a/libicmp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libicmp.a
diff --git a/talkd/.gitignore b/talkd/.gitignore
index c743432..c131e37 100644
--- a/talkd/.gitignore
+++ b/talkd/.gitignore
@@ -1,2 +1 @@
talkd
-
diff --git a/telnetd/.gitignore b/telnetd/.gitignore
index dca167d..fe6f7f5 100644
--- a/telnetd/.gitignore
+++ b/telnetd/.gitignore
@@ -1,2 +1 @@
telnetd
-
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=7a2c1ae913fdd863dfd2f7d3a1fc4a33e039db0a
commit 7a2c1ae913fdd863dfd2f7d3a1fc4a33e039db0a
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 21:02:01 2010 +0200
doc/inetutils.texi: Removed all occurances of @acronym, document new
options for ftp.
diff --git a/ChangeLog b/ChangeLog
index 8a3dd85..4bc8f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * doc/inetutils.texi: Removed all occurances of @acronym.
+ (ftp invocation): Document --passive and --active options.
+
* doc/.gitignore (Makefile, Makefile.in): Removed rules.
2010-05-14 Alfred M. Szmidt <address@hidden>
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 2cea35f..bf3537c 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -10,7 +10,8 @@
@defcodeindex op
@defcodeindex fl
address@hidden Put everything in one index (arbitrarily chosen to be the
concept index).
address@hidden Put everything in one index (arbitrarily chosen to be the concept
address@hidden index).
@syncodeindex fl cp
@syncodeindex fn cp
@syncodeindex ky cp
@@ -54,11 +55,10 @@
@end direntry
@copying
-This manual documents version @value{VERSION} of the @sc{gnu}
-networking utilities.
+This manual documents version @value{VERSION} of the @sc{gnu} networking
+utilities.
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
2009, 2010 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -211,15 +211,14 @@ Nearly every command invocation yields an integral
@dfn{exit status}
that can be used to change how other commands work. For the vast
majority of commands, an exit status of zero indicates success.
Failure is indicated by a nonzero value---typically @samp{1}, though
-it may differ on unusual platforms as @acronym{POSIX} requires only
-that it be nonzero.
+it may differ on unusual platforms as POSIX requires only that it be
+nonzero.
@node hostname invocation
@chapter @command{hostname}: Show or set system host name.
@cindex hostname
address@hidden is a program to show or set the name of host
-system.
address@hidden is a program to show or set the name of host system.
@example
hostname address@hidden@dots{}] address@hidden
@@ -277,8 +276,8 @@ Get NIS/YP domain name.
@chapter @command{logger}: Send messages to system log
@cindex logger
address@hidden is a program to send entries to system log.
-It provides a shell command interface similar to the system log module.
address@hidden is a program to send entries to system log. It
+provides a shell command interface similar to the system log module.
@xref{Syslog, , Syslog, libc, The GNU C Library Reference Manual}, for
details.
@@ -291,8 +290,8 @@ logger address@hidden@dots{}] address@hidden
@itemx address@hidden
@opindex -i
@opindex --id
-Add process ID to each message. If @var{pid} is not supplied, use
-the process ID of the logger process with each line. Notice, that
+Add process ID to each message. If @var{pid} is not supplied, use the
+process ID of the logger process with each line. Notice, that
@var{pid} is an optional argument. When supplied to the @option{-i}
option, it must follow the @samp{i} letter immediately, without any
separating whitespace. When supplied to the @option{--id} form, it
@@ -303,8 +302,8 @@ must be separated from it by exactly one equals sign.
@opindex -h
@opindex --host
Send messages to the given host or socket. The @var{host} argument
-can be either a local @acronym{UNIX} socket name (always
-starting with a @samp{/} or:
+can be either a local UNIX socket name (always starting with a
address@hidden/} or:
@smallexample
@var{host}[:@var{port}]
@@ -321,8 +320,8 @@ is used.
@itemx address@hidden
@opindex -S
@opindex --source
-Supply the source IP address for @acronym{INET} connections. This
-option is useful in conjunction with @option{--host} (see above).
+Supply the source IP address for INET connections. This option is
+useful in conjunction with @option{--host} (see above).
@item -s
@itemx --stderr
@@ -385,7 +384,8 @@ channel on host @samp{logger.runasimi.org}, using the
source IP
@samp{10.10.10.1}:
@example
-logger -p daemon.warn -h logger.runasimi.org -S 10.10.10.1 --file warnings
+logger -p daemon.warn -h logger.runasimi.org -S 10.10.10.1 --file
+warnings
@end example
@end enumerate
@@ -397,11 +397,10 @@ logger -p daemon.warn -h logger.runasimi.org -S
10.10.10.1 --file warnings
@c of ping. A user doesn't need to know that we are using TIMEVAL, or
@c how things are padded.
address@hidden uses the @acronym{ICMP} protocol's mandatory
address@hidden datagram to elicit an @acronym{ICMP}
address@hidden from a host or gateway. @code{ECHO_REQUEST}
-datagrams (@dfn{pings}) have an @acronym{IP} and @acronym{ICMP}
-header, followed by a @dfn{struct timeval} and then an arbitrary
address@hidden uses the ICMP protocol's mandatory @code{ECHO_REQUEST}
+datagram to elicit an ICMP @code{ECHO_RESPONSE} from a host or
+gateway. @code{ECHO_REQUEST} datagrams (@dfn{pings}) have an IP and
+ICMP header, followed by a @dfn{struct timeval} and then an arbitrary
number of @dfn{pad} bytes used to fill out the packet. Synopsis:
@example
@@ -470,7 +469,7 @@ for host addresses.
@item -r
@itemx --ignore-routing
@opindex -r
address@hidden --nignore-routingo-klog
address@hidden --ignore-routing-log
Bypass the normal routing tables and send directly to a host on an
attached network. If the host is not on a directly-attached network,
an error is returned. This option can be used to ping a local host
@@ -519,16 +518,16 @@ with all ones.
@opindex --route
Record route. Includes the @code{RECORD_ROUTE} field in the
ECHO_REQUEST packet and displays the route buffer on returned packets.
-Note that the @acronym{IP} header is only large enough for nine such
-routes. Many hosts ignore or discard this option.
+Note that the IP header is only large enough for nine such routes.
+Many hosts ignore or discard this option.
@item -s @var{n}
@itemx address@hidden
@opindex -s
@opindex --size
Specifies the number of data bytes to be sent. The default is 56,
-which translates into 64 @acronym{ICMP} data bytes when combined with
-the 8 bytes of ICMP header data.
+which translates into 64 ICMP data bytes when combined with the 8
+bytes of ICMP header data.
@item -w @var{n}
@itemx address@hidden
@@ -555,15 +554,14 @@ management. Because of the load it can impose on the
network, it is
unwise to use ping during normal operations or from automated scripts.
@ignore
address@hidden @acronym{ICMP} Packet Details
-
-An @acronym{IP} header without options is 20 bytes. An @acronym{ICMP}
-ECHO_REQUEST packet contains an additional 8 bytes worth of
address@hidden header followed by an arbitrary amount of data. When a
-packetsize is given, this indicated the size of this extra piece of
-data (the default is 56). Thus the amount of data received inside of
-an @acronym{IP} packet of type @acronym{ICMP} ECHO_REPLY will always
-be 8 bytes more than the requested data space (the @acronym{ICMP}
address@hidden ICMP Packet Details
+
+An IP header without options is 20 bytes. An ICMP ECHO_REQUEST packet
+contains an additional 8 bytes worth of ICMP header followed by an
+arbitrary amount of data. When a packetsize is given, this indicated
+the size of this extra piece of data (the default is 56). Thus the
+amount of data received inside of an IP packet of type ICMP ECHO_REPLY
+will always be 8 bytes more than the requested data space (the ICMP
header).
If the data space is at least eight bytes large, ping uses the first
@@ -605,52 +603,48 @@ that takes much longer to transfer than other similar
length files.
You can then examine this file for repeated patterns that you can test
using the @option{-p} option of ping.
address@hidden @acronym{TTL} Details
address@hidden TTL Details
-The @acronym{TTL, Time To Live} value of an @acronym{IP} packet
-represents the maximum number of @acronym{IP} routers that the packet
-can go through before being thrown away. In current practice you can
-expect each router in the Internet to decrement the @acronym{TTL}
-field by exactly one.
+The TTL, Time To Live value of an IP packet represents the maximum
+number of IP routers that the packet can go through before being
+thrown away. In current practice you can expect each router in the
+Internet to decrement the TTL field by exactly one.
-The @acronym{TCP/IP} specification states that the @acronym{TTL} field
-for @acronym{TCP} packets should be set to 60, but many systems use
-smaller values (4.3 BSD uses 30, 4.2 used 15).
+The TCP/IP specification states that the TTL field for TCP packets
+should be set to 60, but many systems use smaller values (4.3 BSD uses
+30, 4.2 used 15).
-The maximum possible value of this field is 255, and most
address@hidden systems set the @acronym{TTL} field of ICMP
-(@code{ECHO_REQUEST}) packets to 255. This is why you will find you
-can ping some hosts, but not reach them with @command{telnet} or
address@hidden
+The maximum possible value of this field is 255, and most UNIX systems
+set the TTL field of ICMP (@code{ECHO_REQUEST}) packets to 255. This
+is why you will find you can ping some hosts, but not reach them with
address@hidden or @command{ftp}.
-In normal operation @command{ping} prints the @acronym{TTL} value from
-the packet it receives. When a remote system receives a
address@hidden packet, it can do one of three things with the
address@hidden field in its response:
+In normal operation @command{ping} prints the TTL value from the
+packet it receives. When a remote system receives a ICMP packet, it
+can do one of three things with the TTL field in its response:
@table @bullet
@item
-Not change it; this is what Berkeley @acronym{UNIX} systems did before
-the 4.3BSD-Tahoe release. In this case the @acronym{TTL} value in the
-received packet will be 255 minus the number of routers in the
-round-trip path.
+Not change it; this is what Berkeley UNIX systems did before the
+4.3BSD-Tahoe release. In this case the TTL value in the received
+packet will be 255 minus the number of routers in the round-trip path.
@item
-Set it to 255; this is what current Berkeley @acronym{UNIX} systems
-do. In this case the @code{TTL} value in the received packet will be
-255 minus the number of routers in the path from the remote system to
-the pinging host.
+Set it to 255; this is what current Berkeley UNIX systems do. In this
+case the @code{TTL} value in the received packet will be 255 minus the
+number of routers in the path from the remote system to the pinging
+host.
@item
-Set it to some other value. Some machines use the same value for
address@hidden packets that they use for @acronym{TCP} packets, for
-example either 30 or 60. Others may use completely wild values.
+Set it to some other value. Some machines use the same value for ICMP
+packets that they use for TCP packets, for example either 30 or 60.
+Others may use completely wild values.
@end table
Many hosts and gateways ignore the @code{RECORD_ROUTE} field, since
-the maximum @acronym{IP} header length is far to small to hold all the
-routes. There's not much that can be done about this.
+the maximum IP header length is far to small to hold all the routes.
+There's not much that can be done about this.
Flood pinging is not recommended in general, and flood pinging the
broadcast address should only be done under very controlled
@@ -718,7 +712,7 @@ Connect to server HOST.
Hide legal disclaimers.
@item -i ATTR[,ATTR]...
-Do an inverse lookup for specified ATTRibutes.
+Do an inverse lookup for specified attributes.
@item -l
One level less specific lookup (RPSL only).
@@ -768,15 +762,27 @@ Exact match only (RPSL only).
@chapter @command{ftp}: FTP client
@cindex ftp
address@hidden is the user interface for @acronym{FTP, File Transfer
-Protocol}. The program allows a user to transfer files to and from a
-remote network site. Synopsis:
address@hidden is the user interface for FTP, File Transfer Protocol.
+The program allows a user to transfer files to and from a remote
+network site. Synopsis:
@example
ftp address@hidden@dots{}] address@hidden address@hidden
@end example
@table @option
address@hidden -A
address@hidden --acctive
address@hidden -A
address@hidden --active
+Enable active mode transfer.
+
address@hidden -p
address@hidden --passive
address@hidden -p
address@hidden --passive
+Enable passive mode transfer.
+
@item -d
@itemx --debug
@opindex -d
@@ -808,16 +814,11 @@ login name (default is the user identity on the local
machine), and,
if necessary, prompt for a password and an account with which to
login.
address@hidden address@hidden
@itemx address@hidden
address@hidden -p
@opindex --prompt
Print a command-line prompt, even if not on a tty. If @var{prompt} is
supplied, its value is used instead of the default @samp{ftp> }.
-Notice, that the argument is optional. When specified, if short
-option form is used (@option{-p}) the argument should follow the
-option letter immediately, @emph{without any intervening white space
-characters}.
+Notice, that the argument is optional.
@item -t
@item --trace
@@ -839,11 +840,11 @@ Enable packet tracing.
The client host with which @command{ftp} is to communicate may be
specified on the command line. If this is done, @command{ftp} will
-immediately attempt to establish a connection to an @acronym{FTP}
-server on that host; otherwise, it will enter its command interpreter
-and await instructions from the user. When @command{ftp} is awaiting
-commands from the user the prompt @samp{ftp>} is provided to the user.
-The following commands are recognized by @command{ftp}:
+immediately attempt to establish a connection to an FTP server on that
+host; otherwise, it will enter its command interpreter and await
+instructions from the user. When @command{ftp} is awaiting commands
+from the user the prompt @samp{ftp>} is provided to the user. The
+following commands are recognized by @command{ftp}:
@table @code
@item ! address@hidden address@hidden
@@ -869,8 +870,8 @@ naming the remote file after being altered by any
@code{ntrans} or
type, format, mode, and structure.
@item ascii
-Set the file transfer type to network @acronym{ASCII}. This is the
-default type.
+Set the file transfer type to network ASCII. This is the default
+type.
@item bell
Arrange that a bell be sounded after each file transfer command is
@@ -881,7 +882,7 @@ Set the file transfer type to support binary image transfer.
@item bye
@itemx quit
-Terminate the @acronym{FTP} session with the remote server and exit
+Terminate the FTP session with the remote server and exit
@command{ftp}. An end of file will also terminate the session and
exit.
@@ -905,18 +906,18 @@ sytem to @var{mode}.
@item close
@itemx disconnect
-Terminate the @acronym{FTP} session with the remote server, and return
-to the command interpreter. Any defined macros are erased.
+Terminate the FTP session with the remote server, and return to the
+command interpreter. Any defined macros are erased.
@item cr
-Toggle carriage return stripping during @acronym{ASCII} type file
-retrieval. Records are denoted by a carriage return/linefeed sequence
-during @acronym{ASCII} type file transfer. When @code{cr} is on (the
-default), carriage returns are stripped from this sequence to conform
-with the @acronym{UNIX} single linefeed record delimiter. Records on
address@hidden remote systems may contain single linefeeds; when
-an @acronym{ASCII} type transfer is made, these linefeeds may be
-distinguished from a record delimiter only when cr is off.
+Toggle carriage return stripping during ASCII type file retrieval.
+Records are denoted by a carriage return/linefeed sequence during
+ASCII type file transfer. When @code{cr} is on (the default),
+carriage returns are stripped from this sequence to conform with the
+UNIX single linefeed record delimiter. Records on non-UNIX remote
+systems may contain single linefeeds; when an ASCII type transfer is
+made, these linefeeds may be distinguished from a record delimiter
+only when cr is off.
@item delete @var{remote-file}
Delete the file @var{remote-file} on the remote machine.
@@ -961,8 +962,8 @@ name arguments are taken literally and not expanded.
Globbing for
remote machine and the lists are not merged. Expansion of a directory
name is likely to be different from expansion of the name of an
ordinary file: the exact result depends on the foreign operating
-system and @acronym{FTP} server, and can be previewed by doing
address@hidden remote-files -}.
+system and FTP server, and can be previewed by doing @code{mls
+remote-files -}.
Note: @code{mget} and @code{mput} are not meant to transfer entire
directory subtrees of files. That can be done by transferring a
@@ -984,19 +985,19 @@ seconds. If seconds is omitted, the current inactivity
timer is
printed.
@item lcd address@hidden
-Change the working directory on the local machine. If no directory is
+Change the working directory on the local machine. If no directory is
specified, the user's home directory is used.
@item ls address@hidden address@hidden
Print a listing of the contents of a directory on the remote machine.
The listing includes any system-dependent information that the server
-chooses to include; for example, most @acronym{UNIX} systems will
-produce output from the command @command{ls -l}. If @var{remote}-directory is
left unspecified, the
-current working directory is used. If interactive prompting is on,
address@hidden will prompt the user to verify that the last argument is
-indeed the target local file for receiving ls output. If no local
-file is specified, or if @var{local-file} is @samp{-}, the output is
-sent to the terminal.
+chooses to include; for example, most UNIX systems will produce output
+from the command @command{ls -l}. If @var{remote}-directory is left
+unspecified, the current working directory is used. If interactive
+prompting is on, @command{ftp} will prompt the user to verify that the
+last argument is indeed the target local file for receiving ls output.
+If no local file is specified, or if @var{local-file} is @samp{-}, the
+output is sent to the terminal.
@item macdef @var{macro-name}
Define a macro called @var{macro-name}, with subsequent lines as the
@@ -1077,8 +1078,8 @@ specified, remote filenames are mapped during @code{mput}
commands and
If arguments are specified, local filenames are mapped during
@code{mget} commands and @code{get} commands issued without a
specified local target filename. This command is useful when
-connecting to a address@hidden remote computer with different file
-naming conventions or practices.
+connecting to a non-UNIX remote computer with different file naming
+conventions or practices.
The mapping follows the pattern set by @var{inpattern} and
@var{outpattern}. The template @var{inpattern} is used for incoming
@@ -1094,12 +1095,12 @@ For example, given inpattern @samp{$1.$2} and the
remote file name
@file{mydata.data}, @samp{$1} would have the value @samp{mydata}, and
@samp{$2} would have the value @samp{data}. The @var{outpattern}
determines the resulting mapped filename. The sequences @samp{$1},
address@hidden, @dots{}., @samp{$9} are replaced by any value resulting from
-the @var{inpattern} template. The sequence @samp{$0} is replaced by
-the original filename. Additionally, the sequence @address@hidden,
address@hidden is replaced by @var{seq1} if @var{seq1} is not a null
-string; otherwise it is replaced by @var{seq2}. For example, the
-command
address@hidden, @dots{}., @samp{$9} are replaced by any value resulting
+from the @var{inpattern} template. The sequence @samp{$0} is replaced
+by the original filename. Additionally, the sequence
address@hidden@var{seq1}, @var{seq2}]} is replaced by @var{seq1} if
address@hidden is not a null string; otherwise it is replaced by
address@hidden For example, the command
@example
nmap $1.$2.$3 [$1,$2].[$2,file]
@@ -1124,8 +1125,8 @@ issued without a specified remote target filename. If
arguments are
specified, characters in local filenames are translated during
@code{mget} commands and @code{get} commands issued without a
specified local target filename. This command is useful when
-connecting to a address@hidden remote computer with different file
-naming conventions or practices.
+connecting to a non-UNIX remote computer with different file naming
+conventions or practices.
Characters in a filename matching a character in @var{inchars} are
replaced with the corresponding character in @var{outchars}. If the
@@ -1133,11 +1134,11 @@ character's position in @var{inchars} is longer than
the length of
@var{outchars}, the character is deleted from the file name.
@item open @var{host} address@hidden
-Establish a connection to the specified host @acronym{FTP} server. An
-optional port number may be supplied, in which case, @command{ftp}
-will attempt to contact an @acronym{FTP} server at that port. If the
address@hidden option is on (default), @command{ftp} will also
-attempt to automatically log the user in to the @acronym{FTP} server.
+Establish a connection to the specified host FTP server. An optional
+port number may be supplied, in which case, @command{ftp} will attempt
+to contact an FTP server at that port. If the @code{autologin} option
+is on (default), @command{ftp} will also attempt to automatically log
+the user in to the FTP server.
@item passive
Toggle passive mode. If passive mode is turned on (default is off),
@@ -1162,10 +1163,10 @@ store files. If prompting is turned off (default is
on), any
@item proxy @var{ftp-command}
Execute an @command{ftp} command on a secondary control connection.
-This command allows simultaneous connection to two remote
address@hidden servers for transferring files between the two servers.
-The first proxy command should be an open, to establish the secondary
-control connection. Enter the command @code{proxy ?} to see other ftp
+This command allows simultaneous connection to two remote FTP servers
+for transferring files between the two servers. The first proxy
+command should be an open, to establish the secondary control
+connection. Enter the command @code{proxy ?} to see other ftp
commands executable on the secondary connection. The following
commands behave differently when prefaced by @code{proxy}: @code{open}
will not define new macros during the auto-login process, @code{close}
@@ -1174,9 +1175,8 @@ transfer files from the host on the primary control
connection to the
host on the secondary control connection, and @code{put}, @code{mput},
and @code{append} transfer files from the host on the secondary
control connection to the host on the primary control connection.
-Third party file transfers depend upon support of the @acronym{FTP}
-protocol @code{PASV} command by the server on the secondary control
-connection.
+Third party file transfers depend upon support of the FTP protocol
address@hidden command by the server on the secondary control connection.
@item put @var{local-file} address@hidden
@itemx send @var{local-file} address@hidden
@@ -1201,8 +1201,8 @@ command is useful when transferring very large files over
networks
that are prone to dropping connections.
@item remotehelp address@hidden
-Request help from the remote @acronym{FTP} server. If a command-name
-is specified it is supplied to the server as well.
+Request help from the remote FTP server. If a command-name is
+specified it is supplied to the server as well.
@item remotestatus address@hidden
With no arguments, show status of remote machine. If filename is
@@ -1212,15 +1212,15 @@ specified, show status of @var{file-name} on remote
machine.
Rename the file from on the remote machine, to the file to.
@item reset
-Clear reply queue. This command re-synchronizes command/reply
-sequencing with the remote @acronym{FTP} server. Resynchronization
-may be necessary following a violation of the @acronym{FTP} protocol
-by the remote server.
+Clear reply queue. This command re-synchronizes command/reply
+sequencing with the remote FTP server. Resynchronization may be
+necessary following a violation of the FTP protocol by the remote
+server.
@item restart @var{marker}
Restart the immediately following @code{get} or @code{put} at the
-indicated marker. On @acronym{UNIX} systems, marker is usually a byte
-offset into the file.
+indicated marker. On UNIX systems, marker is usually a byte offset
+into the file.
@item rmdir @var{directory-name}
Delete a directory on the remote machine.
@@ -1244,12 +1244,12 @@ can prevent delays when performing multiple file
transfers. If the
@code{PORT} command fails, @command{ftp} will use the default data
port. When the use of @code{PORT} commands is disabled, no attempt
will be made to use @code{PORT} commands for each data transfer. This
-is useful for certain @acronym{FTP} implementations which do ignore
address@hidden commands but, incorrectly, indicate they've been accepted.
+is useful for certain FTP implementations which do ignore @code{PORT}
+commands but, incorrectly, indicate they've been accepted.
@item site @address@hidden
-The arguments specified are sent, verbatim, to the remote
address@hidden server as a @code{SITE} command.
+The arguments specified are sent, verbatim, to the remote FTP server
+as a @code{SITE} command.
@item size @var{file-name}
Return size of @var{file-name} on remote machine.
@@ -1263,16 +1263,15 @@ Set the file transfer structure to @var{struct-name}.
By default
@item sunique
Toggle storing of files on remote machine under unique file names.
-Remote @acronym{FTP} server must support @acronym{FTP} protocol
address@hidden command for successful completion. The remote server will
-report unique name. Default value is off.
+Remote FTP server must support FTP protocol @code{STOU} command for
+successful completion. The remote server will report unique name.
+Default value is off.
@item system
Show the type of operating system running on the remote machine.
@item tenex
-Set the file transfer type to that needed to talk to @acronym{TENEX}
-machines.
+Set the file transfer type to that needed to talk to TENEX machines.
@item trace
Toggle packet tracing.
@@ -1280,30 +1279,28 @@ Toggle packet tracing.
@item type address@hidden
Set the file transfer type to @var{type-name}. If no type is
specified, the current type is printed. The default type is network
address@hidden
+ASCII.
@item umask address@hidden
Set the default umask on the remote server to @var{newmask}. If
@var{newmask} is omitted, the current umask is printed.
@item user @var{user-name} address@hidden address@hidden
-Identify yourself to the remote @acronym{FTP} server. If the password
-is not specified and the server requires it, @command{ftp} will prompt
-the user for it (after disabling local echo). If an account field is
-not specified, and the @acronym{FTP} server requires it, the user will
-be prompted for it. If an account field is specified, an account
-command will be relayed to the remote server after the login sequence
-is completed if the remote server did not require it for logging in.
-Unless @command{ftp} is invoked with @code{auto-login} disabled, this
-process is done automatically on initial connection to the
address@hidden server.
+Identify yourself to the remote FTP server. If the password is not
+specified and the server requires it, @command{ftp} will prompt the
+user for it (after disabling local echo). If an account field is not
+specified, and the FTP server requires it, the user will be prompted
+for it. If an account field is specified, an account command will be
+relayed to the remote server after the login sequence is completed if
+the remote server did not require it for logging in. Unless
address@hidden is invoked with @code{auto-login} disabled, this process
+is done automatically on initial connection to the FTP server.
@item verbose
-Toggle verbose mode. In verbose mode, all responses from the
address@hidden server are displayed to the user. In addition, if
-verbose is on, when a file transfer completes, statistics regarding
-the efficiency of the transfer are reported. By default, verbose is
-on.
+Toggle verbose mode. In verbose mode, all responses from the FTP
+server are displayed to the user. In addition, if verbose is on, when
+a file transfer completes, statistics regarding the efficiency of the
+transfer are reported. By default, verbose is on.
@end table
Command arguments which have embedded spaces may be quoted with quote
@@ -1314,20 +1311,19 @@ Command arguments which have embedded spaces may be
quoted with quote
To abort a file transfer, use the terminal interrupt key (usually
@kbd{C-c}). Sending transfers will be immediately halted. Receiving
-transfers will be halted by sending a @acronym{FTP} protocol
address@hidden command to the remote server, and discarding any
-further data received. The speed at which this is accomplished
-depends upon the remote server's support for @code{ABOR} processing.
-If the remote server does not support the @code{ABOR} command, an
address@hidden>} prompt will not appear until the remote server has
-completed sending the requested file.
+transfers will be halted by sending a FTP protocol ABOR command to the
+remote server, and discarding any further data received. The speed at
+which this is accomplished depends upon the remote server's support
+for @code{ABOR} processing. If the remote server does not support the
address@hidden command, an @samp{ftp>} prompt will not appear until the
+remote server has completed sending the requested file.
The terminal interrupt key sequence will be ignored when @command{ftp}
has completed any local processing and is awaiting a reply from the
remote server. A long delay in this mode may result from the
@code{ABOR} processing described above, or from unexpected behavior by
-the remote server, including violations of the @acronym{FTP} protocol.
-If the delay results from unexpected remote server behavior, the local
+the remote server, including violations of the FTP protocol. If the
+delay results from unexpected remote server behavior, the local
@command{ftp} program must be killed by hand.
@node File Naming Conventions
@@ -1351,10 +1347,10 @@ A particularly useful example of this mechanism is
@samp{dir more}.
@item
Failing the above checks, if @dfn{globbing} is enabled, local file
-names are expanded according to the rules used in the @command{csh}; c.f.
-the @code{glob} command. If the @command{ftp} command
-expects a single local file (e.g. @code{put}), only the first
-filename generated by the globbing operation is used.
+names are expanded according to the rules used in the @command{csh};
+c.f. the @code{glob} command. If the @command{ftp} command expects a
+single local file (e.g. @code{put}), only the first filename
+generated by the globbing operation is used.
@item
For @code{mget} commands and @code{get} commands with unspecified
@@ -1373,12 +1369,12 @@ resulting filename may then be altered by the remote
server if
@node File Transfer Parameters
@section File Transfer Parameters
-The @acronym{FTP} specification specifies many parameters which may
-affect a file transfer. The type may be one of @samp{ascii},
address@hidden (binary), @samp{ebcdic}, and @samp{local} byte size (for
-PDP-10's and PDP-20's mostly). @command{ftp} supports the
address@hidden and @samp{image} types of file transfer, plus local byte
-size 8 for tenex mode transfers.
+The FTP specification specifies many parameters which may affect a
+file transfer. The type may be one of @samp{ascii}, @samp{image}
+(binary), @samp{ebcdic}, and @samp{local} byte size (for PDP-10's and
+PDP-20's mostly). @command{ftp} supports the @samp{ascii} and
address@hidden types of file transfer, plus local byte size 8 for tenex
+mode transfers.
@command{ftp} supports only the default values for the remaining file
transfer parameters: @code{mode}, @code{form}, and @code{struct}.
@@ -1392,7 +1388,6 @@ directory. The following tokens are recognized; they may
be separated
by spaces, tabs, or new-lines:
@table @samp
-
@item machine name
Identify a remote machine name. The auto-login process searches the
@file{.netrc} file for a machine token that matches the remote machine
@@ -1463,9 +1458,9 @@ the ascii type. Avoid this problem by using the binary
image type.
@chapter @command{tftp}: TFTP client
@cindex tftp
address@hidden is the user interface to the Internet @acronym{TFTP,
-Trivial File Transfer Protocol}, which allows users to transfer files
-to and from a remote machine. The remote host may be specified on the
address@hidden is the user interface to the Internet TFTP, Trivial
+File Transfer Protocol, which allows users to transfer files to and
+from a remote machine. The remote host may be specified on the
command line, in which case @command{tftp} uses host as the default
host for future transfers.
@@ -1489,12 +1484,12 @@ Shorthand for @code{mode ascii}
Shorthand for @code{mode binary}
@item connect @var{host-name} address@hidden
-Set the host (and optionally port) for transfers. Note that the
address@hidden protocol, unlike the @acronym{FTP} protocol, does not
-maintain connections between transfers; thus, the connect command does
-not actually create a connection, but merely remembers what host is to
-be used for transfers. You do not have to use the connect command;
-the remote host can be specified as part of the get or put commands.
+Set the host (and optionally port) for transfers. Note that the TFTP
+protocol, unlike the FTP protocol, does not maintain connections
+between transfers; thus, the connect command does not actually create
+a connection, but merely remembers what host is to be used for
+transfers. You do not have to use the connect command; the remote
+host can be specified as part of the get or put commands.
@item get @var{file-name}
@itemx get @var{remotename} @var{localname}
@@ -1519,7 +1514,7 @@ host, if the host has already been specified, or a string
of the form
@samp{hosts:filename} to specify both a host and filename at the same
time. If the latter form is used, the hostname specified becomes the
default for future transfers. If the @file{remote-directory} form is
-used, the remote host is assumed to be a @acronym{UNIX} machine.
+used, the remote host is assumed to be a UNIX machine.
@item quit
Exit @command{tftp}. An end of file also exits.
@@ -1560,7 +1555,6 @@ When using the @command{rsh} command, you can create a
link to your
path using a host name as the link name. For example:
@example
-#
# ln -s /usr/bin/rsh @var{hostname}
# @var{hostname} ls
@end example
@@ -1599,9 +1593,9 @@ The option requests rsh to obtain tickets for the remote
host in
@itemx --encrypt
@opindex -x
@opindex --encrypt
-Turns on @acronym{DES} encryption for all data passed via the rsh
-session. This may impact response time and @acronym{CPU} utilization,
-but provides increased security.
+Turns on DES encryption for all data passed via the rsh session. This
+may impact response time and CPU utilization, but provides increased
+security.
@item -l
@itemx --user
@@ -1690,8 +1684,8 @@ Turns off all Kerberos authentication.
@itemx --debug
@opindex -d
@opindex --debug
-Turns on socket debugging on the @acronym{TCP} sockets used for
-communication with the remote host.
+Turns on socket debugging on the TCP sockets used for communication
+with the remote host.
@item -e
@itemx address@hidden
@@ -1712,10 +1706,9 @@ The option requests rlogin to obtain tickets for the
remote host in
@itemx --encrypt
@opindex -x
@opindex --encrypt
-Turns on @acronym{DES} encryption for all data passed via the rlogin
-session. This may impact response time and @acronym{CPU} utilization,
-but provides increased security.
-
+Turns on DES encryption for all data passed via the rlogin session.
+This may impact response time and CPU utilization, but provides
+increased security.
@end table
A line of the form @address@hidden disconnects from the
@@ -1803,9 +1796,9 @@ directory.
@itemx --encrypt
@opindex -x
@opindex --encrypt
-Turns on @acronym{DES} encryption for all data passed via the rcp
-session. This may impact response time and @acronym{CPU} utilization,
-but provides increased security.
+Turns on DES encryption for all data passed via the rcp session. This
+may impact response time and CPU utilization, but provides increased
+security.
@end table
@@ -2324,7 +2317,7 @@ The user or group ID for the entry's user is invalid.
@cindex syslogd
@command{syslogd} is a system service that provides error logging
-facility. Messages are read from the @acronym{UNIX} domain socket
+facility. Messages are read from the UNIX domain socket
@file{/dev/log}, from an Internet domain socket specified in
@file{/etc/services}, and from the special device @file{/dev/klog} (to
read kernel messages).
@@ -2370,11 +2363,10 @@ Print debug information (implies @option{-n}).
@item address@hidden
@opindex -p
@opindex --socket
-Override default @acronym{UNIX} domain socket @file{/dev/log}.
+Override default UNIX domain socket @file{/dev/log}.
@item -a @var{socket}
-Add @acronym{UNIX} socket to listen. An unlimited number of sockets
-is allowed.
+Add UNIX socket to listen. An unlimited number of sockets is allowed.
@item -r
@itemx --inet
@@ -2384,8 +2376,8 @@ Receive remote messages via Internet domain socket.
@item --no-unixaf
@opindex --no-unixaf
-Do not listen on @acronym{UNIX} domain sockets (overrides @option{-a}
-and @option{-p}).
+Do not listen on UNIX domain sockets (overrides @option{-a} and
address@hidden).
@item --no-klog
@opindex --no-klog
@@ -2414,8 +2406,8 @@ allowed.
@item -s @var{domainlist}
@opindex -s
-List of domains which should be stripped from the @acronym{FQDN} of
-hosts before logging their name. Multiple lists are allowed.
+List of domains which should be stripped from the FQDN of hosts before
+logging their name. Multiple lists are allowed.
@end table
@section Configuration file
@@ -2562,8 +2554,8 @@ messages at the level of @samp{err} or higher, not at the
level of
@cindex ftpd
@command{ftpd} is the Internet File Transfer Protocol server process.
-The server uses the @acronym{TCP} protocol and listens at the port
-specified in the @samp{ftp} service specification.
+The server uses the TCP protocol and listens at the port specified in
+the @samp{ftp} service specification.
@example
ftpd address@hidden@dots{}
@@ -2651,8 +2643,8 @@ the file exists,@command{ ftpd} displays it and exits.
If the file
the @samp{ready} message. If the file @command{/etc/motd} exists,
@command{ftpd} prints it after a successful login.
-The @acronym{FTP} server currently supports the following
address@hidden requests. The case of the requests is ignored.
+The FTP server currently supports the following FTP requests. The
+case of the requests is ignored.
@multitable @columnfractions 0.3 0.7
@headitem Request @tab Description
@@ -2696,8 +2688,8 @@ The @acronym{FTP} server currently supports the following
@item XRMD @tab remove a directory (deprecated)
@end multitable
-The following non-standard or @acronym{UNIX} specific commands are
-supported by the @code{SITE} request.
+The following non-standard or UNIX specific commands are supported by
+the @code{SITE} request.
@multitable @columnfractions 0.3 0.7
@item Request @tab Description
@@ -2707,9 +2699,9 @@ supported by the @code{SITE} request.
@item HELP @tab give help information.
@end multitable
-The remaining @acronym{FTP} requests specified in RFC 959 are
-recognized, but not implemented. @code{MDTM} and @code{SIZE} are not
-specified in RFC 959, but will appear in the next updated FTP RFC.
+The remaining FTP requests specified in RFC 959 are recognized, but
+not implemented. @code{MDTM} and @code{SIZE} are not specified in RFC
+959, but will appear in the next updated FTP RFC.
The ftp server will abort an active file transfer only when the
@code{ABOR} command is preceded by a Telnet @samp{Interrupt Process}
@@ -2828,8 +2820,8 @@ range 512--1023, the server aborts the connection.
@item
The server reads characters from the socket up to a NUL (@samp{\0})
-byte. The resultant string is interpreted as an @acronym{ASCII}
-number, base 10.
+byte. The resultant string is interpreted as an ASCII number, base
+10.
@item
If the number received in step 2 is non-zero, it is interpreted as the
@@ -2938,9 +2930,9 @@ Use kerberos IV authentication.
@itemx --encrypt
@opindex -x
@opindex --encrypt
-Turns on @acronym{DES} encryption for all data passed via the
address@hidden session. This may impact response time and
address@hidden utilization, but provides increased security.
+Turns on DES encryption for all data passed via the @command{rshd}
+session. This may impact response time and CPU utilization, but
+provides increased security.
@item address@hidden
@itemx address@hidden
@@ -2964,7 +2956,7 @@ Set debug level, not implemented.
@c @itemx --reverse-required
@c @opindex -r
@c @opindex --reverse-required
address@hidden Required Require reverse resolving of a remote host
@acronym{IP}.
address@hidden Required Require reverse resolving of a remote host IP.
@end table
@section Diagnostics
@@ -3115,9 +3107,9 @@ Use kerberos IV authentication.
@itemx --encrypt
@opindex -x
@opindex --encrypt
-Turns on @acronym{DES} encryption for all data passed via the rlogind
-session. This may impact response time and @acronym{CPU} utilization,
-but provides increased security.
+Turns on DES encryption for all data passed via the rlogind session.
+This may impact response time and CPU utilization, but provides
+increased security.
@item address@hidden
@itemx address@hidden
@@ -3141,7 +3133,7 @@ Listen on given port (valid only in daemon mode).
@itemx --reverse-required
@opindex -r
@opindex --reverse-required
-Require reverse resolving of a remote host @acronym{IP}.
+Require reverse resolving of a remote host IP.
@end table
@@ -3180,8 +3172,8 @@ received the following protocol is initiated:
@enumerate
@item
The server reads characters from the socket up to a NUL (@samp{\0})
-byte. The resultant string is interpreted as an @acronym{ASCII}
-number, base 10.
+byte. The resultant string is interpreted as an ASCII number, base
+10.
@item
If the number received in step 1 is non-zero, it is interpreted as the
@@ -3274,7 +3266,7 @@ talkd address@hidden@dots{}
@itemx address@hidden
@opindex -a
@opindex --acl
-Read site-wide @acronym{ACL}s from @var{file}.
+Read site-wide ACLs from @var{file}.
@item -d
@item --debug
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3f641ec40cffb5b28aefb7a15bb44556baab5708
commit 3f641ec40cffb5b28aefb7a15bb44556baab5708
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 20:53:09 2010 +0200
doc/.gitignore (Makefile, Makefile.in): Removed rules.
diff --git a/ChangeLog b/ChangeLog
index a627b3b..8a3dd85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-05-14 Alfred M. Szmidt <address@hidden>
+ * doc/.gitignore (Makefile, Makefile.in): Removed rules.
+
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
* AUTHORS: Updated.
2010-05-14 Giuseppe Scrivano <address@hidden>
diff --git a/doc/.gitignore b/doc/.gitignore
index 24c6478..a6b422f 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
fdl-1.3.texi
inetutils.info*
stamp-vti
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=67dcf7ef0e3f2424155208dae8223b1a8164062f
commit 67dcf7ef0e3f2424155208dae8223b1a8164062f
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 20:52:14 2010 +0200
Random formating fixes. (silent change)
diff --git a/NEWS b/NEWS
index 28e72fb..cbdbaf5 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Version 1.7.90:
** ftp
New options --active and --passive to enable/disable active transfer
-mode. The short option for --prompt has been removed, and is instead
+mode. The short option for --prompt has been removed, and is instead
now used to enable passive transfer mode.
** ifconfig
@@ -26,8 +26,8 @@ now uses -a instead.
New commands (multicast, allmulti) to set multicast flags.
-New option -s displays a short list of interfaces (similar to
-netstat -i).
+New option -s displays a short list of interfaces (similar to netstat
+-i).
The --format option can be used to read format from a file. To do so,
prefix the file name with a '@' sign, e.g.:
@@ -35,8 +35,8 @@ prefix the file name with a '@' sign, e.g.:
ifconfig address@hidden
The contents of this file is read literally, except that the lines
-beginning with a `#' sign are ignored (and can thus be used to introduce
-comments).
+beginning with a `#' sign are ignored (and can thus be used to
+introduce comments).
To obtain a list of the available built-in output formats, use
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2375a6fa104fc05d1f20d93d305163e65832e37a
commit 2375a6fa104fc05d1f20d93d305163e65832e37a
Author: Alfred M. Szmidt <address@hidden>
Date: Fri May 14 20:51:52 2010 +0200
AUTHORS: Updated.
diff --git a/AUTHORS b/AUTHORS
index 87bd0b9..581aa55 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,39 @@
-Here are the names of the programs in this package, each followed by
-the name(s) of its author(s). Most of the utilities are from
-4.4BSD-Lite2, and might not have an author associated with them.
+This is a partial list of people (in alphabetical order) who have
+contributed to inetutils, some utilities originate from BSB 4.4-Lite2,
+and might not have an author associated with them.
-ifconfig: Marcus Brinkmann
-ping, talkd: Sergey Poznyakoff
-ping6: Jeroen Dekkers
-talk: Kipp Hickman
-whois: Joel N. Weber II
+Alain Malgoire
+Alfred M. Szmidt
+Arash Yadegarnia
+Bernhard Rosenkraenzer
+Dan Stromberg
+David O'Shea
+Debarshi Ray
+Edward Attfield
+Elian Gidoni
+Giuseppe Scrivano
+Guillem Jover
+Jakob Kaivo
+Jeff Bailey
+Jeff Smith
+Jeroen Dekkers
+Joachim Gabler
+Joel N. Weber II
+Karl Berry
+Kaveh R. Ghazi
+Ludovic Courtès
+Marcus Brinkmann
+Matt Roberds
+Michael Weiser
+Michal Svoboda
+Michael Vogt
+Miles Bader
+Pedro Alves
+Petr Salinger
+Philippe De Muyter
+Rakesh Pandit
+Roland McGrath
+Samuel Thibault
+Sergey Poznyakoff
+Simon Josefsson
+Winston Edmond
diff --git a/ChangeLog b/ChangeLog
index e411c8b..a627b3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-14 Alfred M. Szmidt <address@hidden>
+
+ * AUTHORS: Updated.
+
2010-05-14 Giuseppe Scrivano <address@hidden>
* bootstrap (gnulib_path): Default to "gnulib" if it doesn't have a
@@ -42,10 +46,10 @@
2010-03-15 Giuseppe Scrivano <address@hidden>
- * src/rshd.c (iruserok): declare extern only under glibc.
+ * src/rshd.c (iruserok): Declare extern only under glibc.
* src/rlogind.c: Include pty.h only if HAVE_PTY_H is defined.
- (iruserok): declare extern only under glibc.
+ (iruserok): Declare extern only under glibc.
2010-03-10 Ludovic Courtès <address@hidden> (tiny change)
@@ -54,12 +58,13 @@
2010-03-10 Ludovic Courtès <address@hidden> (tiny change)
- * ifconfig/flags.c (if_flags): Add trailing entry with NULL `name'.
+ * ifconfig/flags.c (if_flags): Add trailing entry with NULL
+ `name'.
2010-02-13 Giuseppe Scrivano <address@hidden>
- * configure.ac: Don't check for the `sa_family_t' type. It is already
- done by gnulib.
+ * configure.ac: Don't check for the `sa_family_t' type. It is
+ already done by gnulib.
2010-02-08 Sergey Poznyakoff <address@hidden>
@@ -67,13 +72,13 @@
* ifconfig/if_index.c (if_nametoindex): Fix return value.
* ifconfig/ifconfig.c (main): Rewrite loop.
- * ifconfig/options.c (formats): Add docstrings.
- Add "help" format.
+ * ifconfig/options.c (formats): Add docstrings. Add "help"
+ format.
(format_find): New function.
* ifconfig/options.h (format)<docstr>: New member.
(format_find): New prototype.
- * ifconfig/printif.c (format_handles): New functions:
- format?, docstr?, defn, foreachformat, verbose?, rep.
+ * ifconfig/printif.c (format_handles): New functions: format?,
+ docstr?, defn, foreachformat, verbose?, rep.
(put_flags): Minor change.
(format_handler, fh_exists_query, fh_error): Rewrite the loop.
(fh_format_query, fh_docstr)
@@ -100,9 +105,8 @@
(argp_options): New option: --short (-s).
(parse_opt_set_default_format): Optimize.
(parse_opt_set_default_format_from_file): New function.
- (parse_opt): Handle -s option.
- If argument to --format begins with a '@', it specifies a
- file to read format from.
+ (parse_opt): Handle -s option. If argument to --format begins
+ with a '@', it specifies a file to read format from.
(parse_cmdline): Order interfaces alphabetically.
* ifconfig/printif.c (put_flags_short): New function.
(fh_flags): ${flags}{short} prints flags in short notation.
@@ -131,8 +135,8 @@
Implement -a option; correctly print interface metric.
* ifconfig/options.c (formats) <gnu-one-entry>
- <net-tools,unix,osf>: Use ${ifdisplay?} to select interfaces to
- be displayed.
+ <net-tools,unix,osf>: Use ${ifdisplay?} to select interfaces to be
+ displayed.
(ifs_cmdline): New global.
(parse_opt_new_ifs): Set ifs_cmdline.
* ifconfig/options.h (all_option, ifs_cmdline): New externs.
@@ -378,8 +382,8 @@
(.h2m.1): Invoke new meta-rule 'man'.
(man): New meta-rule to invoke help2man, simplified from before.
(EXTRA_DIST): Add $(all:.8=.h2m).
- * NEWS: Updated.
- Reported by Juergen Daubert <address@hidden>.
+ * NEWS: Updated. Reported by Juergen Daubert
+ <address@hidden>.
2009-12-17 Simon Josefsson <address@hidden>
@@ -7244,7 +7248,7 @@ AC_REPLACE_FUNC (setproctitle).
* README-alpha: Update with CVS info and mailing list info.
- * THANKS: Add Marcus Brinkman
+ * THANKS: Add Marcus Brinkmann.
1999-09-13 Jeff Bailey
@@ -7259,7 +7263,7 @@ AC_REPLACE_FUNC (setproctitle).
* ftp/cmds.c/account(): occurences of 49 change for sizeof(acct) - 1
* ftp/cmds.c: Typos in comments corrected.
-1999-05-19 Jeff Bayley
+1999-05-19 Jeff Bailey
* uucpd/Makefile.am : add LIBUTIL, needed for the Hurd.
@@ -7273,7 +7277,7 @@ AC_REPLACE_FUNC (setproctitle).
* rlogind/rlogind.c : make an utmp entry before exec(login);
remove entry in cleanup().
-1999-05-19 Jeff Bayley
+1999-05-19 Jeff Bailey
* rlogind/Makefile.am : add LIBUTIL, needed for the Hurd.
@@ -7281,8 +7285,8 @@ AC_REPLACE_FUNC (setproctitle).
* ftp/ruserpass.c: MACH was define on Hurd. We protect
the defines before using them, MACH was change to MACHINE.
- Noted by the Hurd people(Bayley, Marcus)
- * cmds.c : use xgetcwd().
+ Noted by the Hurd people (Jeff Bailey, Marcus Brinkmann)
+ * cmds.c: use xgetcwd().
1999-05-19 Alain Magloire
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 46 ++++-
ChangeLog | 210 ++++++++++++++++++--
Makefile.am | 2 +-
NEWS | 21 +--
am/config_paths.m4 | 10 +-
am/libcurses.m4 | 4 +-
am/result.m4 | 1 -
cfg.mk | 2 +
configure.ac | 72 ++++----
doc/.gitignore | 2 -
doc/inetutils.texi | 460 ++++++++++++++++++++++----------------------
ftp/Makefile.am | 2 +-
ftp/cmds.c | 22 +--
ftp/ftp.c | 40 +----
ftp/main.c | 6 +-
ftp/ruserpass.c | 6 +-
ftpd/Makefile.am | 5 -
ftpd/auth.c | 12 +-
ftpd/ftpcmd.y | 14 +--
ftpd/ftpd.c | 24 +--
ftpd/popen.c | 4 +-
ifconfig/.gitignore | 1 -
ifconfig/changeif.c | 6 +-
ifconfig/flags.c | 6 +-
ifconfig/flags.h | 2 +-
ifconfig/ifconfig.c | 10 +-
ifconfig/options.c | 6 +-
ifconfig/printif.c | 14 +-
ifconfig/system/hpux.c | 10 +-
ifconfig/system/linux.c | 10 +-
ifconfig/system/linux.h | 6 +-
ifconfig/system/osf.c | 10 +-
ifconfig/system/qnx.c | 4 +-
ifconfig/system/solaris.c | 10 +-
libicmp/.gitignore | 1 -
libinetutils/cleansess.c | 16 +--
libinetutils/localhost.c | 4 +-
libinetutils/logwtmp.c | 20 +--
libinetutils/setsig.c | 4 +-
libinetutils/ttymsg.c | 4 -
libinetutils/utmp_init.c | 13 +-
libinetutils/utmp_logout.c | 13 +-
libls/fts.c | 6 +-
libtelnet/Makefile.am | 2 +-
libtelnet/auth.c | 4 +-
libtelnet/enc_des.c | 6 +-
libtelnet/encrypt.c | 14 +-
libtelnet/kerberos.c | 10 +-
libtelnet/kerberos5.c | 6 +-
libtelnet/read_passwd.c | 1 -
libtelnet/shishi.c | 6 +-
ping/ping_common.h | 1 -
src/Makefile.am | 2 +-
src/inetd.c | 20 +--
src/rcp.c | 13 +-
src/rexec.c | 4 +-
src/rexecd.c | 16 +--
src/rlogin.c | 45 +----
src/rlogind.c | 16 +--
src/rsh.c | 16 +--
src/rshd.c | 33 +---
src/syslogd.c | 24 +--
src/tftp.c | 12 +-
src/uucpd.c | 16 +--
talk/ctl.c | 1 -
talk/ctl_transact.c | 16 +--
talk/display.c | 1 -
talk/invite.c | 12 +-
talk/io.c | 16 +--
talk/look_up.c | 1 -
talk/msgs.c | 12 +-
talk/talk.h | 2 -
talkd/.gitignore | 1 -
talkd/talkd.c | 1 -
telnet/Makefile.am | 5 +-
telnet/commands.c | 27 +---
telnet/fdset.h | 63 ------
telnet/network.c | 18 +--
telnet/sys_bsd.c | 18 +--
telnet/telnet.c | 4 +-
telnet/tn3270.c | 1 -
telnet/utilities.c | 18 +--
telnetd/.gitignore | 1 -
telnetd/Makefile.am | 10 +-
telnetd/telnetd.c | 4 +-
telnetd/telnetd.h | 4 +-
86 files changed, 649 insertions(+), 995 deletions(-)
delete mode 100644 libicmp/.gitignore
delete mode 100644 telnet/fdset.h
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_7-71-g4422743,
Alfred M. Szmidt <=