summary refs log tree commit diff
path: root/locale/programs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-13 09:28:02 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-13 09:28:02 +0000
commit9ef0a84048e96283f1da89e3a05041e0420eef08 (patch)
tree1a9d1d3367192be45bdbfffa5d9180df95134ac0 /locale/programs
parent2b510e91dc2e8dd4082eb88a2eac5d21afd7645a (diff)
downloadglibc-9ef0a84048e96283f1da89e3a05041e0420eef08.tar.gz
glibc-9ef0a84048e96283f1da89e3a05041e0420eef08.tar.xz
glibc-9ef0a84048e96283f1da89e3a05041e0420eef08.zip
Update.
2003-01-13  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/charmap-dir.c (charmap_readdir): Use struct
	dirent64 instead of struct dirent for dirent.  Call readdir64
	instead of readdir.

	* locale/programs/locfile.c (siblings_uncached): Use struct
	dirent64 instead of struct dirent for other_dentry.  Call
	readdir64 instead of readdir.

	* elf/ldconfig.c (direntry): Change type to struct dirent64.
	(search_dir): Use readdir64 instead of readdir.
	Patch by Zhangfan Xing <xing@pacific.jpl.nasa.gov>.
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/charmap-dir.c6
-rw-r--r--locale/programs/locfile.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
index 935f662ff6..903bd5cabc 100644
--- a/locale/programs/charmap-dir.c
+++ b/locale/programs/charmap-dir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -88,13 +88,13 @@ charmap_readdir (CHARMAP_DIR *cdir)
 {
   for (;;)
     {
-      struct dirent *dirent;
+      struct dirent64 *dirent;
       size_t len;
       size_t size;
       char *filename;
       mode_t mode;
 
-      dirent = readdir (cdir->dir);
+      dirent = readdir64 (cdir->dir);
       if (dirent == NULL)
         return NULL;
       if (strcmp (dirent->d_name, ".") == 0)
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index c5e5581ac5..1e8e434ee1 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -389,12 +389,12 @@ siblings_uncached (const char *output_path)
   elems = NULL;
   for (;;)
     {
-      struct dirent *other_dentry;
+      struct dirent64 *other_dentry;
       const char *other_name;
       char *other_path;
       struct stat other_stat;
 
-      other_dentry = readdir (dirp);
+      other_dentry = readdir64 (dirp);
       if (other_dentry == NULL)
 	break;