1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
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.
This commit is contained in:
Ulrich Drepper
1998-04-08 23:35:13 +00:00
parent 2ad4fab214
commit 8d88d9f8aa
8 changed files with 29 additions and 14 deletions

View File

@ -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> 1998-04-08 20:06 Ulrich Drepper <drepper@cygnus.com>
* iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath. * iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath.

View File

@ -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. This file is part of the GNU C Library.
Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
@ -409,7 +409,7 @@ open_socket (const char *name)
struct sockaddr_un addr; struct sockaddr_un addr;
int sock; int sock;
sock = socket (PF_UNIX, SOCK_STREAM, 0); sock = __socket (PF_UNIX, SOCK_STREAM, 0);
if (sock < 0) if (sock < 0)
return -1; return -1;

View File

@ -373,7 +373,7 @@ pututline_file (const struct utmp *data)
if (file_offset % sizeof (struct utmp) != 0) if (file_offset % sizeof (struct utmp) != 0)
{ {
file_offset -= file_offset % sizeof (struct utmp); 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) 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. /* If we appended a new record this is only partially written.
Remove it. */ Remove it. */
if (found < 0) if (found < 0)
(void) ftruncate (file_fd, file_offset); (void) __ftruncate (file_fd, file_offset);
pbuf = NULL; pbuf = NULL;
} }
else else
@ -447,7 +447,7 @@ updwtmp_file (const char *file, const struct utmp *utmp)
if (offset % sizeof (struct utmp) != 0) if (offset % sizeof (struct utmp) != 0)
{ {
offset -= offset % sizeof (struct utmp); offset -= offset % sizeof (struct utmp);
ftruncate (fd, offset); __ftruncate (fd, offset);
if (lseek (fd, 0, SEEK_END) < 0) if (lseek (fd, 0, SEEK_END) < 0)
goto unlock_return; goto unlock_return;
@ -458,7 +458,7 @@ updwtmp_file (const char *file, const struct utmp *utmp)
will remain. */ will remain. */
if (write (fd, utmp, sizeof (struct utmp)) != sizeof (struct utmp)) if (write (fd, utmp, sizeof (struct utmp)) != sizeof (struct utmp))
{ {
ftruncate (fd, offset); __ftruncate (fd, offset);
goto unlock_return; goto unlock_return;
} }

View File

@ -52,7 +52,7 @@ __nscd_getgrgid_r (gid_t gid, struct group *resultbuf, char *buffer,
char *p = buffer; char *p = buffer;
int plen; int plen;
plen = snprintf (buffer, buflen, "%d", gid); plen = __snprintf (buffer, buflen, "%d", gid);
if (plen == -1) if (plen == -1)
{ {
__set_errno (ERANGE); __set_errno (ERANGE);

View File

@ -52,7 +52,7 @@ __nscd_getpwuid_r (uid_t uid, struct passwd *resultbuf, char *buffer,
char *p = buffer; char *p = buffer;
int plen; int plen;
plen = snprintf (buffer, buflen, "%d", uid); plen = __snprintf (buffer, buflen, "%d", uid);
if (plen == -1) if (plen == -1)
{ {
__set_errno (ERANGE); __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; p += pw_resp.pw_shell_len + 1;
buflen -= (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 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_gecos_len + pw_resp.pw_dir_len
+ pw_resp.pw_shell_len)) + pw_resp.pw_shell_len))

View File

@ -887,6 +887,7 @@ extern int truncate64 __P ((__const char *__file, __off64_t __length));
#endif #endif
/* Truncate the file FD is open on to LENGTH bytes. */ /* Truncate the file FD is open on to LENGTH bytes. */
extern int __ftruncate __P ((int __fd, __off_t __length));
#ifndef __USE_FILE_OFFSET64 #ifndef __USE_FILE_OFFSET64
extern int ftruncate __P ((int __fd, __off_t __length)); extern int ftruncate __P ((int __fd, __off_t __length));
#else #else

View File

@ -103,14 +103,14 @@
# define ISXDIGIT(Ch) __iswxdigit_l ((Ch), loc) # define ISXDIGIT(Ch) __iswxdigit_l ((Ch), loc)
# define TOLOWER(Ch) __towlower_l ((Ch), loc) # define TOLOWER(Ch) __towlower_l ((Ch), loc)
# define STRNCASECMP(S1, S2, N) __wcsncasecmp_l ((S1), (S2), (N), 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 # else
# define ISSPACE(Ch) iswspace (Ch) # define ISSPACE(Ch) iswspace (Ch)
# define ISDIGIT(Ch) iswdigit (Ch) # define ISDIGIT(Ch) iswdigit (Ch)
# define ISXDIGIT(Ch) iswxdigit (Ch) # define ISXDIGIT(Ch) iswxdigit (Ch)
# define TOLOWER(Ch) towlower (Ch) # define TOLOWER(Ch) towlower (Ch)
# define STRNCASECMP(S1, S2, N) __wcsncasecmp ((S1), (S2), (N)) # 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 # endif
#else #else
# define STRING_TYPE char # define STRING_TYPE char
@ -122,14 +122,14 @@
# define ISXDIGIT(Ch) __isxdigit_l ((Ch), loc) # define ISXDIGIT(Ch) __isxdigit_l ((Ch), loc)
# define TOLOWER(Ch) __tolower_l ((Ch), loc) # define TOLOWER(Ch) __tolower_l ((Ch), loc)
# define STRNCASECMP(S1, S2, N) __strncasecmp_l ((S1), (S2), (N), 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 # else
# define ISSPACE(Ch) isspace (Ch) # define ISSPACE(Ch) isspace (Ch)
# define ISDIGIT(Ch) isdigit (Ch) # define ISDIGIT(Ch) isdigit (Ch)
# define ISXDIGIT(Ch) isxdigit (Ch) # define ISXDIGIT(Ch) isxdigit (Ch)
# define TOLOWER(Ch) tolower (Ch) # define TOLOWER(Ch) tolower (Ch)
# define STRNCASECMP(S1, S2, N) __strncasecmp ((S1), (S2), (N)) # 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
#endif #endif

View File

@ -3,7 +3,7 @@
adjtime - adjtime 2 __adjtime adjtime adjtime - adjtime 2 __adjtime adjtime
fchmod - fchmod 2 __fchmod fchmod fchmod - fchmod 2 __fchmod fchmod
fchown - fchown 3 __fchown fchown fchown - fchown 3 __fchown fchown
ftruncate - ftruncate 2 ftruncate ftruncate - ftruncate 2 __ftruncate ftruncate
getpgid - getpgrp 1 __getpgid getpgid getpgid - getpgrp 1 __getpgid getpgid
getrusage - getrusage 2 __getrusage getrusage getrusage - getrusage 2 __getrusage getrusage
gettimeofday - gettimeofday 2 __gettimeofday gettimeofday gettimeofday - gettimeofday 2 __gettimeofday gettimeofday