diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-08-04 14:31:26 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-08-04 14:31:26 +0000 |
commit | 55c14926be46b12fda4e01d0977911d3b0883db7 (patch) | |
tree | 2bb9829379008a2d0d59bb849d12f2491624c1fb /posix/wordexp.c | |
parent | 8f2ece695d8822e9ecc63ecd157e90bf17a6fe65 (diff) | |
download | glibc-55c14926be46b12fda4e01d0977911d3b0883db7.tar.gz glibc-55c14926be46b12fda4e01d0977911d3b0883db7.tar.xz glibc-55c14926be46b12fda4e01d0977911d3b0883db7.zip |
Update. cvs/libc-ud-970804
1997-08-04 15:29 Ulrich Drepper <drepper@cygnus.com> * locale/programs/localedef.c (main): Set bit in avail for those categories which are successfully read. * locale/programs/locfile.c (check_all_categories): Don't check categories if they are not available. (write_all_categories): Don't write categories if they are not available. * login/setutent_r.c (setutent_unknown): Change return type to int and return result of called function. * manual/arith.texi: Mark floating-point test macro from ISO C 9X as macros (not functions). * manual/libc.texinfo (UPDATED): Update. * manual/math.texi: Document exceptions, functions to handle exceptions, mathematical constants, FP comparison functions and several new functions from ISO C 9X. Change parameter of drand48, lrand48, and mrand48 to void (not empty). * manual/pattern.texi: Remove paragraph which explained that wordexp is executed by running a shell. * manual/time.texi: Explain difficulties with strftime if the functions returns 0 and no error occurred. * math/math.h: Correct comment for some M_* constants. (isgreater, isgreaterequal, isless, islessequal, islessgreater, inunordered): Rewrite to make sure the arguments are evaluated exactly once. * nis/rpcsvc/nis.x: Undo last change. * nis/rpcsvc/nis.h: Likewise. * nis/rpcsvc/nislib.h: File moved back to here. * posix/sys/types.h: Don't define socklen_t. Pretty print. * socket/sys/socket.h (bind, getsockname, connect, sendto, recvfrom, getsockopt, setsockopt, accept): Change size argument to type socklen_t. Pretty print. * manual/socket.texi: Describe socklen_t and change prototypes of socket functions to use socklen_t. * sysdeps/generic/bits/socket.h: Define socklen_t. (struct msghdr): Correct types to use socklen_t. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * stdio-common/printf_fp.c (__printf_fp): Correct rouding of number 1.0 < x < 8.0. * stdio-common/tfformat.c: Add new tests for above bug. * stdlib/strtod.c: Fix typo. * string/Makefile (headers): Add bits/string.h. (CFLAGS-*): Add -D__NO_STRING_INLINES. * string/string.h: Include <bits/string.h> if optimizing and __NO_STRING_INLINES is not defined. * sysdeps/stub/bits/string.h: New file. * sysdeps/powerpc/bits/fenv.h: Fix typos. * sysdeps/unix/sysv/linux/if_index.c: Let functions return ENOSYS if SIOGIFINDEX is not defined. * sysdeps/wordsize-32/inttypes.h: Pretty print. * sysdeps/wordsize-64/inttypes.h: Pretty print. * termios/cfsetspeed.c: Rewrite loop to do what it shall do. * wcsmbs/Makefile (tests): Add tst-wcstof. * wcsmbs/tst-wcstof.c: New file. 1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/__longjmp.c: Replace call to abort by infinite loop, to avoid dragging stdio into the dynamic linker. 1997-08-02 19:44 H.J. Lu <hjl@gnu.ai.mit.edu> * nis/nis_findserv.c (xid, xid_seed, xid_lookup): Make them u_int32_t. 1997-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c (parse_tilde): Fix calls to __getpwnam_r and __getpwuid_r. Include <stdio.h> to get prototypes of *printf. (exec_comm): Remove unneeded variable *sh. * libc.map: Add wordexp, wordfree. * posix/Makefile (routines): Add wordexp. 1997-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c: Correct typo in comment. (wordexp): Likewise. * manual/errno.texi (Error Codes): Fix typo. 1997-08-03 15:28 Ulrich Drepper <drepper@cygnus.com> * csu/initfini.c (SECTION): Don't put quotes around section name since this is not understood by all assemblers. Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.
Diffstat (limited to 'posix/wordexp.c')
-rw-r--r-- | posix/wordexp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/posix/wordexp.c b/posix/wordexp.c index b204f653b5..2f6f0815d5 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -21,6 +21,7 @@ #include <wordexp.h> #include <signal.h> #include <stdlib.h> +#include <stdio.h> #include <pwd.h> #include <sys/types.h> #include <string.h> @@ -52,7 +53,7 @@ parse_backtick (char **word, size_t *word_length, const char *words, static int eval_expr (char *expr, int *result); -/* The w_*() unctions manipulate word lists. */ +/* The w_*() functions manipulate word lists. */ static char* w_extend (char *word, size_t *word_length, size_t by) @@ -206,7 +207,7 @@ parse_tilde (char **word, size_t *word_length, const char *words, size_t *offset, size_t wordc) { /* We are poised _at_ a tilde */ - int i; + size_t i; if (*word_length != 0) { @@ -245,7 +246,7 @@ parse_tilde (char **word, size_t *word_length, const char *words, uid = getuid (); - while ((result = __getpwuid_r (uid, pwd, buffer, buflen, &tpwd)) != 0 + while ((result = __getpwuid_r (uid, &pwd, buffer, buflen, &tpwd)) != 0 && errno == ERANGE) { buflen += 1000; @@ -268,14 +269,13 @@ parse_tilde (char **word, size_t *word_length, const char *words, else { /* Look up user name in database to get home directory */ - uid_t uid; - char *user = strndup (&words[1 + *offset], i - *offset); + char *user = strndupa (&words[1 + *offset], i - *offset); struct passwd pwd, *tpwd; int buflen = 1000; char* buffer = __alloca (buflen); int result; - while ((result = __getpwnam_r (uid, pwd, buffer, buflen, &tpwd)) != 0 + while ((result = __getpwnam_r (user, &pwd, buffer, buflen, &tpwd)) != 0 && errno == ERANGE) { buflen += 1000; @@ -683,7 +683,7 @@ exec_comm (char *comm, char **word, size_t *word_length, int flags, int buflen; int state = 0; int i; - char *sh, *buffer; + char *buffer; pid_t pid; /* 'state' is: * 0 until first non-(whitespace-ifs) @@ -1397,7 +1397,7 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags) while (*ifsch != '\0') if ((*ifsch == ' ') || (*ifsch == '\t') || (*ifsch == '\n')) { - /* White space IFS. Se first whether it is already in our + /* White space IFS. See first whether it is already in our collection. */ char *runp = ifs_white; |