projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_LIB_CHECK): Use []-quoted list in
[gnulib.git]
/
lib
/
exclude.c
diff --git
a/lib/exclude.c
b/lib/exclude.c
index
e5cdfc3
..
1925a39
100644
(file)
--- a/
lib/exclude.c
+++ b/
lib/exclude.c
@@
-1,5
+1,5
@@
/* exclude.c -- exclude file names
/* exclude.c -- exclude file names
- Copyright 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
+ Copyright 1992, 1993, 1994, 1997
, 1999, 2000
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-31,8
+31,8
@@
extern int errno;
#include <stdio.h>
#include <sys/types.h>
#include <stdio.h>
#include <sys/types.h>
-void *xmalloc
__EXCLUDE_P
((size_t));
-void *xrealloc
__EXCLUDE_P
((void *, size_t));
+void *xmalloc
PARAMS
((size_t));
+void *xrealloc
PARAMS
((void *, size_t));
/* Keep track of excluded file name patterns. */
/* Keep track of excluded file name patterns. */
@@
-43,8
+43,6
@@
struct exclude
int exclude_count;
};
int exclude_count;
};
-/* FIXME: describe */
-
struct exclude *
new_exclude (void)
{
struct exclude *
new_exclude (void)
{
@@
-55,24
+53,20
@@
new_exclude (void)
return ex;
}
return ex;
}
-/* FIXME: describe */
-
int
int
-excluded_filename (struct exclude const *ex, char const *f)
+excluded_filename (struct exclude const *ex, char const *f
, int options
)
{
char const * const *exclude = ex->exclude;
int exclude_count = ex->exclude_count;
int i;
for (i = 0; i < exclude_count; i++)
{
char const * const *exclude = ex->exclude;
int exclude_count = ex->exclude_count;
int i;
for (i = 0; i < exclude_count; i++)
- if (fnmatch (exclude[i], f,
0
) == 0)
+ if (fnmatch (exclude[i], f,
options
) == 0)
return 1;
return 0;
}
return 1;
return 0;
}
-/* FIXME: describe */
-
void
add_exclude (struct exclude *ex, char const *pattern)
{
void
add_exclude (struct exclude *ex, char const *pattern)
{
@@
-84,10
+78,9
@@
add_exclude (struct exclude *ex, char const *pattern)
ex->exclude[ex->exclude_count++] = pattern;
}
ex->exclude[ex->exclude_count++] = pattern;
}
-/* FIXME: describe */
-
int
int
-add_exclude_file (struct exclude *ex, char const *filename, char line_end)
+add_exclude_file (void (*add_func) PARAMS ((struct exclude *, char const *)),
+ struct exclude *ex, char const *filename, char line_end)
{
int use_stdin = filename[0] == '-' && !filename[1];
FILE *in;
{
int use_stdin = filename[0] == '-' && !filename[1];
FILE *in;
@@
-126,7
+119,7
@@
add_exclude_file (struct exclude *ex, char const *filename, char line_end)
if (p < lim ? *p == line_end : buf < p && p[-1])
{
*p = '\0';
if (p < lim ? *p == line_end : buf < p && p[-1])
{
*p = '\0';
-
add_exclude
(ex, pattern);
+
(*add_func)
(ex, pattern);
pattern = p + 1;
}
pattern = p + 1;
}