[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-44-gd7be6f
|
From: |
Alfred M. Szmidt |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-44-gd7be6fb |
|
Date: |
Sun, 26 Feb 2012 19:48:52 +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 d7be6fbb79bc1ed57d07f42b6c67d66d59b2bfc9 (commit)
via 53c5e95452878e60fece474df91d4d213681546d (commit)
via 91d887ae7264ab5d2c998dcd7ae8a7e717d569a1 (commit)
via 2d136f7b735b0012f968697246c78ed5fd5131e0 (commit)
via 7ab4fa2996a9b9fc7d0ee0ec9c855efb9d1bc1e1 (commit)
from 75ba6bd5ed59473ddebe595cb056c9fd262bcac8 (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=d7be6fbb79bc1ed57d07f42b6c67d66d59b2bfc9
commit d7be6fbb79bc1ed57d07f42b6c67d66d59b2bfc9
Author: Alfred M. Szmidt <address@hidden>
Date: Sat Feb 25 12:31:23 2012 +0100
bootstrap.conf (gnulib_modules): Sort lexically.
diff --git a/ChangeLog b/ChangeLog
index ff913d1..c9525b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-02-25 Alfred M. Szmidt <address@hidden>
+ * bootstrap.conf (gnulib_modules): Sort lexically.
+
+2012-02-25 Alfred M. Szmidt <address@hidden>
+
Silence sc_makefile_at_at_check.
* whois/Makefile.am (bin_PROGRAMS): Use $(...) type of variable
diff --git a/bootstrap.conf b/bootstrap.conf
index 7a9fe5e..98a8637 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -80,6 +80,7 @@ setenv
sethostname
signal
size_max
+snippet/unused-parameter
snprintf
stdbool
stdint
@@ -90,7 +91,6 @@ strnlen
sysexits
termios
unistd-safer
-snippet/unused-parameter
update-copyright
vasnprintf
version-etc-fsf
diff --git a/telnetd/state.c b/telnetd/state.c
index 6c8a59a..c52d232 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -54,10 +54,10 @@
#if defined HAVE_STREAMSPTY && defined TIOCSIGNAL \
&& defined HAVE_STROPTS_H
-# include <stropts.h> /* I_FLUSH, FLUSHR */
+# include <stropts.h> /* I_FLUSH, FLUSHR */
#endif
-#ifndef NTELOPTS /* OpenSolaris */
+#ifndef NTELOPTS /* OpenSolaris */
# define NTELOPTS (1+TELOPT_NEW_ENVIRON)
#endif
@@ -66,6 +66,7 @@ char doopt[] = { IAC, DO, '%', 'c', 0 };
char dont[] = { IAC, DONT, '%', 'c', 0 };
char will[] = { IAC, WILL, '%', 'c', 0 };
char wont[] = { IAC, WONT, '%', 'c', 0 };
+
int not42 = 1;
/*
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index d844d37..f19a72a 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -92,29 +92,29 @@ char *terminaltype;
int SYNCHing; /* we are in TELNET SYNCH mode */
struct telnetd_clocks clocks;
-
+
static struct argp_option argp_options[] = {
- { "authmode", 'a', "MODE", 0,
- "specify what mode to use for authentication" },
- { "debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
- "set debugging level" },
- { "exec-login", 'E', "STRING", 0,
- "set program to be executed instead of " PATH_LOGIN },
- { "no-hostinfo", 'h', NULL, 0,
- "do not print host information before login has been completed" },
- { "linemode", 'l', "MODE", OPTION_ARG_OPTIONAL,
- "set line mode" },
- { "no-keepalive", 'n', NULL, 0,
- "disable TCP keep-alives" },
- { "reverse-lookup", 'U', NULL, 0,
- "refuse connections from addresses that "
- "cannot be mapped back into a symbolic name" },
+ {"authmode", 'a', "MODE", 0,
+ "specify what mode to use for authentication"},
+ {"debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
+ "set debugging level"},
+ {"exec-login", 'E', "STRING", 0,
+ "set program to be executed instead of " PATH_LOGIN},
+ {"no-hostinfo", 'h', NULL, 0,
+ "do not print host information before login has been completed"},
+ {"linemode", 'l', "MODE", OPTION_ARG_OPTIONAL,
+ "set line mode"},
+ {"no-keepalive", 'n', NULL, 0,
+ "disable TCP keep-alives"},
+ {"reverse-lookup", 'U', NULL, 0,
+ "refuse connections from addresses that "
+ "cannot be mapped back into a symbolic name"},
#ifdef AUTHENTICATION
- { "disable-auth-type", 'X', "TYPE", 0,
- "disable the use of given authentication option" },
+ {"disable-auth-type", 'X', "TYPE", 0,
+ "disable the use of given authentication option"},
#endif
- { NULL }
+ {NULL}
};
static error_t
@@ -163,16 +163,15 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp =
- {
- argp_options,
- parse_opt,
- NULL,
- "DARPA telnet protocol server"
- };
-
+static struct argp argp = {
+ argp_options,
+ parse_opt,
+ NULL,
+ "DARPA telnet protocol server"
+};
+
int
main (int argc, char **argv)
{
@@ -224,11 +223,16 @@ static struct
int modnum;
} debug_mode[debug_max_mode] =
{
- {"options", debug_options},
- {"report", debug_report},
- {"netdata", debug_net_data},
- {"ptydata", debug_pty_data},
- {"auth", debug_auth},};
+ {
+ "options", debug_options},
+ {
+ "report", debug_report},
+ {
+ "netdata", debug_net_data},
+ {
+ "ptydata", debug_pty_data},
+ {
+"auth", debug_auth},};
void
parse_debug_level (char *str)
diff --git a/telnetd/term.c b/telnetd/term.c
index 6ee845e..68e6e4e 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -656,47 +656,70 @@ struct termspeeds
int speed;
int value;
} termspeeds[] =
+{
+ {
+ 0, B0},
+ {
+ 50, B50},
+ {
+ 75, B75},
+ {
+ 110, B110},
+ {
+ 134, B134},
+ {
+ 150, B150},
+ {
+ 200, B200},
+ {
+ 300, B300},
+ {
+ 600, B600},
+ {
+ 1200, B1200},
+ {
+ 1800, B1800},
{
- {0, B0},
- {50, B50},
- {75, B75},
- {110, B110},
- {134, B134},
- {150, B150},
- {200, B200},
- {300, B300},
- {600, B600},
- {1200, B1200},
- {1800, B1800},
- {2400, B2400},
- {4800, B4800},
+ 2400, B2400},
+ {
+ 4800, B4800},
# ifdef B7200
- {7200, B7200},
+ {
+ 7200, B7200},
# endif
- {9600, B9600},
+ {
+ 9600, B9600},
# ifdef B14400
- {14400, B14400},
+ {
+ 14400, B14400},
# endif
# ifdef B19200
- {19200, B19200},
+ {
+ 19200, B19200},
# endif
# ifdef B28800
- {28800, B28800},
+ {
+ 28800, B28800},
# endif
# ifdef B38400
- {38400, B38400},
+ {
+ 38400, B38400},
# endif
# ifdef B57600
- {57600, B57600},
+ {
+ 57600, B57600},
# endif
# ifdef B115200
- {115200, B115200},
+ {
+ 115200, B115200},
# endif
# ifdef B230400
- {230400, B230400},
+ {
+ 230400, B230400},
# endif
- {-1, 0}
- };
+ {
+ -1, 0}
+};
#endif /* DECODE_BAUD */
void
diff --git a/telnetd/utility.c b/telnetd/utility.c
index cdd1d9a..ba1d440 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1347,12 +1347,12 @@ printsub (int direction, unsigned char *pointer, int
length)
default:
if (isprint (pointer[i]) && pointer[i] != '"')
{
- if (noquote)
+ if (noquote)
{
debug_output_data ("\"");
noquote = 0;
}
- debug_output_datalen ((char*) &pointer[i], 1);
+ debug_output_datalen ((char *) &pointer[i], 1);
}
else
{
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index dbac011..e2405ef 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -84,14 +84,14 @@ write_address (int fd)
{
sslen = sizeof (ss);
recvfrom (fd, answer, sizeof (answer), 0,
- (struct sockaddr *) &ss, &sslen);
+ (struct sockaddr *) &ss, &sslen);
shutdown (fd, SHUT_RD);
}
else
- return;
+ return;
getnameinfo ((struct sockaddr *) &ss, sslen, addr, sizeof (addr),
- NULL, 0, NI_NUMERICHOST);
+ NULL, 0, NI_NUMERICHOST);
len = snprintf (answer, sizeof (answer),
"Your address is %s." SEPARATOR, addr);
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=53c5e95452878e60fece474df91d4d213681546d
commit 53c5e95452878e60fece474df91d4d213681546d
Author: Alfred M. Szmidt <address@hidden>
Date: Sat Feb 25 12:23:16 2012 +0100
Silence sc_makefile_at_at_check.
diff --git a/ChangeLog b/ChangeLog
index c60d057..ff913d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
2012-02-25 Alfred M. Szmidt <address@hidden>
+ Silence sc_makefile_at_at_check.
+
+ * whois/Makefile.am (bin_PROGRAMS): Use $(...) type of variable
+ reference instead of @address@hidden
+ * telnetd/Makefile.am: Likewise.
+ * telnet/Makefile.am (bin_PROGRAMS): Likewise.
+ * talkd/Makefile.am (inetdaemon_PROGRAMS): Likewise.
+ * talk/Makefile.am (bin_PROGRAMS): Likewise.
+ * src/Makefile.am (bin_PROGRAMS, inetdaemon_PROGRAMS)
+ (install-exec-hook): Likewise.
+ * ping/Makefile.am (bin_PROGRAMS, install-exec-hook): Likewise.
+ * libls/Makefile.am (noinst_LIBRARIES): Likewise.
+ * ifconfig/Makefile.am (bin_PROGRAMS): Likewise.
+ * ftpd/Makefile.am (inetdaemon_PROGRAMS): Likewise.
+ * ftp/Makefile.am (bin_PROGRAMS): Likewise.
+
+2012-02-25 Alfred M. Szmidt <address@hidden>
+
* cfg.mk (local-checks-to-skip): Added sc_assignment_in_if to list.
(sc_assignment_in_if): New target.
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index 9f3cb26..0d5ec3f 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -18,7 +18,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/'.
-bin_PROGRAMS = @ftp_BUILD@
+bin_PROGRAMS = $(ftp_BUILD)
EXTRA_PROGRAMS = ftp
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index 7e07673..7f4c284 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -20,7 +20,7 @@
inetdaemondir = @inetdaemondir@
-inetdaemon_PROGRAMS = @ftpd_BUILD@
+inetdaemon_PROGRAMS = $(ftpd_BUILD)
EXTRA_PROGRAMS = ftpd
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index 7268cda..f01bf62 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -19,7 +19,7 @@
SUBDIRS = system
-bin_PROGRAMS = @ifconfig_BUILD@
+bin_PROGRAMS = $(ifconfig_BUILD)
EXTRA_PROGRAMS = ifconfig
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 7d40b2e..6dedddb 100644
--- a/libls/Makefile.am
+++ b/libls/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/'.
-noinst_LIBRARIES = @libls_BUILD@
+noinst_LIBRARIES = $(libls_BUILD)
EXTRA_LIBRARIES = libls.a
diff --git a/ping/Makefile.am b/ping/Makefile.am
index 5da4782..8314662 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -18,7 +18,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/'.
-bin_PROGRAMS = @ping_BUILD@ @ping6_BUILD@
+bin_PROGRAMS = $(ping_BUILD) $(ping6_BUILD)
EXTRA_PROGRAMS = ping ping6
@@ -41,4 +41,4 @@ install-ping-hook:
fi \
done
-install-exec-hook: @ping_INSTALL_HOOK@
+install-exec-hook: $(ping_INSTALL_HOOK)
diff --git a/src/Makefile.am b/src/Makefile.am
index 726e7c6..e05ffd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,70 +28,70 @@ bin_PROGRAMS =
EXTRA_PROGRAMS =
-bin_PROGRAMS += @hostname_BUILD@
+bin_PROGRAMS += $(hostname_BUILD)
hostname_SOURCES = hostname.c
EXTRA_PROGRAMS += hostname
-bin_PROGRAMS += @logger_BUILD@
+bin_PROGRAMS += $(logger_BUILD)
logger_SOURCES = logger.c logprio.h
EXTRA_PROGRAMS += logger
-bin_PROGRAMS += @rcp_BUILD@
+bin_PROGRAMS += $(rcp_BUILD)
rcp_SOURCES = rcp.c
rcp_LDADD = $(LDADD) $(LIBAUTH)
EXTRA_PROGRAMS += rcp
-bin_PROGRAMS += @rexec_BUILD@
+bin_PROGRAMS += $(rexec_BUILD)
rexec_SOURCES = rexec.c
EXTRA_PROGRAMS += rexec
-bin_PROGRAMS += @rlogin_BUILD@
+bin_PROGRAMS += $(rlogin_BUILD)
rlogin_SOURCES = rlogin.c
rlogin_LDADD = $(LDADD) $(LIBAUTH)
EXTRA_PROGRAMS += rlogin
-bin_PROGRAMS += @rsh_BUILD@
+bin_PROGRAMS += $(rsh_BUILD)
rsh_SOURCES = rsh.c
rsh_LDADD = $(LDADD) $(LIBAUTH)
EXTRA_PROGRAMS += rsh
-bin_PROGRAMS += @tftp_BUILD@
+bin_PROGRAMS += $(tftp_BUILD)
tftp_SOURCES = tftp.c
EXTRA_PROGRAMS += tftp
-bin_PROGRAMS += @traceroute_BUILD@
+bin_PROGRAMS += $(traceroute_BUILD)
traceroute_SOURCES = traceroute.c
traceroute_LDADD = $(top_builddir)/libicmp/libicmp.a $(LDADD)
EXTRA_PROGRAMS += traceroute
-inetdaemon_PROGRAMS += @inetd_BUILD@
+inetdaemon_PROGRAMS += $(inetd_BUILD)
inetd_SOURCES = inetd.c
EXTRA_PROGRAMS += inetd
-inetdaemon_PROGRAMS += @rexecd_BUILD@
+inetdaemon_PROGRAMS += $(rexecd_BUILD)
rexecd_SOURCES = rexecd.c
rexecd_LDADD = $(LDADD) $(LIBCRYPT)
EXTRA_PROGRAMS += rexecd
-inetdaemon_PROGRAMS += @rlogind_BUILD@
+inetdaemon_PROGRAMS += $(rlogind_BUILD)
rlogind_SOURCES = rlogind.c
rlogind_LDADD = $(LDADD) $(LIBAUTH)
EXTRA_PROGRAMS += rlogind
-inetdaemon_PROGRAMS += @rshd_BUILD@
+inetdaemon_PROGRAMS += $(rshd_BUILD)
rshd_SOURCES = rshd.c
rshd_LDADD = $(LDADD) $(LIBAUTH)
EXTRA_PROGRAMS += rshd
-inetdaemon_PROGRAMS += @syslogd_BUILD@
+inetdaemon_PROGRAMS += $(syslogd_BUILD)
syslogd_SOURCES = syslogd.c
EXTRA_PROGRAMS += syslogd
-inetdaemon_PROGRAMS += @tftpd_BUILD@
+inetdaemon_PROGRAMS += $(tftpd_BUILD)
tftpd_SOURCES = tftpd.c
EXTRA_PROGRAMS += tftpd
-inetdaemon_PROGRAMS += @uucpd_BUILD@
+inetdaemon_PROGRAMS += $(uucpd_BUILD)
uucpd_SOURCES = uucpd.c
uucpd_LDADD = $(LDADD) $(LIBCRYPT)
EXTRA_PROGRAMS += uucpd
@@ -102,7 +102,7 @@ AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE)
$(PATHDEF_CP) $(PATHDEF_DEFPA
SUIDMODE = -o root -m 4775
-install-exec-hook: @traceroute_INSTALL_HOOK@ @rsh_INSTALL_HOOK@
@rlogin_INSTALL_HOOK@ @rcp_INSTALL_HOOK@
+install-exec-hook: $(traceroute_INSTALL_HOOK) $(rsh_INSTALL_HOOK)
$(rlogin_INSTALL_HOOK) $(rcp_INSTALL_HOOK)
install-traceroute-hook:
address@hidden(INSTALL_PROGRAM) traceroute $(SUIDMODE)
$(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo traceroute|sed
'$(transform)'` ; \
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 488ff8a..77e25e6 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -18,7 +18,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/'.
-bin_PROGRAMS = @talk_BUILD@
+bin_PROGRAMS = $(talk_BUILD)
EXTRA_PROGRAMS = talk
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index a3e81b7..33372ec 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -20,7 +20,7 @@
inetdaemondir = @inetdaemondir@
-inetdaemon_PROGRAMS = @talkd_BUILD@
+inetdaemon_PROGRAMS = $(talkd_BUILD)
EXTRA_PROGRAMS = talkd
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 382f265..b37ed35 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -18,7 +18,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/'.
-bin_PROGRAMS = @telnet_BUILD@
+bin_PROGRAMS = $(telnet_BUILD)
EXTRA_PROGRAMS = telnet
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 7fce7ba..1f8d961 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -20,7 +20,7 @@
inetdaemondir = @inetdaemondir@
-inetdaemon_PROGRAMS = @telnetd_BUILD@
+inetdaemon_PROGRAMS = $(telnetd_BUILD)
EXTRA_PROGRAMS = telnetd
diff --git a/whois/Makefile.am b/whois/Makefile.am
index 3a5a233..f1363c0 100644
--- a/whois/Makefile.am
+++ b/whois/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/'.
-bin_PROGRAMS = @whois_BUILD@
+bin_PROGRAMS = $(whois_BUILD)
EXTRA_PROGRAMS = whois
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=91d887ae7264ab5d2c998dcd7ae8a7e717d569a1
commit 91d887ae7264ab5d2c998dcd7ae8a7e717d569a1
Author: Alfred M. Szmidt <address@hidden>
Date: Sat Feb 25 12:20:44 2012 +0100
New syntax rule to checks for assignments inside if statements:
sc_assignment_in_if.
diff --git a/ChangeLog b/ChangeLog
index 832b03d..c60d057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-02-25 Alfred M. Szmidt <address@hidden>
+ * cfg.mk (local-checks-to-skip): Added sc_assignment_in_if to list.
+ (sc_assignment_in_if): New target.
+
* bootstrap: Updated from gnulib.
* src/inetd.c (main, tcpmux, chargen_dg, chargen_stream)
diff --git a/cfg.mk b/cfg.mk
index 102148a..bb95788 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,8 @@ local-checks-to-skip = \
sc_prohibit_stat_st_blocks \
sc_prohibit_strcmp \
sc_unmarked_diagnostics \
- sc_bindtextdomain
+ sc_bindtextdomain \
+ sc_assignment_in_if
exclude_file_name_regexp--sc_prohibit_have_config_h = \
^libinetutils/libinetutils.h$$
@@ -64,3 +65,7 @@ sc_unsigned_short:
@prohibit=u''_short \
halt='don'\''t use u''_char; instead use unsigned short' \
$(_sc_search_regexp)
+
+sc_assignment_in_if:
+ prohibit='\<if *\(.* = ' halt="don't use assignments in if statements"
\
+ $(_sc_search_regexp)
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2d136f7b735b0012f968697246c78ed5fd5131e0
commit 2d136f7b735b0012f968697246c78ed5fd5131e0
Author: Alfred M. Szmidt <address@hidden>
Date: Sat Feb 25 11:57:52 2012 +0100
bootstrap: Updated from gnulib.
diff --git a/ChangeLog b/ChangeLog
index e671769..832b03d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-02-25 Alfred M. Szmidt <address@hidden>
+ * bootstrap: Updated from gnulib.
+
* src/inetd.c (main, tcpmux, chargen_dg, chargen_stream)
(nextconfig, newstr, run_service): Fix indentation.
diff --git a/bootstrap b/bootstrap
index 66da981..31eb651 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-02-11.09; # UTC
# Bootstrap this package from checked-out sources.
@@ -87,9 +87,9 @@ gnulib_files=
: ${AUTOPOINT=autopoint}
: ${AUTORECONF=autoreconf}
-# A function to be called to edit gnulib.mk right after it's created.
+# A function to be called right after gnulib-tool is run.
# Override it via your own definition in bootstrap.conf.
-gnulib_mk_hook() { :; }
+bootstrap_post_import_hook() { :; }
# A function to be called after everything else in this script.
# Override it via your own definition in bootstrap.conf.
@@ -423,7 +423,7 @@ check_versions() {
$use_git || continue
fi
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
- appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
+ appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'`
test "$appvar" = TAR && appvar=AMTAR
case $appvar in
GZIP) ;; # Do not use $GZIP: it contains gzip options.
@@ -604,7 +604,7 @@ if $bootstrap_sync; then
fi
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
# Get translations.
@@ -758,7 +758,7 @@ fi
# Autoreconf runs aclocal before libtoolize, which causes spurious
# warnings if the initial aclocal is confused by the libtoolized
# (or worse out-of-date) macro directory.
-if grep '^[ ]*LT_INIT' configure.ac >/dev/null; then
+if test $use_libtool = 1; then
echo "running: $LIBTOOLIZE --copy --install"
$LIBTOOLIZE --copy --install
fi
@@ -807,6 +807,9 @@ for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file || exit
done
+bootstrap_post_import_hook \
+ || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
+
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
# The following requires GNU find 4.2.3 or newer. Considering the usual
@@ -819,11 +822,20 @@ find "$m4_base" "$source_base" \
-depth \( -name '*.m4' -o -name '*.[ch]' \) \
-type l -xtype l -delete > /dev/null 2>&1
+# Some systems (RHEL 5) are using ancient autotools, for which the
+# --no-recursive option had not been invented. Detect that lack and
+# omit the option when it's not supported. FIXME in 2017: remove this
+# hack when RHEL 5 autotools are updated, or when they become irrelevant.
+no_recursive=
+case $($AUTORECONF --help) in
+ *--no-recursive*) no_recursive=--no-recursive;;
+esac
+
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
- "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS"
+ "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
AUTOPOINT=true LIBTOOLIZE=true \
- $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \
+ $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
|| exit 1
# Get some extra files from gnulib, overriding existing files.
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=7ab4fa2996a9b9fc7d0ee0ec9c855efb9d1bc1e1
commit 7ab4fa2996a9b9fc7d0ee0ec9c855efb9d1bc1e1
Author: Alfred M. Szmidt <address@hidden>
Date: Sat Feb 25 11:57:29 2012 +0100
src/inetd.c (main, tcpmux, chargen_dg, chargen_stream, nextconfig,
newstr, run_service): Fix indentation.
diff --git a/ChangeLog b/ChangeLog
index 10d1fce..e671769 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-25 Alfred M. Szmidt <address@hidden>
+
+ * src/inetd.c (main, tcpmux, chargen_dg, chargen_stream)
+ (nextconfig, newstr, run_service): Fix indentation.
+
2012-02-22 Mats Erik Andersson <address@hidden>
* tests/ping-localhost.sh, tests/traceroute-localhost.sh: Mend string
diff --git a/src/inetd.c b/src/inetd.c
index fe221da..1554ddd 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -429,7 +429,8 @@ run_service (int ctrl, struct servtab *sep)
close (ctrl);
dup2 (0, 1);
dup2 (0, 2);
- if ((pwd = getpwnam (sep->se_user)) == NULL)
+ pwd = getpwnam (sep->se_user);
+ if (pwd == NULL)
{
syslog (LOG_ERR, "%s/%s: %s: No such user",
sep->se_service, sep->se_proto, sep->se_user);
@@ -439,7 +440,8 @@ run_service (int ctrl, struct servtab *sep)
}
if (sep->se_group && *sep->se_group)
{
- if ((grp = getgrnam (sep->se_group)) == NULL)
+ grp = getgrnam (sep->se_group);
+ if (grp == NULL)
{
syslog (LOG_ERR, "%s/%s: %s: No such group",
sep->se_service, sep->se_proto, sep->se_group);
@@ -524,7 +526,8 @@ char *
newstr (const char *cp)
{
char *s;
- if ((s = strdup (cp ? cp : "")))
+ s = strdup (cp ? cp : "");
+ if (s != NULL)
return s;
syslog (LOG_ERR, "strdup: %m");
exit (-1);
@@ -1244,7 +1247,8 @@ nextconfig (const char *file)
}
while ((sep = getconfigent (fconfig, file, &line)))
{
- if ((pwd = getpwnam (sep->se_user)) == NULL)
+ pwd = getpwnam (sep->se_user);
+ if (pwd == NULL)
{
syslog (LOG_ERR, "%s/%s: No such user '%s', service ignored",
sep->se_service, sep->se_proto, sep->se_user);
@@ -1252,7 +1256,8 @@ nextconfig (const char *file)
}
if (sep->se_group && *sep->se_group)
{
- if ((grp = getgrnam (sep->se_group)) == NULL)
+ grp = getgrnam (sep->se_group);
+ if (grp == NULL)
{
syslog (LOG_ERR, "%s/%s: No such group '%s', service ignored",
sep->se_service, sep->se_proto, sep->se_group);
@@ -1569,7 +1574,8 @@ chargen_stream (int s, struct servtab *sep)
text[LINESIZ + 1] = '\n';
for (rs = ring;;)
{
- if ((len = endring - rs) >= LINESIZ)
+ len = endring - rs;
+ if (len >= LINESIZ)
memmove (text, rs, LINESIZ);
else
{
@@ -1608,7 +1614,8 @@ chargen_dg (int s, struct servtab *sep)
if (recvfrom (s, text, sizeof text, 0, (struct sockaddr *) &sa, &size) < 0)
return;
- if ((len = endring - rs) >= LINESIZ)
+ len = endring - rs;
+ if (len >= LINESIZ)
memmove (text, rs, LINESIZ);
else
{
@@ -1753,7 +1760,8 @@ tcpmux (int s, struct servtab *sep)
int len;
/* Get requested service name */
- if ((len = fd_getline (s, service, MAX_SERV_LEN)) < 0)
+ len = fd_getline (s, service, MAX_SERV_LEN);
+ if (len < 0)
{
strwrite (s, "-Error reading service name\r\n");
_exit (1);
@@ -1977,7 +1985,8 @@ main (int argc, char *argv[], char *envp[])
signal_unblock (NULL);
}
readable = allsock;
- if ((n = select (maxsock + 1, &readable, NULL, NULL, NULL)) <= 0)
+ n = select (maxsock + 1, &readable, NULL, NULL, NULL);
+ if (n <= 0)
{
if (n < 0 && errno != EINTR)
syslog (LOG_WARNING, "select: %m");
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 32 ++++++++++++++++++++++
bootstrap | 28 ++++++++++++++-----
bootstrap.conf | 2 +-
cfg.mk | 7 ++++-
ftp/Makefile.am | 2 +-
ftpd/Makefile.am | 2 +-
ifconfig/Makefile.am | 2 +-
libls/Makefile.am | 2 +-
ping/Makefile.am | 4 +-
src/Makefile.am | 32 +++++++++++-----------
src/inetd.c | 27 ++++++++++++------
talk/Makefile.am | 2 +-
talkd/Makefile.am | 2 +-
telnet/Makefile.am | 2 +-
telnetd/Makefile.am | 2 +-
telnetd/state.c | 5 ++-
telnetd/telnetd.c | 68 +++++++++++++++++++++++++----------------------
telnetd/term.c | 71 +++++++++++++++++++++++++++++++++-----------------
telnetd/utility.c | 4 +-
tests/addrpeek.c | 6 ++--
whois/Makefile.am | 2 +-
21 files changed, 195 insertions(+), 109 deletions(-)
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-44-gd7be6fb,
Alfred M. Szmidt <=