From 3aa3fd836065b7c3bae736f0fdf59476d5e398f4 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sat, 17 May 2008 22:01:12 +0000 Subject: [PATCH] Move patches for tnftp into contrib/ and remove -I- to make gcc4 quieter. --- contrib/tnftp/cmds.c | 1 + contrib/tnftp/fetch.c | 1 + contrib/tnftp/ftp_var.h | 1 + contrib/tnftp/util.c | 3 +-- usr.bin/ftp/Makefile | 6 ++---- usr.bin/ftp/cmds.c.patch | 16 ---------------- usr.bin/ftp/fetch.c.patch | 15 --------------- usr.bin/ftp/ftp_var.h.patch | 15 --------------- usr.bin/ftp/util.c.patch | 17 ----------------- 9 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 usr.bin/ftp/cmds.c.patch delete mode 100644 usr.bin/ftp/fetch.c.patch delete mode 100644 usr.bin/ftp/ftp_var.h.patch delete mode 100644 usr.bin/ftp/util.c.patch diff --git a/contrib/tnftp/cmds.c b/contrib/tnftp/cmds.c index 7a328503c5..3fc2b70f57 100644 --- a/contrib/tnftp/cmds.c +++ b/contrib/tnftp/cmds.c @@ -116,6 +116,7 @@ __RCSID("$NetBSD: cmds.c,v 1.125 2008/05/10 00:05:31 skd Exp $"); #include #include #include +#include #include #include #include diff --git a/contrib/tnftp/fetch.c b/contrib/tnftp/fetch.c index 351b1797cc..4e857e3bf2 100644 --- a/contrib/tnftp/fetch.c +++ b/contrib/tnftp/fetch.c @@ -58,6 +58,7 @@ __RCSID("$NetBSD: fetch.c,v 1.185 2008/04/28 20:24:13 martin Exp $"); #include #include #include +#include #include #include #include diff --git a/contrib/tnftp/ftp_var.h b/contrib/tnftp/ftp_var.h index 2c5d0531fc..fb08fa1904 100644 --- a/contrib/tnftp/ftp_var.h +++ b/contrib/tnftp/ftp_var.h @@ -101,6 +101,7 @@ #endif #include +#include #include #include diff --git a/contrib/tnftp/util.c b/contrib/tnftp/util.c index bc7f690926..636989e40f 100644 --- a/contrib/tnftp/util.c +++ b/contrib/tnftp/util.c @@ -1465,8 +1465,7 @@ void ftp_sl_add(StringList *sl, char *i) { - if (sl_add(sl, i) == -1) - err(1, "Unable to add `%s' to stringlist", i); + sl_add(sl, i); } /* diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 920ce08950..7b3ef65bee 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.bin/ftp/Makefile,v 1.11.2.1 2000/05/16 04:25:19 cpiazza Exp $ -# $DragonFly: src/usr.bin/ftp/Makefile,v 1.4 2006/11/08 21:54:52 pavalos Exp $ +# $DragonFly: src/usr.bin/ftp/Makefile,v 1.5 2008/05/17 22:01:12 pavalos Exp $ # $NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $ # from: @(#)Makefile 8.2 (Berkeley) 4/3/94 @@ -14,9 +14,7 @@ PROG= ftp SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \ progressbar.c ruserpass.c util.c -SRCS+= cmds.c.patch fetch.c.patch ftp_var.h.patch util.c.patch - -CFLAGS+=-DINET6 -I${.OBJDIR} -I- -I${CONTRIBDIR} -I${.CURDIR}/../../lib/libc/stdtime +CFLAGS+=-DINET6 -I${.OBJDIR} -I${CONTRIBDIR} -I${.CURDIR}/../../lib/libc/stdtime LDADD+= -ledit -ltermcap -lutil DPADD+= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL} diff --git a/usr.bin/ftp/cmds.c.patch b/usr.bin/ftp/cmds.c.patch deleted file mode 100644 index d471a788e8..0000000000 --- a/usr.bin/ftp/cmds.c.patch +++ /dev/null @@ -1,16 +0,0 @@ -$DragonFly: src/usr.bin/ftp/Attic/cmds.c.patch,v 1.1 2005/11/13 11:59:03 corecode Exp $ -Index: cmds.c -=================================================================== -RCS file: /cvs/src/contrib/lukemftp/cmds.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 cmds.c ---- cmds.c 13 Nov 2005 11:28:53 -0000 1.1.1.1 -+++ cmds.c 13 Nov 2005 11:30:19 -0000 -@@ -123,6 +123,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/usr.bin/ftp/fetch.c.patch b/usr.bin/ftp/fetch.c.patch deleted file mode 100644 index 8b0bbb7f0c..0000000000 --- a/usr.bin/ftp/fetch.c.patch +++ /dev/null @@ -1,15 +0,0 @@ -$DragonFly: src/usr.bin/ftp/Attic/fetch.c.patch,v 1.1 2005/11/13 11:59:03 corecode Exp $ -=================================================================== -RCS file: /cvs/src/contrib/lukemftp/fetch.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 fetch.c ---- fetch.c 13 Nov 2005 11:28:53 -0000 1.1.1.1 -+++ fetch.c 13 Nov 2005 11:30:19 -0000 -@@ -65,6 +65,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/usr.bin/ftp/ftp_var.h.patch b/usr.bin/ftp/ftp_var.h.patch deleted file mode 100644 index 791b3a7f50..0000000000 --- a/usr.bin/ftp/ftp_var.h.patch +++ /dev/null @@ -1,15 +0,0 @@ -$DragonFly: src/usr.bin/ftp/Attic/ftp_var.h.patch,v 1.1 2005/11/13 11:59:03 corecode Exp $ -=================================================================== -RCS file: /cvs/src/contrib/lukemftp/ftp_var.h,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 ftp_var.h ---- ftp_var.h 13 Nov 2005 11:28:53 -0000 1.1.1.1 -+++ ftp_var.h 13 Nov 2005 11:30:19 -0000 -@@ -108,6 +108,7 @@ - #endif - - #include -+#include - - #include - #include diff --git a/usr.bin/ftp/util.c.patch b/usr.bin/ftp/util.c.patch deleted file mode 100644 index 52e740ef64..0000000000 --- a/usr.bin/ftp/util.c.patch +++ /dev/null @@ -1,17 +0,0 @@ -$DragonFly: src/usr.bin/ftp/Attic/util.c.patch,v 1.1 2005/11/13 11:59:03 corecode Exp $ -=================================================================== -RCS file: /cvs/src/contrib/lukemftp/util.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 util.c ---- util.c 13 Nov 2005 11:28:53 -0000 1.1.1.1 -+++ util.c 13 Nov 2005 11:30:19 -0000 -@@ -1446,8 +1446,7 @@ - xsl_add(StringList *sl, char *i) - { - -- if (sl_add(sl, i) == -1) -- err(1, "Unable to add `%s' to stringlist", i); -+ sl_add(sl, i); - } - - /* -- 2.41.0