diff options
| -rw-r--r-- | ChangeLog | 34 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | glibcbug.in | 5 | ||||
| -rw-r--r-- | iconv/gconv_conf.c | 2 | ||||
| -rw-r--r-- | libc.map | 2 | ||||
| -rw-r--r-- | sysdeps/posix/mkstemp.c | 3 | ||||
| -rw-r--r-- | wcsmbs/wmemrtombs.c | 126 | ||||
| -rw-r--r-- | wcsmbs/wmemrtowcs.c | 157 |
8 files changed, 29 insertions, 304 deletions
diff --git a/ChangeLog b/ChangeLog index f677d89046..28b66a7c72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +1998-04-07 17:50 Zack Weinberg <zack@rabi.phys.columbia.edu> + + * glibcbug.in: Report version of gcc in use. Remove unused variable + ENVIRONMENT. + +1998-04-07 Gordon Matzigkeit <gord@profitpress.com> + + * aclocal.m4 (LIBC_PROG_BINUTILS): Use `-print-prog-name', not + `-print-file-name' to find as and ld. + +1998-04-07 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/posix/mkstemp.c (mkstemp): Correct return value in case + template is wrong. Remove unused varaible `ignored'. + +1998-04-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * libc.map: Export __libc_sa_len. + + * iconv/gconv_conf.c (MAXPATHLEN): Define correctly. + 1998-04-07 08:51 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv.c: Take care for NULL arguments. @@ -110,19 +131,6 @@ * configure.in: Fix gcc version check. - * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. - -1998-04-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> - - * configure.in: Fix gcc version check. - - * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less - confusing. - -1998-04-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> - - * configure.in: Fix gcc version check. - * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. diff --git a/aclocal.m4 b/aclocal.m4 index c9a1a906f2..9613ec61b5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -113,8 +113,8 @@ if test -n "$path_binutils"; then path_binutils=`(cd $path_binutils; pwd) | sed 's%/*$%/%'` CC="$CC -B$path_binutils" fi -AS=`$CC -print-file-name=as` -LD=`$CC -print-file-name=ld` +AS=`$CC -print-prog-name=as` +LD=`$CC -print-prog-name=ld` # Determine whether we are using GNU binutils. AC_CACHE_CHECK(whether $AS is GNU as, libc_cv_prog_as_gnu, diff --git a/glibcbug.in b/glibcbug.in index c915f34f04..0ad6ac45d6 100644 --- a/glibcbug.in +++ b/glibcbug.in @@ -76,7 +76,6 @@ else # and to protect shell metacharacters in the expansion of $LOGNAME $PASSWD | grep "^$LOGNAME:" | awk -F: '{print $5}' | sed -e 's/,.*//' > $TEMP ORIGINATOR="`cat $TEMP`" - rm -f $TEMP fi if [ -n "$ORGANIZATION" ]; then @@ -107,6 +106,7 @@ SYSTEM=`( [ -f /bin/uname ] && /bin/uname -a ) || \ ( [ -f /usr/bin/uname ] && /usr/bin/uname -a ) || echo ""` ARCH=`[ -f /bin/arch ] && /bin/arch` MACHINE=`[ -f /bin/machine ] && /bin/machine` +CCVERSION=`$CC -v 2>&1 | sed -n 's/gcc version //p'` ORGANIZATION_C='<organization of PR author (multiple lines)>' SYNOPSIS_C='<synopsis of the problem (one line)>' @@ -149,7 +149,8 @@ ${ORGANIZATION- $ORGANIZATION_C} `[ -n "$ADDONS" ] && echo Addons: $ADDONS` `[ -n "$CFLAGS" ] && echo Build CFLAGS: $CFLAGS` `[ -n "$CC" ] && echo Build CC: $CC` -`[ -n "$VERSIONING" ] && echo Versioning: $VERSIONING` +`[ -n "$CCVERSION" ] && echo Compiler version: $CCVERSION` +`[ -n "$VERSIONING" ] && echo Symbol versioning: $VERSIONING` `[ -n "$BUILD_STATIC" ] && echo Build static: $BUILD_STATIC` `[ -n "$BUILD_SHARED" ] && echo Build shared: $BUILD_SHARED` `[ -n "$BUILD_PIC_DEFAULT" ] && echo Build pic-default: $BUILD_PIC_DEFAULT` diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 7765efb6d5..252096b9f9 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -400,7 +400,7 @@ __gconv_read_conf (void) { #ifndef MAXPATHLEN /* We define a reasonable limit. */ -# define 4096 +# define MAXPATHLEN 4096 #endif char real_elem[MAXPATHLEN]; diff --git a/libc.map b/libc.map index 0135d5762c..31d6d9c892 100644 --- a/libc.map +++ b/libc.map @@ -436,7 +436,7 @@ GLIBC_2.1 { getdate_err; in6addr_any; in6addr_loopback; # functions used in inline functions or macros - __signbit; __signbitf; __signbitl; + __signbit; __signbitf; __signbitl; __libc_sa_len; # functions used in other libraries _IO_fclose; _IO_fopen; _IO_fdopen; diff --git a/sysdeps/posix/mkstemp.c b/sysdeps/posix/mkstemp.c index fceb59b4be..b3c8b64021 100644 --- a/sysdeps/posix/mkstemp.c +++ b/sysdeps/posix/mkstemp.c @@ -45,7 +45,7 @@ mkstemp (template) if (len < 6 || strcmp (&template[len - 6], "XXXXXX")) { __set_errno (EINVAL); - return NULL; + return -1; } /* This is where the Xs start. */ @@ -57,7 +57,6 @@ mkstemp (template) for (count = 0; count < TMP_MAX; ++count) { - struct stat ignored; uint32_t v = value; int fd; diff --git a/wcsmbs/wmemrtombs.c b/wcsmbs/wmemrtombs.c deleted file mode 100644 index 5b8e39cbe3..0000000000 --- a/wcsmbs/wmemrtombs.c +++ /dev/null @@ -1,126 +0,0 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.org>, 1997. - - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <errno.h> -#include <wchar.h> - -#ifndef EILSEQ -#define EILSEQ EINVAL -#endif - - -static const wchar_t encoding_mask[] = -{ - ~0x7ff, ~0xffff, ~0x1fffff, ~0x3ffffff -}; - -static const unsigned char encoding_byte[] = -{ - 0xc0, 0xe0, 0xf0, 0xf8, 0xfc -}; - -/* We don't need the state really because we don't have shift states - to maintain between calls to this function. */ -static mbstate_t internal; - -/* This is a non-standard function but it is very useful in the - implementation of stdio because we have to deal with unterminated - buffers. At most NWC wide character will be converted. */ -size_t -__wmemrtombs (dst, src, nwc, len, ps) - char *dst; - const wchar_t **src; - size_t nwc; - size_t len; - mbstate_t *ps; -{ - size_t written = 0; - const wchar_t *run = *src; - - if (ps == NULL) - ps = &internal; - - if (dst == NULL) - /* The LEN parameter has to be ignored if we don't actually write - anything. */ - len = ~0; - - while (written < len && nwc-- > 0) - { - wchar_t wc; - - /* Store position of first unprocessed word. */ - *src = run; - - wc = *run++; - - if (wc < 0 || wc > 0x7fffffff) - { - /* This is no correct ISO 10646 character. */ - __set_errno (EILSEQ); - return (size_t) -1; - } - - if (wc < 0x80) - { - /* It's an one byte sequence. */ - if (dst != NULL) - *dst++ = (char) wc; - ++written; - } - else - { - size_t step; - - for (step = 2; step < 6; ++step) - if ((wc & encoding_mask[step - 2]) == 0) - break; - - if (written + step >= len) - /* Too long. */ - break; - - if (dst != NULL) - { - size_t cnt = step; - - dst[0] = encoding_byte[cnt - 2]; - - --cnt; - do - { - dst[cnt] = 0x80 | (wc & 0x3f); - wc >>= 6; - } - while (--cnt > 0); - dst[0] |= wc; - - dst += step; - } - - written += step; - } - } - - /* Store position of first unprocessed word. */ - *src = run; - - return written; -} -weak_alias (__wmemrtombs, wmemrtombs) diff --git a/wcsmbs/wmemrtowcs.c b/wcsmbs/wmemrtowcs.c deleted file mode 100644 index 4efdd72d2e..0000000000 --- a/wcsmbs/wmemrtowcs.c +++ /dev/null @@ -1,157 +0,0 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.org>, 1997. - - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <errno.h> -#include <wchar.h> - -#ifndef EILSEQ -#define EILSEQ EINVAL -#endif - - -/* We don't need the state really because we don't have shift states - to maintain between calls to this function. */ -static mbstate_t internal; - -/* This is a non-standard function but it is very useful in the - implementation of stdio because we have to deal with unterminated - buffers. At most NMC bytes will be converted. */ -size_t -__wmemrtowcs (dst, src, nmc, len, ps) - wchar_t *dst; - const char **src; - size_t nmc; - size_t len; - mbstate_t *ps; -{ - size_t written = 0; - const char *run = *src; - const char *last = run + nmc; - wchar_t value; - size_t count; - - if (ps == NULL) - ps = &internal; - - /* Get information from last use of this state. */ - count = ps->count; - value = ps->value; - - if (dst == NULL) - /* The LEN parameter has to be ignored if we don't actually write - anything. */ - len = ~0; - - /* Copy all words. */ - while (written < len && run < last) - { - unsigned char byte; - - /* Store address of next byte to process. */ - *src = run; - - /* Start reading a new character only if we are in the initial - state. */ - if (count == 0) - { - byte = *run++; - - /* We expect a start of a new multibyte character. */ - if (byte < 0x80) - { - /* One byte sequence. */ - count = 0; - value = byte; - } - else if ((byte & 0xe0) == 0xc0) - { - count = 1; - value = byte & 0x1f; - } - else if ((byte & 0xf0) == 0xe0) - { - /* We expect three bytes. */ - count = 2; - value = byte & 0x0f; - } - else if ((byte & 0xf8) == 0xf0) - { - /* We expect four bytes. */ - count = 3; - value = byte & 0x07; - } - else if ((byte & 0xfc) == 0xf8) - { - /* We expect five bytes. */ - count = 4; - value = byte & 0x03; - } - else if ((byte & 0xfe) == 0xfc) - { - /* We expect six bytes. */ - count = 5; - value = byte & 0x01; - } - else - { - /* This is an illegal encoding. */ - __set_errno (EILSEQ); - return (size_t) -1; - } - } - - /* Read the possible remaining bytes. */ - while (run < last && count > 0) - { - byte = *run++; - --count; - - if ((byte & 0xc0) != 0x80) - { - /* This is an illegal encoding. */ - __set_errno (EILSEQ); - return (size_t) -1; - } - - value <<= 6; - value |= byte & 0x3f; - } - - /* If this character is only partially available remember this. */ - if (run == last && count != 0) - { - ps->count = count; - ps->value = value; - break; - } - - /* Store value is required. */ - if (dst != NULL) - *dst++ = value; - - /* Increment counter of produced words. */ - ++written; - } - - /* Store address of next byte to process. */ - *src = run; - - return written; -} -weak_alias (__wmemrtowcs, wmemrtowcs) |