mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2025-01-18 22:13:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync to the slightly more general version of GNU tar.

Browse Source
This commit is contained in:
Jim Meyering 2000-01-12 06:37:30 +00:00
parent 59457bee16
commit 0d47b4be52
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/exclude.c
View File

@ -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 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 it under the terms of the GNU General Public License as published by
@ -54,14 +54,14 @@ new_exclude (void)
} }
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; char const * const *exclude = ex->exclude;
int exclude_count = ex->exclude_count; int exclude_count = ex->exclude_count;
int i; int i;
for (i = 0; i < exclude_count; 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 1;
return 0; return 0;
@ -79,7 +79,8 @@ add_exclude (struct exclude *ex, char const *pattern)
} }
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]; int use_stdin = filename[0] == '-' && !filename[1];
FILE *in; FILE *in;
@ -118,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]) if (p < lim ? *p == line_end : buf < p && p[-1])
{ {
*p = '\0'; *p = '\0';
add_exclude (ex, pattern); (*add_func) (ex, pattern);
pattern = p + 1; pattern = p + 1;
} }

7
lib/exclude.h
View File

@ -1,5 +1,5 @@
/* exclude.h -- declarations for excluding file names /* exclude.h -- declarations for excluding file names
Copyright 1992, 1993, 1994, 1997 Free Software Foundation, Inc. Copyright 1992, 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -30,5 +30,6 @@ struct exclude;
struct exclude *new_exclude PARAMS ((void)); struct exclude *new_exclude PARAMS ((void));
void add_exclude PARAMS ((struct exclude *, char const *)); void add_exclude PARAMS ((struct exclude *, char const *));
int add_exclude_file PARAMS ((struct exclude *, char const *, char)); int add_exclude_file PARAMS ((void (*) (struct exclude *, char const *),
int excluded_filename PARAMS ((struct exclude const *, char const *)); struct exclude *, char const *, char));
int excluded_filename PARAMS ((struct exclude const *, char const *, int));