From e6280f9d48073eaa4be938d513403af7d62d57d7 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Mon, 11 Jul 2005 08:27:18 +0000 Subject: - Sync with master port update PR: ports/83181 Submitted by: Vsevolod Stakhov --- security/rdigest/files/patch-ac | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'security/rdigest/files/patch-ac') diff --git a/security/rdigest/files/patch-ac b/security/rdigest/files/patch-ac index a3bf6e32e2fa..bf6ee0d604a2 100644 --- a/security/rdigest/files/patch-ac +++ b/security/rdigest/files/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ +$NetBSD: patch-ac,v 1.2 2005/01/21 02:18:23 tv Exp $ ---- digest.c.orig 2003-07-23 20:27:09.000000000 -0400 +--- digest.c.orig 2005-01-20 21:10:03.000000000 -0500 +++ digest.c @@ -43,9 +43,14 @@ __RCSID("$NetBSD: digest.c,v 1.8 2003/07 #endif @@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ #ifdef HAVE_LOCALE_H #include #endif -@@ -147,21 +152,172 @@ digest_file(char *fn, alg_t *alg) +@@ -147,21 +152,178 @@ digest_file(char *fn, alg_t *alg) return (rc); } @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ + const char *p; +}; + -+LIST_HEAD(, excl) excl = LIST_HEAD_INITIALIZER(excl); ++LIST_HEAD(, excl) excl; + +static void +exclude(const char *p) @@ -43,7 +43,11 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ +{ + struct excl *e; + ++#ifdef LIST_FOREACH + LIST_FOREACH(e, &excl, n) ++#else ++ for (e = excl.lh_first; e; e = e->n.le_next) ++#endif + if (strcmp(e->p, p) == 0) + return (1); + @@ -175,6 +179,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ int rval; int i; + struct stat st; ++ ++ LIST_INIT(&excl); #ifdef HAVE_SETLOCALE (void) setlocale(LC_ALL, ""); @@ -191,7 +197,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ } } argc -= optind; -@@ -186,7 +342,9 @@ main(int argc, char **argv) +@@ -186,7 +348,9 @@ main(int argc, char **argv) } } else { for (i = 0 ; i < argc ; i++) { -- cgit v1.2.3