mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(savedir): Remove size arg; it wasn't portable. All callers changed.

Browse Source
This commit is contained in:
Paul Eggert
2001-01-13 05:59:29 +00:00
parent a6d27a4aa4
commit df72d04b36
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/savedir.c
View File

@@ -1,5 +1,5 @@
/* savedir.c -- save the list of files in a directory in a string /* savedir.c -- save the list of files in a directory in a string
Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. Copyright 1990,97,98,99,2000, 2001 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
@@ -64,9 +64,6 @@ extern int errno;
/* Return a freshly allocated string containing the filenames /* Return a freshly allocated string containing the filenames
in directory DIR, separated by '\0' characters; in directory DIR, separated by '\0' characters;
the end is marked by two '\0' characters in a row. the end is marked by two '\0' characters in a row.
NAME_SIZE is the number of bytes to initially allocate
for the string; it will be enlarged as needed.
Use NAME_SIZE == -1 if you do not know the size.
Return NULL (setting errno) if DIR cannot be opened, read, or closed. */ Return NULL (setting errno) if DIR cannot be opened, read, or closed. */
#ifndef NAME_SIZE_DEFAULT #ifndef NAME_SIZE_DEFAULT
@@ -74,12 +71,12 @@ extern int errno;
#endif #endif
char * char *
savedir (const char *dir, off_t name_size) savedir (const char *dir)
{ {
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
char *name_space; char *name_space;
size_t allocated = name_size; /* Overflow is checked indirectly below. */ size_t allocated = NAME_SIZE_DEFAULT;
size_t used = 0; size_t used = 0;
int save_errno; int save_errno;
@@ -87,13 +84,6 @@ savedir (const char *dir, off_t name_size)
if (dirp == NULL) if (dirp == NULL)
return NULL; return NULL;
/* Use the default if the size is not known. Be sure "allocated"
is at least `1' so there's room for the final NUL byte.
Do not simply test name_size <= 0, because the initialization
of "allocated" might have overflowed. */
if (name_size < 0 || allocated == 0)
allocated = NAME_SIZE_DEFAULT;
name_space = xmalloc (allocated); name_space = xmalloc (allocated);
errno = 0; errno = 0;