Module Name: src
Committed By: joerg
Date: Mon Apr 18 23:22:42 UTC 2011
Modified Files:
src/usr.bin/grep: grep.c util.c
Log Message:
Avoid C99 features.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/grep/grep.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/grep/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/grep/grep.c
diff -u src/usr.bin/grep/grep.c:1.8 src/usr.bin/grep/grep.c:1.9
--- src/usr.bin/grep/grep.c:1.8 Mon Apr 18 22:46:48 2011
+++ src/usr.bin/grep/grep.c Mon Apr 18 23:22:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.8 2011/04/18 22:46:48 joerg Exp $ */
+/* $NetBSD: grep.c,v 1.9 2011/04/18 23:22:42 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.c 211519 2010-08-19 22:55:17Z delphij $ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: grep.c,v 1.8 2011/04/18 22:46:48 joerg Exp $");
+__RCSID("$NetBSD: grep.c,v 1.9 2011/04/18 23:22:42 joerg Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -323,7 +323,7 @@
char **aargv, **eargv, *eopts;
char *ep;
unsigned long long l;
- unsigned int aargc, eargc, i;
+ unsigned int aargc, eargc, i, j;
int c, lastc, needpattern, newarg, prevoptind;
setlocale(LC_ALL, "");
@@ -374,7 +374,7 @@
char *str;
/* make an estimation of how many extra arguments we have */
- for (unsigned int j = 0; j < strlen(eopts); j++)
+ for (j = 0; j < strlen(eopts); j++)
if (eopts[j] == ' ')
eargc++;
@@ -391,7 +391,7 @@
aargv[0] = argv[0];
for (i = 0; i < eargc; i++)
aargv[i + 1] = eargv[i];
- for (int j = 1; j < argc; j++, i++)
+ for (j = 1; j < (unsigned int)argc; j++, i++)
aargv[i + 1] = argv[j];
aargc = eargc + argc;
Index: src/usr.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.12 src/usr.bin/grep/util.c:1.13
--- src/usr.bin/grep/util.c:1.12 Mon Apr 18 22:46:48 2011
+++ src/usr.bin/grep/util.c Mon Apr 18 23:22:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.12 2011/04/18 22:46:48 joerg Exp $ */
+/* $NetBSD: util.c,v 1.13 2011/04/18 23:22:42 joerg Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: util.c,v 1.12 2011/04/18 22:46:48 joerg Exp $");
+__RCSID("$NetBSD: util.c,v 1.13 2011/04/18 23:22:42 joerg Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -64,13 +64,14 @@
file_matching(const char *fname)
{
char *fname_base, *fname_copy;
+ unsigned int i;
bool ret;
ret = finclude ? false : true;
fname_copy = grep_strdup(fname);
fname_base = basename(fname_copy);
- for (unsigned int i = 0; i < fpatterns; ++i) {
+ for (i = 0; i < fpatterns; ++i) {
if (fnmatch(fpattern[i].pat, fname, 0) == 0 ||
fnmatch(fpattern[i].pat, fname_base, 0) == 0) {
if (fpattern[i].mode == EXCL_PAT)
@@ -86,11 +87,12 @@
static inline bool
dir_matching(const char *dname)
{
+ unsigned int i;
bool ret;
ret = dinclude ? false : true;
- for (unsigned int i = 0; i < dpatterns; ++i) {
+ for (i = 0; i < dpatterns; ++i) {
if (dname != NULL &&
fnmatch(dname, dpattern[i].pat, 0) == 0) {
if (dpattern[i].mode == EXCL_PAT)
