From d68171edce96cb59b5cb869f6a82afcc50db00be Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 28 Sep 1996 03:24:10 +0000 Subject: update from main archive 960927 Sat Sep 28 03:02:49 1996 Ulrich Drepper * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include . * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs . 1996-09-27 Paul Eggert * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper Security related patch by Elliot Lee and David Holland . * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc. --- sysdeps/posix/getcwd.c | 4 ++-- sysdeps/posix/mk-stdiolim.c | 8 +++---- sysdeps/posix/tempname.c | 58 ++++++++++++++++++++++++++++++--------------- sysdeps/posix/ttyname.c | 2 +- sysdeps/posix/ttyname_r.c | 2 +- 5 files changed, 47 insertions(+), 27 deletions(-) (limited to 'sysdeps/posix') diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c index a9536b95cf..825599f370 100644 --- a/sysdeps/posix/getcwd.c +++ b/sysdeps/posix/getcwd.c @@ -298,7 +298,7 @@ __getcwd (buf, size) (d->d_name[1] == '\0' || (d->d_name[1] == '.' && d->d_name[2] == '\0'))) continue; - if (mount_point || d->d_ino == thisino) + if (mount_point || (ino_t) d->d_ino == thisino) { char name[dotlist + dotsize - dotp + 1 + _D_ALLOC_NAMLEN (d)]; memcpy (name, dotp, dotlist + dotsize - dotp); @@ -326,7 +326,7 @@ __getcwd (buf, size) { size_t namlen = _D_EXACT_NAMLEN (d); - if (pathp - path < namlen) + if ((size_t) (pathp - path) < namlen) { if (buf != NULL) { diff --git a/sysdeps/posix/mk-stdiolim.c b/sysdeps/posix/mk-stdiolim.c index da78a98394..5df460e89a 100644 --- a/sysdeps/posix/mk-stdiolim.c +++ b/sysdeps/posix/mk-stdiolim.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1996 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 @@ -23,7 +23,7 @@ main() { /* These values correspond to the code in sysdeps/posix/tempname.c. Change the values here if you change that code. */ - printf("#define L_tmpnam %u\n", sizeof("/usr/tmp/") + 8); + printf("#define L_tmpnam %u\n", sizeof("/usr/tmp/") + 9); printf("#define TMP_MAX %u\n", 62 * 62 * 62); puts ("#ifdef __USE_POSIX"); @@ -36,7 +36,7 @@ main() is the case in the Hurd). ANSI still requires that FOPEN_MAX and FILENAME_MAX be defined, however. */ - printf("#define FOPEN_MAX %u\n", + printf("#define FOPEN_MAX %u\n", #ifdef OPEN_MAX OPEN_MAX @@ -51,7 +51,7 @@ main() ); - printf("#define FILENAME_MAX %u\n", + printf("#define FILENAME_MAX %u\n", #ifdef PATH_MAX PATH_MAX #else diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index 6fd698e2b8..d58024fe7e 100644 --- a/sysdeps/posix/tempname.c +++ b/sysdeps/posix/tempname.c @@ -81,21 +81,24 @@ static const char letters[] = existing file will be returned. When the cycle reaches its end (12345ZZZ), NULL is returned. */ char * -__stdio_gen_tempname (const char *dir, const char *pfx, int dir_search, - size_t *lenptr, FILE **streamptr) +__stdio_gen_tempname (char *buf, size_t bufsize, const char *dir, + const char *pfx, int dir_search, size_t *lenptr, + FILE **streamptr) { int saverrno = errno; static const char tmpdir[] = P_tmpdir; static size_t indices[2]; size_t *idx; - static char buf[FILENAME_MAX]; +#if 0 static pid_t oldpid = (pid_t) 0; +#endif pid_t pid = __getpid(); register size_t len, plen, dlen; + int wrapped; if (dir_search) { - register const char *d = getenv ("TMPDIR"); + register const char *d = __secure_getenv ("TMPDIR"); if (d != NULL && !diraccess (d)) d = NULL; if (d == NULL && dir != NULL && diraccess (dir)) @@ -133,34 +136,51 @@ __stdio_gen_tempname (const char *dir, const char *pfx, int dir_search, dir = tmpdir; idx = &indices[(plen == 0 && dir == tmpdir) ? 1 : 0]; +#if 0 + /* XXX Is this ever useful??? At least when using a thread package + which uses different PIDs for the threads it is not helpful. */ if (pid != oldpid) { oldpid = pid; indices[0] = indices[1] = 0; } +#endif + wrapped = 0; /* We have not yet wrapped around the index counter. */ len = dlen + 1 + plen + 5 + 3; - while (*idx < ((sizeof (letters) - 1) * (sizeof (letters) - 1) * - (sizeof (letters) - 1))) + while (1) { - const size_t i = (*idx)++; + const size_t i; + + if (*idx >= ((sizeof (letters) - 1) * (sizeof (letters) - 1) * + (sizeof (letters) - 1))) + { + if (wrapped) + /* We really wrapped around this call. Can't believe it + but nevertheless stop the endless loop. */ + break; + + indices[0] = indices[1] = 0; + wrapped = 1; + } + + i = (*idx)++; /* Construct a file name and see if it already exists. We use a single counter in *IDX to cycle each of three character positions through each of 62 possible letters. */ - if (sizeof (buf) < len || - sprintf (buf, "%.*s/%.*s%.5d%c%c%c", - (int) dlen, dir, (int) plen, - pfx, pid % 100000, - letters[i % (sizeof (letters) - 1)], - letters[(i / (sizeof (letters) - 1)) - % (sizeof (letters) - 1)], - letters[(i / ((sizeof (letters) - 1) * - (sizeof (letters) - 1))) - % (sizeof (letters) - 1)] - ) != (int) len) + if (__snprintf (buf, bufsize, "%.*s/%.*s%.5d%c%c%c", + (int) dlen, dir, (int) plen, + pfx, pid % 100000, + letters[i % (sizeof (letters) - 1)], + letters[(i / (sizeof (letters) - 1)) + % (sizeof (letters) - 1)], + letters[(i / ((sizeof (letters) - 1) * + (sizeof (letters) - 1))) + % (sizeof (letters) - 1)] + ) != (int) len) return NULL; if (streamptr != NULL) @@ -176,7 +196,7 @@ __stdio_gen_tempname (const char *dir, const char *pfx, int dir_search, struct _IO_FILE_plus *fp; fp = (struct _IO_FILE_plus *) - malloc(sizeof (struct _IO_FILE_plus)); + malloc (sizeof (struct _IO_FILE_plus)); if (fp == NULL) { /* We lost trying to create a stream (out of memory?). diff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c index be82827d00..9668117b47 100644 --- a/sysdeps/posix/ttyname.c +++ b/sysdeps/posix/ttyname.c @@ -57,7 +57,7 @@ ttyname (fd) return NULL; while ((d = readdir (dirstream)) != NULL) - if (d->d_fileno == myino) + if ((ino_t) d->d_fileno == myino) { size_t dlen = _D_ALLOC_NAMLEN (d); if (sizeof (dev) + dlen > namelen) diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c index 1fb4b047d4..d7f6026d8a 100644 --- a/sysdeps/posix/ttyname_r.c +++ b/sysdeps/posix/ttyname_r.c @@ -72,7 +72,7 @@ __ttyname_r (fd, buf, buflen) buflen -= sizeof (dev); while ((d = readdir (dirstream)) != NULL) - if (d->d_fileno == myino) + if ((ino_t) d->d_fileno == myino) { char *cp; -- cgit v1.2.3