diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/Makefile | 2 | ||||
| -rw-r--r-- | posix/sys/types.h | 35 | ||||
| -rw-r--r-- | posix/wordexp.c | 16 |
3 files changed, 26 insertions, 27 deletions
diff --git a/posix/Makefile b/posix/Makefile index 29d73c3c3c..285f3b306c 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -47,7 +47,7 @@ routines := \ getopt getopt1 getopt_init \ sched_setp sched_getp sched_sets sched_gets sched_yield sched_primax \ sched_primin sched_rr_gi \ - getaddrinfo gai_strerror + getaddrinfo gai_strerror wordexp aux := init-posix environ tests := tstgetopt testfnm runtests diff --git a/posix/sys/types.h b/posix/sys/types.h index 131966029e..45196103d4 100644 --- a/posix/sys/types.h +++ b/posix/sys/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1994, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97 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 @@ -51,7 +51,7 @@ typedef __uid_t uid_t; #ifndef ssize_t typedef __ssize_t ssize_t; -#define ssize_t ssize_t +# define ssize_t ssize_t #endif #ifdef __USE_BSD @@ -68,7 +68,6 @@ typedef __key_t key_t; #define __need_size_t #include <stddef.h> -typedef size_t socklen_t; #ifdef __USE_MISC /* Old compatibility names for C types. */ @@ -82,41 +81,41 @@ typedef unsigned int uint; #if !defined (__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7 /* These types are defined by the ISO C 9x header <inttypes.h>. */ -#ifndef __int8_t_defined -#define __int8_t_defined +# ifndef __int8_t_defined +# define __int8_t_defined typedef char int8_t; typedef short int int16_t; typedef int int32_t; -#ifdef __GNUC__ +# ifdef __GNUC__ typedef long long int int64_t; -#endif -#endif +# endif +# endif /* But these were defined by ISO C without the first `_'. */ typedef unsigned char u_int8_t; typedef unsigned short int u_int16_t; typedef unsigned int u_int32_t; -#ifdef __GNUC__ +# ifdef __GNUC__ typedef unsigned long long int u_int64_t; -#endif +# endif typedef int register_t; #else /* For GCC 2.7 and later, we can use specific type-size attributes. */ -#define __intN_t(N, MODE) \ +# define __intN_t(N, MODE) \ typedef int int##N##_t __attribute__ ((__mode__ (MODE))) -#define __u_intN_t(N, MODE) \ +# define __u_intN_t(N, MODE) \ typedef unsigned int u_int##N##_t __attribute__ ((__mode__ (MODE))) -#ifndef __int8_t_defined -#define __int8_t_defined +# ifndef __int8_t_defined +# define __int8_t_defined __intN_t (8, __QI__); __intN_t (16, __HI__); __intN_t (32, __SI__); __intN_t (64, __DI__); -#endif +# endif __u_intN_t (8, __QI__); __u_intN_t (16, __HI__); @@ -128,16 +127,16 @@ typedef int register_t __attribute__ ((__mode__ (__word__))); /* Some code from BIND tests this macro to see if the types above are defined. */ -#define __BIT_TYPES_DEFINED__ 1 #endif +#define __BIT_TYPES_DEFINED__ 1 #ifdef __USE_BSD /* In BSD <sys/types.h> is expected to define BYTE_ORDER. */ -#include <endian.h> +# include <endian.h> /* It also defines `fd_set' and the FD_* macros for `select'. */ -#include <sys/select.h> +# include <sys/select.h> #endif /* Use BSD. */ 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; |