Files
findutils/lib/extendbuf.c
James Youngman daff367499 Remove trailing blank lines.
* .x-sc_prohibit_empty_lines_at_EOF: Add list of exceptions to the
no-blank-lines-at-EOF syntax check.
* doc/regexprops.texi: Remove empty lines at the end of the file.
* find/finddata.c: Likewise.
* find/fstype.c: Likewise.
* find/testsuite/excuses.txt: Likewise.
* find/testsuite/find.gnu/access.exp: Likewise.
* find/testsuite/find.gnu/exec-one-rtn-fail.exp: Likewise.
* find/testsuite/find.gnu/posix-perminvalid.exp: Likewise.
* find/testsuite/find.gnu/samefile-missing.exp: Likewise.
* find/testsuite/find.gnu/samefile-p-brokenlink.exp: Likewise.
* find/testsuite/find.gnu/sv-bug-17490.exp: Likewise.
* find/testsuite/find.gnu/sv-bug-18222.exp: Likewise.
* find/testsuite/find.posix/bracket-depth.exp: Likewise.
* find/testsuite/find.posix/empty-parens.exp: Likewise.
* find/testsuite/find.posix/files-not-expressions1.exp: Likewise.
* find/testsuite/find.posix/files-not-expressions2.exp: Likewise.
* find/testsuite/find.posix/files-not-expressions3.exp: Likewise.
* find/testsuite/find.posix/group-empty.exp: Likewise.
* find/testsuite/find.posix/user-empty.exp: Likewise.
* find/testsuite/find.posix/user-missing.exp: Likewise.
* lib/extendbuf.c: Likewise.
* lib/fdleak.c: Likewise.
* lib/fdleak.h: Likewise.
* lib/findutils-version.h: Likewise.
* lib/gnulib-version.h: Likewise.
* lib/printquoted.c: Likewise.
* lib/regextype.c: Likewise.
* lib/safe-atoi.c: Likewise.
* locate/testsuite/config/unix.exp: Likewise.
* locate/testsuite/locate.gnu/exists1.exp: Likewise.
* locate/testsuite/locate.gnu/exists2.exp: Likewise.
* locate/testsuite/locate.gnu/exists3.exp: Likewise.
* locate/testsuite/locate.gnu/ignore_case1.exp: Likewise.
* locate/testsuite/locate.gnu/ignore_case2.exp: Likewise.
* locate/testsuite/locate.gnu/ignore_case3.exp: Likewise.
* locate/testsuite/locate.gnu/notexists1.exp: Likewise.
* locate/testsuite/locate.gnu/notexists2.exp: Likewise.
* locate/testsuite/locate.gnu/notexists3.exp: Likewise.
* locate/testsuite/locate.gnu/sv-bug-14535.exp: Likewise.
* m4/Makefile.am: Likewise.
* m4/nullsort.m4: Likewise.
* xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp: Likewise.
* xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp: Likewise.

Signed-off-by: James Youngman <jay@gnu.org>
2010-04-11 15:57:16 +01:00

120 lines
2.5 KiB
C

/* extendbuf.c -- manage a dynamically-allocated buffer
Copyright 2004, 2010 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
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Written by James Yougnman <jay@gnu.org>. */
#include <config.h>
#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include <errno.h>
#include "xalloc.h"
#include "extendbuf.h"
/* We initially use a small default size to ensure that this code
* gets exercised.
*/
#ifndef SIZE_DEFAULT
# define SIZE_DEFAULT 16
#endif
static size_t
decide_size (size_t current, size_t wanted)
{
size_t newsize;
if (0 == current)
newsize = SIZE_DEFAULT;
else
newsize = current;
while (newsize < wanted)
{
if (2 * newsize < newsize)
return wanted;
newsize *= 2;
}
return newsize;
}
void *
extendbuf (void* existing, size_t wanted, size_t *allocated)
{
int saved_errno;
size_t newsize;
void *result; /* leave uninitialised to allow static code checkers to identify bugs */
saved_errno = errno;
assert (wanted > 0u);
newsize = decide_size (*allocated, wanted);
if ( (*allocated) == 0 )
{
/* Sanity check: If there is no existing allocation size, there
* must be no existing allocated buffer.
*/
assert (NULL == existing);
(*allocated) = newsize;
result = malloc (newsize);
}
else
{
if (newsize != (*allocated) )
{
(*allocated) = newsize;
result = realloc (existing, newsize);
if (NULL == result)
{
saved_errno = errno;
}
}
else
{
result = existing;
}
}
if (result)
{
/* malloc () or realloc () may have changed errno, but in the
success case we want to preserve the previous value.
*/
errno = saved_errno;
}
return result;
}
void *
xextendbuf (void* existing, size_t wanted, size_t *allocated)
{
void *p = extendbuf (existing, wanted, allocated);
if (NULL == p)
{
free (existing);
xalloc_die ();
}
return p;
}