diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | login/utmp_daemon.c | 4 | ||||
| -rw-r--r-- | login/utmp_file.c | 8 | ||||
| -rw-r--r-- | nscd/nscd_getgr_r.c | 2 | ||||
| -rw-r--r-- | nscd/nscd_getpw_r.c | 4 | ||||
| -rw-r--r-- | posix/unistd.h | 1 | ||||
| -rw-r--r-- | stdlib/strtod.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/common/syscalls.list | 2 |
8 files changed, 29 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 5e9115cc0b..7c43ac6bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +1998-04-08 Ulrich Drepper <drepper@cygnus.com> + + * login/utmp_file.c: use __ftruncate not ftruncate. + * sysdeps/unix/common/syscalls.list: Add __ftruncate as real name + for system call and make ftruncate weak alias. + * posix/unistd.h: Add prototype for __ftruncate. + * login/utmp_daemon.c (open_socket): Use __socket not socket. + * nscd/nscd_getpw_r.c (__nscd_getpw_r): use __snprintf and __readv + instead of snprintf and readv. + * nscd/nscd_getgr_r.c (__nscd_getgr_r): Use __snprintf not + snprintf. + * stdlib/strtod.c: Call strtoull/wcstoull's internal functions + directly. + 1998-04-08 20:06 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath. diff --git a/login/utmp_daemon.c b/login/utmp_daemon.c index e3c9371a54..40389f21a0 100644 --- a/login/utmp_daemon.c +++ b/login/utmp_daemon.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -409,7 +409,7 @@ open_socket (const char *name) struct sockaddr_un addr; int sock; - sock = socket (PF_UNIX, SOCK_STREAM, 0); + sock = __socket (PF_UNIX, SOCK_STREAM, 0); if (sock < 0) return -1; diff --git a/login/utmp_file.c b/login/utmp_file.c index d25dcb8600..9cdb88ebec 100644 --- a/login/utmp_file.c +++ b/login/utmp_file.c @@ -373,7 +373,7 @@ pututline_file (const struct utmp *data) if (file_offset % sizeof (struct utmp) != 0) { file_offset -= file_offset % sizeof (struct utmp); - ftruncate (file_fd, file_offset); + __ftruncate (file_fd, file_offset); if (lseek (file_fd, 0, SEEK_END) < 0) { @@ -395,7 +395,7 @@ pututline_file (const struct utmp *data) /* If we appended a new record this is only partially written. Remove it. */ if (found < 0) - (void) ftruncate (file_fd, file_offset); + (void) __ftruncate (file_fd, file_offset); pbuf = NULL; } else @@ -447,7 +447,7 @@ updwtmp_file (const char *file, const struct utmp *utmp) if (offset % sizeof (struct utmp) != 0) { offset -= offset % sizeof (struct utmp); - ftruncate (fd, offset); + __ftruncate (fd, offset); if (lseek (fd, 0, SEEK_END) < 0) goto unlock_return; @@ -458,7 +458,7 @@ updwtmp_file (const char *file, const struct utmp *utmp) will remain. */ if (write (fd, utmp, sizeof (struct utmp)) != sizeof (struct utmp)) { - ftruncate (fd, offset); + __ftruncate (fd, offset); goto unlock_return; } diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index 7db28c215e..decfa3dad7 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -52,7 +52,7 @@ __nscd_getgrgid_r (gid_t gid, struct group *resultbuf, char *buffer, char *p = buffer; int plen; - plen = snprintf (buffer, buflen, "%d", gid); + plen = __snprintf (buffer, buflen, "%d", gid); if (plen == -1) { __set_errno (ERANGE); diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c index fd512ab1b5..d075c8523a 100644 --- a/nscd/nscd_getpw_r.c +++ b/nscd/nscd_getpw_r.c @@ -52,7 +52,7 @@ __nscd_getpwuid_r (uid_t uid, struct passwd *resultbuf, char *buffer, char *p = buffer; int plen; - plen = snprintf (buffer, buflen, "%d", uid); + plen = __snprintf (buffer, buflen, "%d", uid); if (plen == -1) { __set_errno (ERANGE); @@ -177,7 +177,7 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf, p += pw_resp.pw_shell_len + 1; buflen -= (pw_resp.pw_shell_len + 1); - nbytes = readv (sock, vec, 5); + nbytes = __readv (sock, vec, 5); if (nbytes != (pw_resp.pw_name_len + pw_resp.pw_passwd_len + pw_resp.pw_gecos_len + pw_resp.pw_dir_len + pw_resp.pw_shell_len)) diff --git a/posix/unistd.h b/posix/unistd.h index 1555f07317..135f0633b5 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -887,6 +887,7 @@ extern int truncate64 __P ((__const char *__file, __off64_t __length)); #endif /* Truncate the file FD is open on to LENGTH bytes. */ +extern int __ftruncate __P ((int __fd, __off_t __length)); #ifndef __USE_FILE_OFFSET64 extern int ftruncate __P ((int __fd, __off_t __length)); #else diff --git a/stdlib/strtod.c b/stdlib/strtod.c index ad3bcd1117..55feca8555 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -103,14 +103,14 @@ # define ISXDIGIT(Ch) __iswxdigit_l ((Ch), loc) # define TOLOWER(Ch) __towlower_l ((Ch), loc) # define STRNCASECMP(S1, S2, N) __wcsncasecmp_l ((S1), (S2), (N), loc) -# define STRTOULL(S, E, B) __wcstoull_l ((S), (E), (B), loc) +# define STRTOULL(S, E, B) ____wcstoull_l_internal ((S), (E), (B), 0, loc) # else # define ISSPACE(Ch) iswspace (Ch) # define ISDIGIT(Ch) iswdigit (Ch) # define ISXDIGIT(Ch) iswxdigit (Ch) # define TOLOWER(Ch) towlower (Ch) # define STRNCASECMP(S1, S2, N) __wcsncasecmp ((S1), (S2), (N)) -# define STRTOULL(S, E, B) wcstoull ((S), (E), (B)) +# define STRTOULL(S, E, B) __wcstoull_internal ((S), (E), (B), 0) # endif #else # define STRING_TYPE char @@ -122,14 +122,14 @@ # define ISXDIGIT(Ch) __isxdigit_l ((Ch), loc) # define TOLOWER(Ch) __tolower_l ((Ch), loc) # define STRNCASECMP(S1, S2, N) __strncasecmp_l ((S1), (S2), (N), loc) -# define STRTOULL(S, E, B) __strtoull_l ((S), (E), (B), loc) +# define STRTOULL(S, E, B) ____strtoull_l_internal ((S), (E), (B), 0, loc) # else # define ISSPACE(Ch) isspace (Ch) # define ISDIGIT(Ch) isdigit (Ch) # define ISXDIGIT(Ch) isxdigit (Ch) # define TOLOWER(Ch) tolower (Ch) # define STRNCASECMP(S1, S2, N) __strncasecmp ((S1), (S2), (N)) -# define STRTOULL(S, E, B) strtoull ((S), (E), (B)) +# define STRTOULL(S, E, B) __strtoull_internal ((S), (E), 0, (B)) # endif #endif diff --git a/sysdeps/unix/common/syscalls.list b/sysdeps/unix/common/syscalls.list index e859dd2ec2..328b395310 100644 --- a/sysdeps/unix/common/syscalls.list +++ b/sysdeps/unix/common/syscalls.list @@ -3,7 +3,7 @@ adjtime - adjtime 2 __adjtime adjtime fchmod - fchmod 2 __fchmod fchmod fchown - fchown 3 __fchown fchown -ftruncate - ftruncate 2 ftruncate +ftruncate - ftruncate 2 __ftruncate ftruncate getpgid - getpgrp 1 __getpgid getpgid getrusage - getrusage 2 __getrusage getrusage gettimeofday - gettimeofday 2 __gettimeofday gettimeofday |