summaryrefslogtreecommitdiff
path: root/catgets/open_catalog.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-08-09 02:46:09 +0000
committerUlrich Drepper <drepper@redhat.com>1996-08-09 02:46:09 +0000
commita5113b141cd85a98b4711607c430e6e01775bd9a (patch)
tree5e345c0560b177c68320fa8a467215352996bb35 /catgets/open_catalog.c
parent233963756b2ef272f8876afec2a2bb629b425e0c (diff)
downloadglibc-a5113b141cd85a98b4711607c430e6e01775bd9a.tar.gz
Thu Aug 8 16:17:38 1996 Ulrich Drepper <drepper@cygnus.com> * pwd/getpwent.c: Define BUFLEN from NSS_BUFLEN_PASSWD. * pwd/getpwent_r.c: Likewise. * pwd/getpwnam.c: Likewise. * pwd/getpwnam_r.c: Likewise. * pwd/getpwuid.c: Likewise. * pwd/getpwuid_r.c: Likewise. * grp/getgrent.c: Define BUFLEN from NSS_BUFLEN_GROUP. * grp/getgrent_r.c: Likewise. * grp/getgrgid.c: Likewise. * grp/getgrgid_r.c: Likewise. * grp/getgrnam.c: Likewise. * pwd/fgetpwent_r.c: New file. Reentrant version of fgetpwent. * pwd/fgetpwent.c: Rewrite to use fgetpwent_r. * pwd/Makefile (routines): Add fgetpwent_r. * pwd/pwd.h: Add prototypes for __fgetpwent_r and fgetpwent_r. * grp/fgetgrent_r.c: New file. Reentrant version of fgetgrent. * grp/fgetgrent.c: Rewrite to use fgetgrent_r. * grp/Makefile (routines): Add fgetgrent_r. * grp/grp.h: Add prototypes for __fgetgrent_r and fgetgrent_r. Implement shadow password lookup functions. This is no complete shadow password suite. * shadow/Makefile: New file. * shadow/fgetspent.c: New file. * shadow/fgetspent_r.c: New file. * shadow/getspent.c: New file. * shadow/getspent_r.c: New file. * shadow/getspnam.c: New file. * shadow/getspnam_r.c: New file. * shadow/putspent.c: New file. * shadow/sgetspent.c: New file. * shadow/sgetspent_r.c: New file. * shadow/shadow.h: New file. * shadow/spwd-lookup.c: New file. * shadow/nss_files/files-spwd.c: New file. Thu Aug 8 13:33:45 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/ftime.c: New file. Available system call is only a stub. Reported by Matthias Urlichs. * Makeconfig [!default_cflags]: Change default value from `-g' to `-g -O'. * configure.in: Recognize i686. * sysdeps/i386/i686/Implies: Default on i586 optimized code. Thu Aug 8 12:40:20 1996 Matthias Urlichs <smurf@smurf.noris.de> * Makeconfig [$(build-omitfp) == yes]: Add to CFLAGS-.so value of CFLAGS-.o, not CFLAGS-o. * sysdeps/unix/sysv/linux/init-first.c (init): Add volatile pointer to ourself. Otherwise `gcc -O3' optimized init away. sure that all tables in binary file are word-aligned.
Diffstat (limited to 'catgets/open_catalog.c')
-rw-r--r--catgets/open_catalog.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c
index 9a8c7e643e..2a52877bbe 100644
--- a/catgets/open_catalog.c
+++ b/catgets/open_catalog.c
@@ -79,12 +79,12 @@ __open_catalog (__nl_catd catalog, int with_path)
case 'N':
/* Use the catalog name. */
ENOUGH (strlen (catalog->cat_name));
- bufact = stpcpy (&buf[bufact], catalog->cat_name) - buf;
+ bufact = __stpcpy (&buf[bufact], catalog->cat_name) - buf;
break;
case 'L':
/* Use the current locale category value. */
ENOUGH (strlen (catalog->env_var));
- bufact = stpcpy (&buf[bufact], catalog->env_var) - buf;
+ bufact = __stpcpy (&buf[bufact], catalog->env_var) - buf;
break;
case 'l':
/* Use language element of locale category value. */
@@ -152,7 +152,7 @@ __open_catalog (__nl_catd catalog, int with_path)
if (bufact != 0)
{
- fd = open (buf, O_RDONLY);
+ fd = __open (buf, O_RDONLY);
if (fd >= 0)
break;
}
@@ -161,7 +161,7 @@ __open_catalog (__nl_catd catalog, int with_path)
}
}
- if (fd < 0 || fstat (fd, &st) < 0)
+ if (fd < 0 || __fstat (fd, &st) < 0)
{
catalog->status = nonexisting;
return;
@@ -181,8 +181,8 @@ __open_catalog (__nl_catd catalog, int with_path)
#endif
catalog->file_size = st.st_size;
catalog->file_ptr =
- (struct catalog_obj *) mmap (NULL, st.st_size, PROT_READ,
- MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0);
+ (struct catalog_obj *) __mmap (NULL, st.st_size, PROT_READ,
+ MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0);
if (catalog->file_ptr != (struct catalog_obj *) -1)
/* Tell the world we managed to mmap the file. */
catalog->status = mmaped;
@@ -201,8 +201,8 @@ __open_catalog (__nl_catd catalog, int with_path)
/* Save read, handle partial reads. */
do
{
- size_t now = read (fd, (((char *) &catalog->file_ptr)
- + (st.st_size - todo)), todo);
+ size_t now = __read (fd, (((char *) &catalog->file_ptr)
+ + (st.st_size - todo)), todo);
if (now == 0)
{
free ((void *) catalog->file_ptr);
@@ -216,7 +216,7 @@ __open_catalog (__nl_catd catalog, int with_path)
}
/* We don't need the file anymore. */
- close (fd);
+ __close (fd);
/* Determine whether the file is a catalog file and if yes whether
it is written using the correct byte order. Else we have to swap
@@ -230,7 +230,7 @@ __open_catalog (__nl_catd catalog, int with_path)
/* Illegal file. Free he resources and mark catalog as not
usable. */
if (catalog->status == mmaped)
- munmap ((void *) catalog->file_ptr, catalog->file_size);
+ __munmap ((void *) catalog->file_ptr, catalog->file_size);
else
free (catalog->file_ptr);
catalog->status = nonexisting;