[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-163-g8042e
|
From: |
Mats Erik Andersson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-163-g8042e80 |
|
Date: |
Fri, 07 Sep 2012 14:48:20 +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 8042e80fa1e4c76a883a7148ffa6a3041cfbb400 (commit)
via 04d5c05aa8cf8e937ab1208ccc41a0371f1659c5 (commit)
via 63af745d06d893b8497621cc9e521a1bebd1c1a7 (commit)
from b763dbc51e7306d94270cedc982006047e04f60f (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=8042e80fa1e4c76a883a7148ffa6a3041cfbb400
commit 8042e80fa1e4c76a883a7148ffa6a3041cfbb400
Author: Mats Erik Andersson <address@hidden>
Date: Fri Sep 7 15:47:24 2012 +0200
traceroute: Support IDN named hosts.
Cover compiler warnings in ping, ping6, inetd.
diff --git a/ChangeLog b/ChangeLog
index fc1a0e7..dc999f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,70 @@
2012-09-07 Mats Erik Andersson <address@hidden>
+ traceroute: Support IDN named hosts.
+
+ * configure.ac: Check traceroute_BUILD and LIBIDN in
+ summary message.
+ * src/Makefile.am (traceroute_LDADD): Add $(LIBIDN).
+ (INCLUDES): Add $(INCIDN).
+
+ * src/traceroute.c: Include <unused_parameter.h>
+ [HAVE_LOCALE_H]: Include <locale.h>.
+ [HAVE_IDNA_H]: Include <idna.h>.
+ (argp_options, argp): Add missing fields.
+ (main): New variables RC and RHOST. Let getaddrinfo()
+ resolve RHOST.
+ [HAVE_SETLOCALE]: Call setlocale().
+ [HAVE_IDN]: Call idna_to_ascii_lz().
+ (do_try): Add _GL_UNUSED_PARAMETER.
+
+ ping, ping6: Use setlocale() independently of IDN.
+ Attend to some compiler warnings.
+
+ * ping/libping.c: Remove inclusion of <locale.h>.
+ (ping_set_dest): Remove call to setlocale().
+ * ping/ping.c: Include <unused-parameter.h>.
+ [HAVE_LOCALE_H]: Include <locale.h>.
+ (argp_options, argp): Add missing fields.
+ (main) [HAVE_SETLOCALE]: Call setlocale().
+ (sig_int): Add _GL_UNUSED_PARAMETER.
+ (ping_run): Declare NRESP and I as size_t.
+ (send_echo): Declare OFF as size_t.
+ * ping/ping6.c: Include <unused-parameter.h>.
+ (argp_options, argp): Add missing fields.
+ (main) [HAVE_SETLOCALE]: Call setlocale().
+ (sig_int, print_echo, ping_init): Add _GL_UNUSED_PARAMETER.
+ (ping_run): Declare NRESP size_t and I as `unsigned long'.
+ (send_echo): Declare OFF as size_t.
+ (ping_echo): Replace format string "%d" by "%zd".
+ (ping_set_dest): Remove call setlocale().
+ * ping/ping_address.c: Include <unused-address.h>.
+ (print_address): Add _GL_UNUSED_PARAMETER.
+ * ping/ping_common.c: Include <unused-address.h>.
+ (init_data_buffer): Use `size_t len' as second parameter.
+ Declare I as size_t.
+ (decode_pattern): Add _GL_UNUSED_PARAMETER.
+ * ping/ping_common.h (init_data_buffer): Update prototype.
+ * ping/ping_echo.c: Include <unused-parameter.h>.
+ (ping_echo): Replace format string "%d" by "%zd".
+ (print_echo, print_ip_data): Add _GL_UNUSED_PARAMETER.
+ (print_icmp_code): Declare HLEN as size_t.
+ (print_ip_header): Declare J as size_t.
+ (icmp_diag): Add missing fields.
+ * ping/ping_timestamp.c: Include <unused-parameter.h>.
+ (print_timestamp): Add _GL_UNUSED_PARAMETER.
+
+ inetd: Attend to compiler warnings.
+
+ * src/inetd.c (toomany): Declare as unsigned.
+ (argp_options, argp): Add missing fields.
+ (struct servtab): Declare se_count as unsigned.
+ (enter): Declare I as size_t.
+ (parse_opt, echo_dg, discard_dg, chargen_dg)
+ (machtime_stream, machtime_dg, daytime_stream)
+ (daytime_dg): Add _GL_UNUSED_PARAMETER.
+
+2012-09-07 Mats Erik Andersson <address@hidden>
+
talk, talkd: Compiler warnings.
* talk/ctl.c (daemon_addr, ctl_addr, my_addr): Remove
diff --git a/configure.ac b/configure.ac
index 5d9bccd..8681b98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1010,7 +1010,8 @@ ${talk_BUILD:+$LIBCURSES}
telnet ${enable_telnet} \
${telnet_BUILD:+${KERBEROS_VERSION:+$KERBEROS_VERSION }$LIBTERMCAP}
tftp ${enable_tftp}
- traceroute ${enable_traceroute}
+ traceroute ${enable_traceroute} \
+${traceroute_BUILD:+$LIBIDN}
whois ${enable_whois}
Servers:
diff --git a/ping/libping.c b/ping/libping.c
index a2bf3d7..ac99b9d 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -33,9 +33,6 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
#ifdef HAVE_IDNA_H
# include <idna.h>
#endif
@@ -284,9 +281,6 @@ ping_set_dest (PING * ping, char *host)
char *p;
int rc;
-# ifdef HAVE_SETLOCALE
- setlocale(LC_ALL, "");
-# endif
rc = idna_to_ascii_lz (host, &p, 0);
if (rc)
return 1;
diff --git a/ping/ping.c b/ping/ping.c
index 22f5368..0c3de3d 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -42,8 +42,12 @@
#include <ctype.h>
#include <errno.h>
#include <limits.h>
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
#include <argp.h>
+#include <unused-parameter.h>
#include <ping.h>
#include "ping_impl.h"
#include "libinetutils.h"
@@ -137,7 +141,7 @@ static struct argp_option argp_options[] = {
"which is one of \"tsonly\" and \"tsaddr\"", GRP+1},
{"size", 's', "NUMBER", 0, "send NUMBER data octets", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -257,7 +261,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char **argv)
@@ -268,6 +273,10 @@ main (int argc, char **argv)
set_program_name (argv[0]);
+# ifdef HAVE_SETLOCALE
+ setlocale(LC_ALL, "");
+# endif
+
if (getuid () == 0)
is_root = true;
@@ -364,7 +373,7 @@ decode_ip_timestamp (char *arg)
int volatile stop = 0;
void
-sig_int (int signal)
+sig_int (int signal _GL_UNUSED_PARAMETER)
{
stop = 1;
}
@@ -378,8 +387,8 @@ ping_run (PING * ping, int (*finish) ())
struct timeval last, intvl, now;
struct timeval *t = NULL;
int finishing = 0;
- int nresp = 0;
- int i;
+ size_t nresp = 0;
+ size_t i;
signal (SIGINT, sig_int);
@@ -487,7 +496,7 @@ ping_run (PING * ping, int (*finish) ())
int
send_echo (PING * ping)
{
- int off = 0;
+ size_t off = 0;
if (PING_TIMING (data_length))
{
diff --git a/ping/ping6.c b/ping/ping6.c
index 4f3e948..e8f895e 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -48,6 +48,7 @@
# include <idna.h>
#endif
+#include <unused-parameter.h>
#include <xalloc.h>
#include "ping6.h"
#include "libinetutils.h"
@@ -108,7 +109,7 @@ static struct argp_option argp_options[] = {
{"quiet", 'q', NULL, 0, "quiet output", GRP+1},
{"size", 's', "NUMBER", 0, "send NUMBER data octets", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -193,7 +194,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char **argv)
@@ -203,6 +205,10 @@ main (int argc, char **argv)
set_program_name (argv[0]);
+# ifdef HAVE_SETLOCALE
+ setlocale (LC_ALL, "");
+# endif
+
if (getuid () == 0)
is_root = true;
@@ -251,7 +257,7 @@ main (int argc, char **argv)
static volatile int stop = 0;
static void
-sig_int (int signal)
+sig_int (int signal _GL_UNUSED_PARAMETER)
{
stop = 1;
}
@@ -265,8 +271,8 @@ ping_run (PING * ping, int (*finish) ())
struct timeval last, intvl, now;
struct timeval *t = NULL;
int finishing = 0;
- int nresp = 0;
- int i;
+ size_t nresp = 0;
+ unsigned long i;
signal (SIGINT, sig_int);
@@ -377,7 +383,7 @@ ping_run (PING * ping, int (*finish) ())
static int
send_echo (PING * ping)
{
- int off = 0;
+ size_t off = 0;
if (PING_TIMING (data_length))
{
@@ -459,7 +465,7 @@ ping_echo (char *hostname)
error (EXIT_FAILURE, 0, "getnameinfo: %s", errmsg);
}
- printf ("PING %s (%s): %d data bytes",
+ printf ("PING %s (%s): %zu data bytes",
ping->ping_hostname, buffer, data_length);
if (options & OPT_VERBOSE)
printf (", id 0x%04x = %u", ping->ping_ident, ping->ping_ident);
@@ -481,7 +487,8 @@ ping_reset (PING * p)
static int
print_echo (int dupflag, int hops, struct ping_stat *ping_stat,
- struct sockaddr_in6 *dest, struct sockaddr_in6 *from,
+ struct sockaddr_in6 *dest _GL_UNUSED_PARAMETER,
+ struct sockaddr_in6 *from,
struct icmp6_hdr *icmp6, int datalen)
{
int err;
@@ -696,7 +703,7 @@ echo_finish (void)
}
static PING *
-ping_init (int type, int ident)
+ping_init (int type _GL_UNUSED_PARAMETER, int ident)
{
int fd, err;
const int on = 1;
@@ -886,9 +893,6 @@ ping_set_dest (PING * ping, char *host)
char *rhost;
#ifdef HAVE_IDN
-# ifdef HAVE_SETLOCALE
- setlocale (LC_ALL, "");
-# endif
err = idna_to_ascii_lz (host, &rhost, 0);
if (err)
return 1;
diff --git a/ping/ping_address.c b/ping/ping_address.c
index fcc0c60..35bc4ba 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -40,6 +40,7 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
+#include <unused-parameter.h>
#include <ping.h>
#include <ping_impl.h>
@@ -89,9 +90,11 @@ recv_address (int code, void *closure,
}
void
-print_address (int dupflag, void *closure,
- struct sockaddr_in *dest, struct sockaddr_in *from,
- struct ip *ip, icmphdr_t * icmp, int datalen)
+print_address (int dupflag, void *closure _GL_UNUSED_PARAMETER,
+ struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+ struct sockaddr_in *from,
+ struct ip *ip _GL_UNUSED_PARAMETER,
+ icmphdr_t * icmp, int datalen)
{
struct in_addr addr;
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 8f2fcf9..59afb86 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -30,6 +30,7 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <xalloc.h>
+#include <unused-parameter.h>
#include "ping_common.h"
@@ -59,9 +60,9 @@ ping_cvt_number (const char *optarg, size_t maxval, int
allow_zero)
}
void
-init_data_buffer (unsigned char * pat, int len)
+init_data_buffer (unsigned char * pat, size_t len)
{
- int i = 0;
+ size_t i = 0;
unsigned char *p;
if (data_length == 0)
@@ -87,7 +88,7 @@ init_data_buffer (unsigned char * pat, int len)
void
decode_pattern (const char *text, int *pattern_len,
- unsigned char *pattern_data)
+ unsigned char *pattern_data _GL_UNUSED_PARAMETER)
{
int i, c, off;
diff --git a/ping/ping_common.h b/ping/ping_common.h
index 68f477c..5cf3e8c 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -154,7 +154,7 @@ size_t ping_cvt_number (const char *optarg, size_t maxval,
int allow_zero);
int is_normed_time (n_time t);
const char * ping_cvt_time (char *buf, size_t buflen, n_time t);
-void init_data_buffer (unsigned char *pat, int len);
+void init_data_buffer (unsigned char *pat, size_t len);
void decode_pattern (const char *text, int *pattern_len,
unsigned char *pattern_data);
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index cd3cdf1..7ba698a 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -40,6 +40,7 @@
#include <ctype.h>
#include <errno.h>
#include <limits.h>
+#include <unused-parameter.h>
#include <ping.h>
#include "ping_impl.h"
@@ -138,7 +139,7 @@ ping_echo (char *hostname)
#endif /* IP_OPTIONS */
}
- printf ("PING %s (%s): %d data bytes",
+ printf ("PING %s (%s): %zu data bytes",
ping->ping_hostname,
inet_ntoa (ping->ping_dest.ping_sockaddr.sin_addr), data_length);
if (options & OPT_VERBOSE)
@@ -172,7 +173,8 @@ handler (int code, void *closure,
int
print_echo (int dupflag, struct ping_stat *ping_stat,
- struct sockaddr_in *dest, struct sockaddr_in *from,
+ struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+ struct sockaddr_in *from,
struct ip *ip, icmphdr_t * icmp, int datalen)
{
int hlen;
@@ -297,7 +299,7 @@ print_icmp_code (int type, int code, char *prefix)
static void
print_ip_header (struct ip *ip)
{
- int hlen;
+ size_t hlen;
unsigned char *cp;
hlen = ip->ip_hl << 2;
@@ -305,7 +307,7 @@ print_ip_header (struct ip *ip)
if (options & OPT_VERBOSE)
{
- int j;
+ size_t j;
printf ("IP Hdr Dump:\n ");
for (j = 0; j < sizeof (*ip); ++j)
@@ -330,7 +332,7 @@ print_ip_header (struct ip *ip)
}
void
-print_ip_data (icmphdr_t * icmp, void *data)
+print_ip_data (icmphdr_t * icmp, void *data _GL_UNUSED_PARAMETER)
{
int hlen;
unsigned char *cp;
@@ -377,21 +379,21 @@ print_parameterprob (icmphdr_t * icmp, void *data)
}
struct icmp_diag icmp_diag[] = {
- {ICMP_ECHOREPLY, "Echo Reply", NULL},
+ {ICMP_ECHOREPLY, "Echo Reply", NULL, NULL},
{ICMP_DEST_UNREACH, NULL, print_icmp, "Dest Unreachable"},
- {ICMP_SOURCE_QUENCH, "Source Quench", print_ip_data},
+ {ICMP_SOURCE_QUENCH, "Source Quench", print_ip_data, NULL},
{ICMP_REDIRECT, NULL, print_icmp, "Redirect"},
- {ICMP_ECHO, "Echo Request", NULL},
- {ICMP_ROUTERADV, "Router Advertisment", NULL},
- {ICMP_ROUTERDISCOVERY, "Router Discovery", NULL},
+ {ICMP_ECHO, "Echo Request", NULL, NULL},
+ {ICMP_ROUTERADV, "Router Advertisment", NULL, NULL},
+ {ICMP_ROUTERDISCOVERY, "Router Discovery", NULL, NULL},
{ICMP_TIME_EXCEEDED, NULL, print_icmp, "Time exceeded"},
- {ICMP_PARAMETERPROB, NULL, print_parameterprob},
- {ICMP_TIMESTAMP, "Timestamp", NULL},
- {ICMP_TIMESTAMPREPLY, "Timestamp Reply", NULL},
- {ICMP_INFO_REQUEST, "Information Request", NULL},
- {ICMP_INFO_REPLY, "Information Reply", NULL},
- {ICMP_ADDRESS, "Address Mask Request", NULL},
- {ICMP_ADDRESSREPLY, "Address Mask Reply", NULL},
+ {ICMP_PARAMETERPROB, NULL, print_parameterprob, NULL},
+ {ICMP_TIMESTAMP, "Timestamp", NULL, NULL},
+ {ICMP_TIMESTAMPREPLY, "Timestamp Reply", NULL, NULL},
+ {ICMP_INFO_REQUEST, "Information Request", NULL, NULL},
+ {ICMP_INFO_REPLY, "Information Reply", NULL, NULL},
+ {ICMP_ADDRESS, "Address Mask Request", NULL, NULL},
+ {ICMP_ADDRESSREPLY, "Address Mask Reply", NULL, NULL},
};
void
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index c0c22e6..3d59f95 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -39,6 +39,7 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
+#include <unused-parameter.h>
#include <ping.h>
#include <ping_impl.h>
@@ -89,9 +90,11 @@ recv_timestamp (int code, void *closure,
void
-print_timestamp (int dupflag, void *closure,
- struct sockaddr_in *dest, struct sockaddr_in *from,
- struct ip *ip, icmphdr_t * icmp, int datalen)
+print_timestamp (int dupflag, void *closure _GL_UNUSED_PARAMETER,
+ struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+ struct sockaddr_in *from,
+ struct ip *ip _GL_UNUSED_PARAMETER,
+ icmphdr_t * icmp, int datalen)
{
char timestr[16];
diff --git a/src/Makefile.am b/src/Makefile.am
index 718c75e..c812453 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,7 @@ EXTRA_PROGRAMS += tftp
bin_PROGRAMS += $(traceroute_BUILD)
traceroute_SOURCES = traceroute.c
-traceroute_LDADD = $(top_builddir)/libicmp/libicmp.a $(LDADD)
+traceroute_LDADD = $(top_builddir)/libicmp/libicmp.a $(LDADD) $(LIBIDN)
EXTRA_PROGRAMS += traceroute
inetdaemon_PROGRAMS += $(inetd_BUILD)
@@ -100,7 +100,7 @@ uucpd_SOURCES = uucpd.c
uucpd_LDADD = $(LDADD) $(LIBCRYPT)
EXTRA_PROGRAMS += uucpd
-INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libicmp
+INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libicmp $(INCIDN)
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_UTMPX) $(PATHDEF_UUCICO)
diff --git a/src/inetd.c b/src/inetd.c
index 1554ddd..bb1181c 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -156,7 +156,7 @@ int nsock, maxsock;
fd_set allsock;
int options;
int timingout;
-int toomany = TOOMANY;
+unsigned toomany = TOOMANY;
char **Argv;
char *LastArg;
@@ -197,11 +197,12 @@ static struct argp_option argp_options[] = {
"resolve IP addresses when setting environment variables "
"(see --environment)", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg,
+ struct argp_state *state _GL_UNUSED_PARAMETER)
{
char *p;
int number;
@@ -243,7 +244,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
struct servtab
@@ -270,7 +272,7 @@ struct servtab
struct sockaddr_storage se_ctrladdr; /* bound address */
socklen_t se_addrlen; /* exact address length in use */
unsigned se_refcnt;
- int se_count; /* number started since se_time */
+ unsigned se_count; /* number started since se_time */
struct timeval se_time; /* start of se_count */
struct servtab *se_next;
} *servtab;
@@ -711,7 +713,7 @@ enter (struct servtab *cp)
{
struct servtab *sep;
SIGSTATUS sigstatus;
- int i;
+ size_t i;
/* Checking/Removing duplicates */
for (sep = servtab; sep; sep = sep->se_next)
@@ -1493,7 +1495,7 @@ echo_stream (int s, struct servtab *sep)
/* Echo service -- echo data back */
void
-echo_dg (int s, struct servtab *sep)
+echo_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
char buffer[BUFSIZE];
int i;
@@ -1531,7 +1533,7 @@ discard_stream (int s, struct servtab *sep)
void
/* Discard service -- ignore data */
-discard_dg (int s, struct servtab *sep)
+discard_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
char buffer[BUFSIZE];
@@ -1592,7 +1594,7 @@ chargen_stream (int s, struct servtab *sep)
/* Character generator */
void
-chargen_dg (int s, struct servtab *sep)
+chargen_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
#ifdef IPV6
struct sockaddr_storage sa;
@@ -1654,7 +1656,7 @@ machtime (void)
}
void
-machtime_stream (int s, struct servtab *sep)
+machtime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
long result;
@@ -1663,7 +1665,7 @@ machtime_stream (int s, struct servtab *sep)
}
void
-machtime_dg (int s, struct servtab *sep)
+machtime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
long result;
#ifdef IPV6
@@ -1684,7 +1686,7 @@ machtime_dg (int s, struct servtab *sep)
void
/* Return human-readable time of day */
-daytime_stream (int s, struct servtab *sep)
+daytime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
char buffer[256];
time_t lclock;
@@ -1697,7 +1699,7 @@ daytime_stream (int s, struct servtab *sep)
/* Return human-readable time of day */
void
-daytime_dg (int s, struct servtab *sep)
+daytime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
{
char buffer[256];
time_t lclock;
diff --git a/src/traceroute.c b/src/traceroute.c
index 8332167..0a3ad38 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -46,7 +46,14 @@
#include <limits.h>
#include <assert.h>
#include <argp.h>
+#include <unused-parameter.h>
#include <icmp.h>
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
+#ifdef HAVE_IDNA_H
+# include <idna.h>
+#endif
#include "xalloc.h"
#include "libinetutils.h"
@@ -129,7 +136,7 @@ static struct argp_option argp_options[] = {
{"type", 'M', "METHOD", 0, "use METHOD (`icmp' or `udp') for traceroute "
"operations", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -190,30 +197,47 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char **argv)
{
- int hop;
+ int hop, rc;
+ char *rhost;
struct addrinfo hints, *res;
trace_t trace;
set_program_name (argv[0]);
+#ifdef HAVE_SETLOCALE
+ setlocale (LC_ALL, "");
+#endif
+
pid = getpid();
/* Parse command line */
iu_argp_init ("traceroute", program_authors);
argp_parse (&argp, argc, argv, 0, NULL, NULL);
+ if ((hostname == NULL) || (*hostname == '\0'))
+ error (EXIT_FAILURE, 0, "unknown host");
+
/* Hostname lookup first for better information */
memset (&hints, 0, sizeof (hints));
hints.ai_family = AF_INET;
hints.ai_flags = AI_CANONNAME;
- if ((hostname == NULL) || (*hostname == '\0')
- || getaddrinfo (hostname, NULL, &hints, &res))
+#ifdef HAVE_IDN
+ rc = idna_to_ascii_lz (hostname, &rhost, 0);
+ if (rc)
+ error (EXIT_FAILURE, 0, "unknown host");
+#else /* !HAVE_IDN */
+ rhost = hostname;
+#endif
+
+ rc = getaddrinfo (rhost, NULL, &hints, &res);
+ if (rc)
error (EXIT_FAILURE, 0, "unknown host");
memcpy (&dest, res->ai_addr, res->ai_addrlen);
@@ -247,7 +271,8 @@ main (int argc, char **argv)
void
do_try (trace_t * trace, const int hop,
- const int max_hops, const int max_tries)
+ const int max_hops _GL_UNUSED_PARAMETER,
+ const int max_tries)
{
fd_set readset;
int ret, tries, readonly = 0;
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=04d5c05aa8cf8e937ab1208ccc41a0371f1659c5
commit 04d5c05aa8cf8e937ab1208ccc41a0371f1659c5
Author: Mats Erik Andersson <address@hidden>
Date: Fri Sep 7 13:10:45 2012 +0200
talk, talkd: Compiler warnings.
diff --git a/ChangeLog b/ChangeLog
index b110c35..fc1a0e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2012-09-07 Mats Erik Andersson <address@hidden>
+ talk, talkd: Compiler warnings.
+
+ * talk/ctl.c (daemon_addr, ctl_addr, my_addr): Remove
+ initial values, since they are incomplete.
+ (open_sockt): Set `my_addr.sin_family' and `my_addr.sin_len'.
+ (open_ctl): Likewise with `ctl_addr'.
+ * talk/ctl_transact.c (ctl_transact): Likewise with
+ `daemon_addr'. Call htons() with `daemon_port'.
+ * talk/get_addrs.c (daemon_port): Use in host byte order,
+ calling ntohs() on `sp->s_port'.
+ * talk/invite.c: Include <unused-parameter.h>.
+ (re_invite): Add _GL_UNUSED_PARAMETER. Initialise `daemon_addr'.
+ * talk/msgs.c: Include <unused-parameter.h>.
+ (disp_msg): Add _GL_UNUSED_PARAMETER.
+ * talk/talk.c (argp): Fill in missing fields.
+ * talkd/talkd.c (argp_options, argp): Likewise.
+ (parse_opt): Add _GL_UNUSED_PARAMETER.
+
+2012-09-07 Mats Erik Andersson <address@hidden>
+
syslogd, tftp, tftpd, uucpd: Compiler warnings.
* src/syslogd.c (argp_options, parse_opt): Fill in
diff --git a/talk/ctl.c b/talk/ctl.c
index 29713e9..5d3ba2e 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -62,15 +62,9 @@
#include "talk.h"
#include "talk_ctl.h"
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-struct sockaddr_in daemon_addr = { sizeof (daemon_addr), AF_INET };
-struct sockaddr_in ctl_addr = { sizeof (ctl_addr), AF_INET };
-struct sockaddr_in my_addr = { sizeof (my_addr), AF_INET };
-#else /* !HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-struct sockaddr_in daemon_addr = { AF_INET };
-struct sockaddr_in ctl_addr = { AF_INET };
-struct sockaddr_in my_addr = { AF_INET };
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
+struct sockaddr_in daemon_addr;
+struct sockaddr_in ctl_addr;
+struct sockaddr_in my_addr;
/* inet addresses of the two machines */
struct in_addr my_machine_addr;
@@ -89,6 +83,10 @@ open_sockt (void)
{
socklen_t length;
+ my_addr.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ my_addr.sin_len = sizeof (my_addr);
+#endif
my_addr.sin_addr = my_machine_addr;
my_addr.sin_port = 0;
sockt = socket (AF_INET, SOCK_STREAM, 0);
@@ -109,6 +107,10 @@ open_ctl (void)
{
socklen_t length;
+ ctl_addr.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ ctl_addr.sin_len = sizeof (ctl_addr);
+#endif
ctl_addr.sin_port = 0;
ctl_addr.sin_addr = my_machine_addr;
ctl_sockt = socket (AF_INET, SOCK_DGRAM, 0);
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 47f03fc..2a50942 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -75,8 +75,12 @@ ctl_transact (struct in_addr target, CTL_MSG msg, int type,
CTL_RESPONSE * rp)
struct timeval wait;
msg.type = type;
+ daemon_addr.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ daemon_addr.sin_len = sizeof (daemon_addr);
+#endif
daemon_addr.sin_addr = target;
- daemon_addr.sin_port = daemon_port;
+ daemon_addr.sin_port = htons (daemon_port);
FD_ZERO (&ctl_mask);
FD_SET (ctl_sockt, &ctl_mask);
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 3fc5585..b5e9a0e 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -102,7 +102,7 @@ get_addrs (char *my_machine_name, char *his_machine_name)
"ntalk", "udp");
exit (-1);
}
- daemon_port = sp->s_port;
+ daemon_port = ntohs (sp->s_port);
return 0;
}
diff --git a/talk/invite.c b/talk/invite.c
index d89f60e..37d5304 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -61,6 +61,7 @@
#include <errno.h>
#include <unistd.h>
#include <setjmp.h>
+#include <unused-parameter.h>
#include "talk_ctl.h"
#include "talk.h"
@@ -115,7 +116,7 @@ announce_invite (void)
* Routine called on interupt to re-invite the callee
*/
void
-re_invite (int sig)
+re_invite (int sig _GL_UNUSED_PARAMETER)
{
message ("Ringing your party again");
@@ -194,6 +195,10 @@ send_delete (void)
* and don't wait for an answer
*/
msg.id_num = htonl (remote_id);
+ daemon_addr.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ daemon_addr.sin_len = sizeof (daemon_addr);
+#endif
daemon_addr.sin_addr = his_machine_addr;
if (sendto (ctl_sockt, (const char *) &msg, sizeof (msg), 0,
(struct sockaddr *) &daemon_addr,
diff --git a/talk/msgs.c b/talk/msgs.c
index 4ff3e27..fac1fe9 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -58,6 +58,7 @@
#include <time.h>
#include <signal.h>
#include <stdio.h>
+#include <unused-parameter.h>
#include "talk.h"
#define MSG_INTERVAL 4
@@ -66,7 +67,7 @@ char *current_state;
int current_line = 0;
static void
-disp_msg (int sig)
+disp_msg (int sig _GL_UNUSED_PARAMETER)
{
message (current_state);
}
diff --git a/talk/talk.c b/talk/talk.c
index 4e95b1d..ff7311e 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -81,7 +81,7 @@ const char *program_authors[] =
const char doc[] = "talk to another user";
const char args_doc[] = "person [ttyname]";
-static struct argp argp = { NULL, NULL, args_doc, doc };
+static struct argp argp = { NULL, NULL, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char *argv[])
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 3e4f183..1a7f12e 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -62,11 +62,12 @@ static struct argp_option argp_options[] = {
{"strict-policy", 'S', NULL, 0, "apply strict ACL policy", GRP+1},
{"timeout", 't', "SECONDS", 0, "set timeout value to SECONDS", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg,
+ struct argp_state *state _GL_UNUSED_PARAMETER)
{
switch (key)
{
@@ -105,7 +106,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char *argv[])
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=63af745d06d893b8497621cc9e521a1bebd1c1a7
commit 63af745d06d893b8497621cc9e521a1bebd1c1a7
Author: Mats Erik Andersson <address@hidden>
Date: Fri Sep 7 12:35:30 2012 +0200
Compiler warnings.
diff --git a/ChangeLog b/ChangeLog
index 324dc54..b110c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
2012-09-07 Mats Erik Andersson <address@hidden>
+ syslogd, tftp, tftpd, uucpd: Compiler warnings.
+
+ * src/syslogd.c (argp_options, parse_opt): Fill in
+ non-initialised fields.
+ * src/tftp.c: Include <unused-parameter.h>.
+ (cmdtab, argp_options, parse_opt): Fill in missing fields.
+ (setbinary, setascii, status, intr, quit, settrace)
+ (setverbose, timer): Add _GL_UNUSED_PARAMETER.
+ * src/tftpd.c: Include <unused-parameter.h>.
+ (options, argp, formats): Fill in missing fields.
+ (parse_opt, timeout, justquit): Add _GL_UNUSED_PARAMETER.
+ * src/uucpd.c (arpg): Fill in missing fields.
+
+ Upgrade TFTP test.
+
+ * tests/tftp.sh: Make mode `binary' explicit. Add a case
+ with `ascii' transmission.
+ (ASCIIFILE, type): New variables.
+
+2012-09-07 Mats Erik Andersson <address@hidden>
+
talkd: Full ACL capability.
* talkd/acl.c (struct acl): New member `system'.
diff --git a/src/syslogd.c b/src/syslogd.c
index f96ee85..01a97de 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -357,7 +357,7 @@ static struct argp_option argp_options[] = {
GRP+1},
{"sync", 'S', NULL, 0, "force a file sync on every line", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -460,7 +460,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char *argv[])
diff --git a/src/tftp.c b/src/tftp.c
index 144d67a..c2ed52c 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -73,6 +73,7 @@
#include <string.h>
#include <unistd.h>
#include <argp.h>
+#include <unused-parameter.h>
#include <libinetutils.h>
@@ -179,7 +180,7 @@ struct cmd cmdtab[] = {
{"rexmt", xhelp, setrexmt},
{"timeout", ihelp, settimeout},
{"?", hhelp, help},
- {0}
+ {NULL, NULL, NULL}
};
struct cmd *getcmd (register char *name);
@@ -190,8 +191,8 @@ const char args_doc[] = "[HOST [PORT]]";
const char doc[] = "Trivial file transfer protocol client";
static struct argp_option argp_options[] = {
- {"verbose", 'v', NULL, 0, "verbose output"},
- {NULL}
+ {"verbose", 'v', NULL, 0, "verbose output", 1},
+ {NULL, 0, NULL, 0, NULL, 0}
};
char *hostport_argv[3] = { "connect" };
@@ -253,7 +254,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char *argv[])
@@ -473,13 +475,13 @@ modecmd (int argc, char *argv[])
}
void
-setbinary (int argc, char *argv[])
+setbinary (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
{
settftpmode ("octet");
}
void
-setascii (int argc, char *argv[])
+setascii (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
{
settftpmode ("netascii");
}
@@ -749,7 +751,7 @@ settimeout (int argc, char *argv[])
}
void
-status (int argc, char *argv[])
+status (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
{
if (connected)
printf ("Connected to %s.\n", hostname);
@@ -762,7 +764,7 @@ status (int argc, char *argv[])
}
void
-intr (int signo)
+intr (int signo _GL_UNUSED_PARAMETER)
{
signal (SIGALRM, SIG_IGN);
alarm (0);
@@ -886,7 +888,7 @@ makeargv (void)
}
void
-quit (int argc, char *argv[])
+quit (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
{
exit (EXIT_SUCCESS);
}
@@ -923,14 +925,14 @@ help (int argc, char *argv[])
}
void
-settrace (int argc, char **argv)
+settrace (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
{
trace = !trace;
printf ("Packet tracing %s.\n", trace ? "on" : "off");
}
void
-setverbose (int argc, char **argv)
+setverbose (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
{
verbose = !verbose;
printf ("Verbose mode %s.\n", verbose ? "on" : "off");
@@ -1314,7 +1316,7 @@ printstats (const char *direction, unsigned long amount)
}
static void
-timer (int sig)
+timer (int sig _GL_UNUSED_PARAMETER)
{
timeout += rexmtval;
if (timeout >= maxtimeout)
diff --git a/src/tftpd.c b/src/tftpd.c
index f8f4cff..004803d 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -82,6 +82,7 @@
#include "tftpsubs.h"
+#include <unused-parameter.h>
#include <argp.h>
#include <progname.h>
#include <libinetutils.h>
@@ -133,15 +134,16 @@ static const char *verifyhost (struct sockaddr_storage *,
socklen_t);
static struct argp_option options[] = {
{ "logging", 'l', NULL, 0,
- "enable logging" },
+ "enable logging", 1},
{ "nonexistent", 'n', NULL, 0,
"supress negative acknowledgement of requests for "
- "nonexistent relative filenames" },
- { NULL }
+ "nonexistent relative filenames", 1},
+ { NULL, 0, NULL, 0, NULL, 0}
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg _GL_UNUSED_PARAMETER,
+ struct argp_state *state _GL_UNUSED_PARAMETER)
{
switch (key)
{
@@ -165,7 +167,8 @@ static struct argp argp =
options,
parse_opt,
"directory...",
- "Trivial File Transfer Protocol server"
+ "Trivial File Transfer Protocol server",
+ NULL, NULL, NULL
};
@@ -320,7 +323,7 @@ struct formats
{
{"netascii", validate_access, send_file, recvfile, 1},
{"octet", validate_access, send_file, recvfile, 0},
- {0}
+ {0, NULL, NULL, NULL, 0}
};
/*
@@ -525,7 +528,7 @@ int timeout;
sigjmp_buf timeoutbuf;
void
-timer (int sig)
+timer (int sig _GL_UNUSED_PARAMETER)
{
timeout += rexmtval;
@@ -605,7 +608,7 @@ abort:
}
void
-justquit (int sig)
+justquit (int sig _GL_UNUSED_PARAMETER)
{
exit (EXIT_SUCCESS);
}
diff --git a/src/uucpd.c b/src/uucpd.c
index 0699420..d811682 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -104,10 +104,9 @@ extern char **environ;
static struct argp argp =
{
- NULL,
- NULL,
- NULL,
- "TCP/IP server for uucico"
+ NULL, NULL, NULL,
+ "TCP/IP server for uucico",
+ NULL, NULL, NULL
};
int
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 65e6b77..6efe305 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -278,6 +278,7 @@ test -d "$TMPDIR" && mkdir -p "$TMPDIR/tftp-test" \
}
# It is important to test data of differing sizes.
+# These are binary files.
#
# Input format:
#
@@ -296,6 +297,14 @@ done
FILELIST="`echo "$FILEDATA" | $SED 's/ .*//' | tr "\n" ' '`"
+# Add a file known to be ASCII encoded.
+#
+ASCIIFILE=asciifile.txt
+if test -r tools.sh; then
+ cp tools.sh "$TMPDIR/tftp-test/$ASCIIFILE"
+ FILELIST="$FILELIST $ASCIIFILE"
+fi
+
SUCCESSES=0
EFFORTS=0
RESULT=0
@@ -306,9 +315,13 @@ for addr in $ADDRESSES; do
$silence echo "trying address '$addr'..." >&2
for name in $FILELIST; do
+ test -n "$name" || continue
EFFORTS=`expr $EFFORTS + 1`
- rm -f $name
- echo "get $name" | eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
+ rm -f "$name"
+ test "$name" = $ASCIIFILE && type=ascii || type=binary
+ echo "$type
+get $name" | \
+ eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
result=$?
@@ -355,7 +368,9 @@ if $do_conf_reload; then
for addr in $ADDRESSES; do
EFFORTS=`expr $EFFORTS + 1`
test -f "$name" && rm "$name"
- echo "get $name" | eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
+ echo "binary
+get $name" | \
+ eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
result=$?
if test $result -ne 0; then
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 106 +++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 3 +-
ping/libping.c | 6 ---
ping/ping.c | 21 +++++++---
ping/ping6.c | 28 +++++++------
ping/ping_address.c | 9 +++-
ping/ping_common.c | 7 ++-
ping/ping_common.h | 2 +-
ping/ping_echo.c | 36 +++++++++--------
ping/ping_timestamp.c | 9 +++-
src/Makefile.am | 4 +-
src/inetd.c | 28 +++++++------
src/syslogd.c | 5 +-
src/tftp.c | 26 ++++++------
src/tftpd.c | 19 +++++----
src/traceroute.c | 37 ++++++++++++++---
src/uucpd.c | 7 +--
talk/ctl.c | 20 +++++----
talk/ctl_transact.c | 6 ++-
talk/get_addrs.c | 2 +-
talk/invite.c | 7 +++-
talk/msgs.c | 3 +-
talk/talk.c | 2 +-
talkd/talkd.c | 8 ++-
tests/tftp.sh | 21 ++++++++-
25 files changed, 303 insertions(+), 119 deletions(-)
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-163-g8042e80,
Mats Erik Andersson <=