cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo broken strl* conversion.

Browse Source 
Mostly from Stuart Henderson <stu@spacehopper.org>; ok sturm@
This commit is contained in:
naddy 2007-02-20 20:33:23 +00:00
parent dfae7fe22c
commit 78ecfcb087
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/fping/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.18 2006/11/22 10:22:50 jakob Exp $
# $OpenBSD: Makefile,v 1.19 2007/02/20 20:33:23 naddy 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"
VERSION= 2.4b2
DISTNAME= fping-${VERSION}_to-ipv6
PKGNAME= fping-${VERSION}p0
PKGNAME= fping-${VERSION}p1
CATEGORIES= net
MASTER_SITES= http://www.fping.com/download/
HOMEPAGE= http://www.fping.com/

1
net/fping/distinfo
View File

@ -1,4 +1,5 @@
MD5 (fping-2.4b2_to-ipv6.tar.gz) = 3ad516765514249a40d3c5b6caab812a
RMD160 (fping-2.4b2_to-ipv6.tar.gz) = cff101a53baec9cc23063ff2004db69a3510c51f
SHA1 (fping-2.4b2_to-ipv6.tar.gz) = d310c6fe951f64660d4c0a5f2bd1c5379c1e5bde
SHA256 (fping-2.4b2_to-ipv6.tar.gz) = 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172
SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333

35
net/fping/patches/patch-fping_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-fping_c,v 1.5 2006/10/12 08:22:37 jakob Exp $
$OpenBSD: patch-fping_c,v 1.6 2007/02/20 20:33:23 naddy Exp $
--- fping.c.orig Mon Jan 21 02:06:30 2002
+++ fping.c Mon Jun 19 22:22:42 2006
@@ -42,7 +42,6 @@
@ -119,15 +119,6 @@ $OpenBSD: patch-fping_c,v 1.5 2006/10/12 08:22:37 jakob Exp $
if( sscanf( line, "%s", host ) != 1 )
continue;
@@ -864,7 +882,7 @@ int main( int argc, char **argv )
if( pCopy )
{
/* make a copy of the arg, so we don't damage the original */
- strcpy( pCopy, pStart );
+ strncpy( pCopy, pStart, sizeof(pCopy) );
/* look for token '/' */
if( strtok( pCopy, "/" ) != NULL )
@@ -1503,7 +1521,6 @@ void send_ping( int s, HOST_ENTRY *h )
memset( buffer, 0, ping_pkt_size * sizeof( char ) );
icp = ( FPING_ICMPHDR* )buffer;
@ -190,30 +181,6 @@ $OpenBSD: patch-fping_c,v 1.5 2006/10/12 08:22:37 jakob Exp $
h->waiting = 0;
h->timeout = timeout;
h->num_recv++;
@@ -2214,10 +2237,10 @@ char *na_cat( char *name, struct in_addr
if( !nm )
crash_and_burn( "can't allocate some space for a string" );
- strcpy( nm, name );
- strcat( nm, " (" );
- strcat( nm, as );
- strcat( nm, ")" );
+ strlcpy( nm, name, sizeof(nm) );
+ strlcat( nm, " (", sizeof(nm) );
+ strlcat( nm, as, sizeof(nm) );
+ strlcat( nm, ")", sizeof(nm) );
return( nm );
@@ -2444,7 +2467,7 @@ char *cpystr( char *string )
if( !dst )
crash_and_burn( "can't allocate some space for a string" );
- strcpy( dst, string );
+ strlcpy( dst, string, sizeof(dst) );
return dst;
}/* IF */
@@ -2570,7 +2593,7 @@ char * sprint_tm( int t )
/* <= 0.99 ms */
if( t < 100 )