diff --git a/net/fping/Makefile b/net/fping/Makefile index c128230796f..ec89d05b692 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/12/06 06:05:43 form Exp $ +# $OpenBSD: Makefile,v 1.9 2001/12/06 06:25:31 form Exp $ # $FreeBSD: ports/net/fping/Makefile,v 1.8 2000/03/22 00:26:51 obrien Exp $ COMMENT= "quickly ping N hosts w/o flooding the network" @@ -18,7 +18,7 @@ MAINTAINER= Oleg Safiullin CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --bindir=${PREFIX}/sbin -COPTS= -DHAVE_SNPRINTF -DHAVE_PROGNAME +COPTS= -DHAVE_PROGNAME do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/fping ${PREFIX}/sbin diff --git a/net/fping/patches/patch-fping_c b/net/fping/patches/patch-fping_c index 19d37ce4816..c626ac38935 100644 --- a/net/fping/patches/patch-fping_c +++ b/net/fping/patches/patch-fping_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-fping_c,v 1.1 2001/12/06 06:05:43 form Exp $ +$OpenBSD: patch-fping_c,v 1.2 2001/12/06 06:25:32 form Exp $ --- fping.c.orig Thu Jan 9 02:29:43 1997 +++ fping.c Thu Dec 6 11:44:20 2001 @@ -186,7 +186,11 @@ extern "C" { @@ -66,20 +66,6 @@ $OpenBSD: patch-fping_c,v 1.1 2001/12/06 06:05:43 form Exp $ if (strcmp(filename,"-")==0) { ping_file=fdopen(0,"r"); } else { -@@ -671,8 +693,11 @@ int main(int argc, char **argv) - } - if (!ping_file) errno_crash_and_burn("fopen"); - while(fgets(line,132,ping_file)) { -- if (sscanf(line,"%s",host) != 1) -- continue; -+#ifdef HAVE_SNPRINTF -+ snprintf(host,sizeof(host),"%s",line); -+#else -+ sprintf(host,"%s",line); -+#endif - if ((!*host) || (host[0]=='#')) /* magic to avoid comments */ - continue; - p = cpystr(host); @@ -1099,6 +1124,8 @@ int wait_for_reply() result=recvfrom_wto(s,buffer,4096,