Fri Jan 12 13:40:01 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>cvs/libc-960113

	* posix/gnu/types.h: Moved to sysdeps/generic/gnu/types.h.

	* posix/glob.c (glob): Add parens in glob call flags arg for
	GLOB_BRACE case.

	* string/string.h (strdupa): New macro.

	* stdio-common/vfscanf.c (%[): Grok ] as first char in set, not
	terminator on empty set.  From drepper.

2 files changed, 2 insertions, 86 deletions

diff --git a/posix/glob.c b/posix/glob.c
index 954960cb18..259ac020d2 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public License as
@@ -290,7 +290,7 @@ glob (pattern, flags, errfunc, pglob)
 		  memcpy (buf, pattern, begin - pattern);
 		  memcpy (buf + (begin - pattern), p, comma - p);
 		  memcpy (buf + (begin - pattern) + (comma - p), end, restlen);
-		  result = glob (buf, (flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC) |
+		  result = glob (buf, ((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC)) |
 				       GLOB_APPEND), errfunc, pglob);
 		  if (result && result != GLOB_NOMATCH)
 		    return result;
diff --git a/posix/gnu/types.h b/posix/gnu/types.h
deleted file mode 100644
index 2a40702c51..0000000000
--- a/posix/gnu/types.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright (C) 1991, 1992, 1994, 1995 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#ifndef	_GNU_TYPES_H
-
-#define	_GNU_TYPES_H	1
-
-
-/* Convenience types.  */
-typedef unsigned char __u_char;
-typedef unsigned short __u_short;
-typedef unsigned int __u_int;
-typedef unsigned long __u_long;
-#ifdef __GNUC__
-typedef unsigned long long int __u_quad_t;
-typedef long long int __quad_t;
-typedef __quad_t *__qaddr_t;
-#else
-typedef struct
-{
-  long val[2];
-} __quad_t;
-typedef struct
-{
-  __u_long val[2];
-} __u_quad_t;
-#endif
-typedef int __dev_t;		/* Type of device numbers.  */
-typedef unsigned int __uid_t;	/* Type of user identifications.  */
-typedef unsigned int __gid_t;	/* Type of group identifications.  */
-typedef unsigned int __ino_t;	/* Type of file serial numbers.  */
-typedef unsigned int __mode_t;	/* Type of file attribute bitmasks.  */
-typedef unsigned short int __nlink_t; /* Type of file link counts.  */
-typedef long int __off_t;	/* Type of file sizes and offsets.  */
-typedef int __pid_t;		/* Type of process identifications.  */
-typedef int __ssize_t;		/* Type of a byte count, or error.  */
-typedef __u_quad_t __fsid_t;	/* Type of file system IDs.  */
-
-/* Everythin' else.  */
-typedef long int __daddr_t;	/* The type of a disk address.  */
-typedef char *__caddr_t;
-typedef long int __time_t;
-typedef long int __swblk_t;	/* Type of a swap block maybe?  */
-
-/* fd_set for select.  */
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define	__FD_SETSIZE	256
-
-/* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
-#define	__NFDBITS	(sizeof (unsigned long int) * 8)
-#define	__FDELT(d)	((d) / __NFDBITS)
-#define	__FDMASK(d)	(1 << ((d) % __NFDBITS))
-
-typedef struct
-  {
-    /* Some braindead old software uses this member name.  */
-    unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
-  } __fd_set;
-
-/* This line MUST be split!  Otherwise m4 will not change it.  */
-#define	__FD_ZERO(set)	\
-  ((void) memset ((__ptr_t) (set), 0, sizeof (fd_set)))
-#define	__FD_SET(d, set)	((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-#define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
-
-
-#endif /* gnu/types.h */