projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdate
[gnulib.git]
/
lib
/
savedir.c
diff --git
a/lib/savedir.c
b/lib/savedir.c
index
d5ced6c
..
5e69d38
100644
(file)
--- a/
lib/savedir.c
+++ b/
lib/savedir.c
@@
-1,12
+1,12
@@
/* 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
1990, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 Free
- Software Foundation, Inc.
+ Copyright
(C) 1990, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+
2006, 2009 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
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ 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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,14
+14,11
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "savedir.h"
#include "savedir.h"
@@
-29,26
+26,15
@@
#include <errno.h>
#include <errno.h>
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
+#include "dirent--.h"
+#ifndef _D_EXACT_NAMLEN
+# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name)
#endif
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#endif
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include "openat.h"
#include "xalloc.h"
#ifndef NAME_SIZE_DEFAULT
#include "xalloc.h"
#ifndef NAME_SIZE_DEFAULT
@@
-89,7
+75,7
@@
savedirstream (DIR *dirp)
entry = dp->d_name;
if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
{
entry = dp->d_name;
if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
{
- size_t entry_size =
strlen (entry
) + 1;
+ size_t entry_size =
_D_EXACT_NAMLEN (dp
) + 1;
if (used + entry_size < used)
xalloc_die ();
if (allocated <= used + entry_size)
if (used + entry_size < used)
xalloc_die ();
if (allocated <= used + entry_size)