projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* rijndael-api-fst.c: Fix bugs in CBC mode for more than one
[gnulib.git]
/
lib
/
exclude.c
diff --git
a/lib/exclude.c
b/lib/exclude.c
index
cb43326
..
6a0c149
100644
(file)
--- a/
lib/exclude.c
+++ b/
lib/exclude.c
@@
-1,7
+1,7
@@
/* exclude.c -- exclude file names
/* exclude.c -- exclude file names
- Copyright (C) 1992, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003
Free
- Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003
,
+
2004, 2005 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
@@
-16,11
+16,11
@@
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING.
If not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING.
If not, write to the Free Software Foundation,
- 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Paul Eggert <eggert@twinsun.com> */
/* Written by Paul Eggert <eggert@twinsun.com> */
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
@@
-28,9
+28,6
@@
#include <ctype.h>
#include <errno.h>
#include <ctype.h>
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
@@
-38,8
+35,13
@@
extern int errno;
#include "exclude.h"
#include "fnmatch.h"
#include "exclude.h"
#include "fnmatch.h"
-#include "
unlocked-io
.h"
+#include "
strcase
.h"
#include "xalloc.h"
#include "xalloc.h"
+#include "verify.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
# define IN_CTYPE_DOMAIN(c) true
#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
# define IN_CTYPE_DOMAIN(c) true
@@
-53,9
+55,6
@@
is_space (unsigned char c)
return IN_CTYPE_DOMAIN (c) && isspace (c);
}
return IN_CTYPE_DOMAIN (c) && isspace (c);
}
-/* Verify a requirement at compile-time (unlike assert, which is runtime). */
-#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
-
/* Non-GNU systems lack these options, so we don't need to check them. */
#ifndef FNM_CASEFOLD
# define FNM_CASEFOLD 0
/* Non-GNU systems lack these options, so we don't need to check them. */
#ifndef FNM_CASEFOLD
# define FNM_CASEFOLD 0
@@
-64,11
+63,10
@@
is_space (unsigned char c)
# define FNM_LEADING_DIR 0
#endif
# define FNM_LEADING_DIR 0
#endif
-verify (EXCLUDE_macros_do_not_collide_with_FNM_macros,
- (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS)
- & (FNM_PATHNAME | FNM_NOESCAPE | FNM_PERIOD | FNM_LEADING_DIR
- | FNM_CASEFOLD))
- == 0));
+verify (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS)
+ & (FNM_PATHNAME | FNM_NOESCAPE | FNM_PERIOD | FNM_LEADING_DIR
+ | FNM_CASEFOLD))
+ == 0);
/* An exclude pattern-options pair. The options are fnmatch options
ORed with EXCLUDE_* options. */
/* An exclude pattern-options pair. The options are fnmatch options
ORed with EXCLUDE_* options. */
@@
-93,11
+91,7
@@
struct exclude
struct exclude *
new_exclude (void)
{
struct exclude *
new_exclude (void)
{
- struct exclude *ex = xmalloc (sizeof *ex);
- ex->exclude_count = 0;
- ex->exclude_alloc = 60;
- ex->exclude = xmalloc (ex->exclude_alloc * sizeof ex->exclude[0]);
- return ex;
+ return xzalloc (sizeof *new_exclude ());
}
/* Free the storage associated with an exclude list. */
}
/* Free the storage associated with an exclude list. */
@@
-138,7
+132,7
@@
fnmatch_no_wildcards (char const *pattern, char const *f, int options)
/* Return true if EX excludes F. */
bool
/* Return true if EX excludes F. */
bool
-excluded_filename (struct exclude const *ex, char const *f)
+excluded_file
_
name (struct exclude const *ex, char const *f)
{
size_t exclude_count = ex->exclude_count;
{
size_t exclude_count = ex->exclude_count;
@@
-188,54
+182,46
@@
add_exclude (struct exclude *ex, char const *pattern, int options)
{
struct patopts *patopts;
{
struct patopts *patopts;
- if (ex->exclude_alloc <= ex->exclude_count)
- {
- ex->exclude = xnrealloc (ex->exclude, ex->exclude_alloc,
- 2 * sizeof *ex->exclude);
- ex->exclude_alloc *= 2;
- }
+ if (ex->exclude_count == ex->exclude_alloc)
+ ex->exclude = x2nrealloc (ex->exclude, &ex->exclude_alloc,
+ sizeof *ex->exclude);
patopts = &ex->exclude[ex->exclude_count++];
patopts->pattern = pattern;
patopts->options = options;
}
patopts = &ex->exclude[ex->exclude_count++];
patopts->pattern = pattern;
patopts->options = options;
}
-/* Use ADD_FUNC to append to EX the patterns in FILENAME, each with
+/* Use ADD_FUNC to append to EX the patterns in FILE
_
NAME, each with
OPTIONS. LINE_END terminates each pattern in the file. If
LINE_END is a space character, ignore trailing spaces and empty
lines in FILE. Return -1 on failure, 0 on success. */
int
add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
OPTIONS. LINE_END terminates each pattern in the file. If
LINE_END is a space character, ignore trailing spaces and empty
lines in FILE. Return -1 on failure, 0 on success. */
int
add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
- struct exclude *ex, char const *filename, int options,
+ struct exclude *ex, char const *file
_
name, int options,
char line_end)
{
char line_end)
{
- bool use_stdin = file
name[0] == '-' && !file
name[1];
+ bool use_stdin = file
_name[0] == '-' && !file_
name[1];
FILE *in;
FILE *in;
- char *buf;
+ char *buf
= NULL
;
char *p;
char const *pattern;
char const *lim;
char *p;
char const *pattern;
char const *lim;
- size_t buf_alloc =
100
0;
+ size_t buf_alloc = 0;
size_t buf_count = 0;
int c;
int e = 0;
if (use_stdin)
in = stdin;
size_t buf_count = 0;
int c;
int e = 0;
if (use_stdin)
in = stdin;
- else if (! (in = fopen (filename, "r")))
+ else if (! (in = fopen (file
_
name, "r")))
return -1;
return -1;
- buf = xmalloc (buf_alloc);
-
while ((c = getc (in)) != EOF)
{
while ((c = getc (in)) != EOF)
{
- buf[buf_count++] = c;
if (buf_count == buf_alloc)
if (buf_count == buf_alloc)
- {
- buf = xnrealloc (buf, buf_alloc, 2);
- buf_alloc *= 2;
- }
+ buf = x2realloc (buf, &buf_alloc);
+ buf[buf_count++] = c;
}
if (ferror (in))
}
if (ferror (in))