diff options
| author | christos <christos> | 2006-09-17 01:25:18 +0000 |
|---|---|---|
| committer | christos <christos> | 2006-09-17 01:25:18 +0000 |
| commit | 737d5172242a39cff717f316a762178788bcb711 (patch) | |
| tree | 6bca453521936ee4673160eae28cf1814b7bde27 /devel/idutils/patches | |
| parent | c39ce4bd1f2ecf636cd56a3116bdcd89420190e6 (diff) | |
| download | pkgsrc-737d5172242a39cff717f316a762178788bcb711.tar.gz | |
fix a bogus sizeof (from uwe)
Diffstat (limited to 'devel/idutils/patches')
| -rw-r--r-- | devel/idutils/patches/patch-aj | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/devel/idutils/patches/patch-aj b/devel/idutils/patches/patch-aj index 18a06320e71..c76185b2637 100644 --- a/devel/idutils/patches/patch-aj +++ b/devel/idutils/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ +$NetBSD: patch-aj,v 1.3 2006/09/17 01:25:18 christos Exp $ ---- src/lid.c.orig 2006-07-22 02:43:25.000000000 +0000 -+++ src/lid.c +--- src/lid.c.orig 2006-07-21 22:43:25.000000000 -0400 ++++ src/lid.c 2006-09-16 21:23:15.000000000 -0400 @@ -31,7 +31,6 @@ #include <dirname.h> #include <unistd.h> @@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ #include <regex.h> #include <xalloc.h> #include <pathmax.h> -@@ -538,10 +537,11 @@ report_filenames (char const *name, stru +@@ -538,10 +537,11 @@ void report_grep (char const *name, struct file_link **flinkv) { @@ -24,9 +24,12 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ if (key_style == ks_pattern) { -@@ -575,6 +575,15 @@ report_grep (char const *name, struct fi +@@ -573,8 +573,17 @@ + continue; + } - while (fgets (line + 1, sizeof (line) - 1, source_FILE)) +- while (fgets (line + 1, sizeof (line) - 1, source_FILE)) ++ while (fgets (line + 1, line_len - 1, source_FILE)) { + size_t len; + while ((len = strlen(line)) == line_len - 1 && @@ -40,7 +43,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ line_number++; if (pattern) { -@@ -589,6 +598,7 @@ report_grep (char const *name, struct fi +@@ -589,6 +598,7 @@ } fclose (source_FILE); } @@ -48,7 +51,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ } static char ** -@@ -800,7 +810,7 @@ search_flinkv (struct file_link **flinkv +@@ -800,7 +810,7 @@ { char pattern[BUFSIZ]; unsigned int count; @@ -57,7 +60,7 @@ $NetBSD: patch-aj,v 1.2 2006/08/06 23:10:30 wiz Exp $ char *eol; if (fgets (pattern, sizeof (pattern), stdin) == 0) -@@ -1368,7 +1378,7 @@ word_match (char const *name_0, char con +@@ -1368,7 +1378,7 @@ continue; } /* march down both strings as long as we match */ |