projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* getlogin_r.h: Simplify API documentation.
[gnulib.git]
/
lib
/
exclude.c
diff --git
a/lib/exclude.c
b/lib/exclude.c
index
cb43326
..
39101c7
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 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,7
+16,7
@@
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> */
@@
-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,9
+35,12
@@
extern int errno;
#include "exclude.h"
#include "fnmatch.h"
#include "exclude.h"
#include "fnmatch.h"
-#include "unlocked-io.h"
#include "xalloc.h"
#include "xalloc.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
# define IN_CTYPE_DOMAIN(c) true
#else
#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
# define IN_CTYPE_DOMAIN(c) true
#else
@@
-93,11
+93,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. */
@@
-188,12
+184,9
@@
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 = &ex->exclude[ex->exclude_count++];
patopts->pattern = pattern;
@@
-212,11
+205,11
@@
add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
{
bool use_stdin = filename[0] == '-' && !filename[1];
FILE *in;
{
bool use_stdin = filename[0] == '-' && !filename[1];
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;
size_t buf_count = 0;
int c;
int e = 0;
@@
-226,16
+219,11
@@
add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
else if (! (in = fopen (filename, "r")))
return -1;
else if (! (in = fopen (filename, "r")))
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))