Module Name: othersrc
Committed By: tron
Date: Sun Dec 13 14:08:09 UTC 2015
Modified Files:
othersrc/usr.bin/tnftp/src: fetch.c ftp.c
Log Message:
(Hopefully) fix build without IPv6 support
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.20 -r1.21 othersrc/usr.bin/tnftp/src/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.22 othersrc/usr.bin/tnftp/src/fetch.c:1.23
--- othersrc/usr.bin/tnftp/src/fetch.c:1.22 Fri Dec 11 08:47:52 2015
+++ othersrc/usr.bin/tnftp/src/fetch.c Sun Dec 13 14:08:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.22 2015/12/11 08:47:52 tron Exp $ */
+/* $NetBSD: fetch.c,v 1.23 2015/12/13 14:08:09 tron Exp $ */
/* from NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp */
/*-
@@ -770,13 +770,17 @@ fetch_url(const char *url, const char *p
}
if (verbose && res0->ai_next) {
+#ifdef INET6
if(res->ai_family == AF_INET6) {
fprintf(ttyout, "Trying [%s]:%s ...\n",
hname, sname);
} else {
+#endif
fprintf(ttyout, "Trying %s:%s ...\n",
hname, sname);
+#ifdef INET6
}
+#endif
}
s = socket(res->ai_family, SOCK_STREAM,
Index: othersrc/usr.bin/tnftp/src/ftp.c
diff -u othersrc/usr.bin/tnftp/src/ftp.c:1.20 othersrc/usr.bin/tnftp/src/ftp.c:1.21
--- othersrc/usr.bin/tnftp/src/ftp.c:1.20 Fri Dec 11 08:47:52 2015
+++ othersrc/usr.bin/tnftp/src/ftp.c Sun Dec 13 14:08:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.20 2015/12/11 08:47:52 tron Exp $ */
+/* $NetBSD: ftp.c,v 1.21 2015/12/13 14:08:09 tron Exp $ */
/* from NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp */
/*-
@@ -208,13 +208,17 @@ hookup(const char *host, const char *por
}
if (verbose && res0->ai_next) {
/* if we have multiple possibilities */
+#ifdef INET6
if(res->ai_family == AF_INET6) {
fprintf(ttyout, "Trying [%s]:%s ...\n", hname,
sname);
} else {
+#endif
fprintf(ttyout, "Trying %s:%s ...\n", hname,
sname);
+#ifdef INET6
}
+#endif
}
s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
if (s < 0) {
