projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[gnulib.git]
/
lib
/
savedir.c
diff --git
a/lib/savedir.c
b/lib/savedir.c
index
4c07bff
..
e969407
100644
(file)
--- a/
lib/savedir.c
+++ b/
lib/savedir.c
@@
-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 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1997
, 1998, 1999, 2000
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
@@
-17,13
+17,13
@@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-#if
def
HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include <config.h>
#endif
#include <sys/types.h>
# include <config.h>
#endif
#include <sys/types.h>
-#if
def
HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif
# include <unistd.h>
#endif
@@
-62,7
+62,9
@@
char *realloc ();
# define NULL 0
#endif
# define NULL 0
#endif
+#ifndef stpcpy
char *stpcpy ();
char *stpcpy ();
+#endif
#include "savedir.h"
#include "savedir.h"
@@
-74,9
+76,7
@@
char *stpcpy ();
Return NULL if DIR cannot be opened or if out of memory. */
char *
Return NULL if DIR cannot be opened or if out of memory. */
char *
-savedir (dir, name_size)
- const char *dir;
- unsigned int name_size;
+savedir (const char *dir, off_t name_size)
{
DIR *dirp;
struct dirent *dp;
{
DIR *dirp;
struct dirent *dp;
@@
-87,7
+87,12
@@
savedir (dir, name_size)
if (dirp == NULL)
return NULL;
if (dirp == NULL)
return NULL;
- name_space = (char *) malloc (name_size ? name_size : 1);
+ /* Be sure name_size is at least `1' so there's room for
+ the final NUL byte. */
+ if (name_size <= 0)
+ name_size = 1;
+
+ name_space = (char *) malloc (name_size);
if (name_space == NULL)
{
closedir (dirp);
if (name_space == NULL)
{
closedir (dirp);
@@
-102,7
+107,7
@@
savedir (dir, name_size)
|| (dp->d_name[1] != '\0'
&& (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
{
|| (dp->d_name[1] != '\0'
&& (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
{
-
unsigned
size_needed = (namep - name_space) + NAMLEN (dp) + 2;
+
off_t
size_needed = (namep - name_space) + NAMLEN (dp) + 2;
if (size_needed > name_size)
{
if (size_needed > name_size)
{