projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Distribute allocsa.valgrind.
[gnulib.git]
/
lib
/
exclude.c
diff --git
a/lib/exclude.c
b/lib/exclude.c
index
ffe136f
..
24146eb
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
@@
-28,35
+28,17
@@
#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 <stddef.h>
#include <stdio.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
#include "exclude.h"
#include "fnmatch.h"
#include "exclude.h"
#include "fnmatch.h"
-#include "unlocked-io.h"
#include "xalloc.h"
#include "xalloc.h"
-#if
ndef SIZE_MAX
-#
define SIZE_MAX ((size_t) -1)
+#if
USE_UNLOCKED_IO
+#
include "unlocked-io.h"
#endif
#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
#endif
#if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
@@
-111,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 = (1 << 6); /* This must be a power of 2. */
- 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. */
@@
-206,14
+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)
- {
- size_t s = 2 * ex->exclude_alloc;
- if (! (0 < s && s <= SIZE_MAX / sizeof ex->exclude[0]))
- xalloc_die ();
- ex->exclude_alloc = s;
- ex->exclude = xrealloc (ex->exclude, s * sizeof ex->exclude[0]);
- }
+ 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;
@@
-232,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 =
(1 << 10); /* This must be a power of two. */
+ 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;
@@
-246,18
+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_alloc *= 2;
- if (! buf_alloc)
- xalloc_die ();
- buf = xrealloc (buf, buf_alloc);
- }
+ buf = x2realloc (buf, &buf_alloc);
+ buf[buf_count++] = c;
}
if (ferror (in))
}
if (ferror (in))
@@
-267,21
+233,25
@@
add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
e = errno;
buf = xrealloc (buf, buf_count + 1);
e = errno;
buf = xrealloc (buf, buf_count + 1);
+ buf[buf_count] = line_end;
+ lim = buf + buf_count + ! (buf_count == 0 || buf[buf_count - 1] == line_end);
+ pattern = buf;
- for (p
attern = p = buf, lim = buf + buf_count; p <= lim;
p++)
- if (
p < lim ? *p == line_end : buf < p && p[-1]
)
+ for (p
= buf; p < lim;
p++)
+ if (
*p == line_end
)
{
{
+ char *pattern_end = p;
+
if (is_space (line_end))
{
if (is_space (line_end))
{
- char *pattern_end = p;
for (; ; pattern_end--)
if (pattern_end == pattern)
goto next_pattern;
else if (! is_space (pattern_end[-1]))
break;
for (; ; pattern_end--)
if (pattern_end == pattern)
goto next_pattern;
else if (! is_space (pattern_end[-1]))
break;
- *pattern_end = '\0';
}
}
+ *pattern_end = '\0';
(*add_func) (ex, pattern, options);
next_pattern:
(*add_func) (ex, pattern, options);
next_pattern: