mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 11:00:07 +00:00
update from main archive 970210
1997-02-11 05:27 Ulrich Drepper <drepper@cygnus.com> * locale/weight.h (collate_rules): It's an u_int32_t array. (get_weight): Compute initial SLOT value correctly. 1997-02-10 17:45 Ulrich Drepper <drepper@cygnus.com> * string/argz-ctsep.c: Initialize *LEN when successful. * libio/vsnprintf.c: If MAXLEN is 0 return 0. * stdio/vsnprintf.c: Likewise. Reported by Philip Blundell <pjb27@cam.ac.uk>. 1997-02-06 13:49 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * rellns-sh: No need to check for existance of first parameter.
This commit is contained in:
parent
7cc27f440c
commit
00de59a632
17
ChangeLog
17
ChangeLog
@ -1,3 +1,12 @@
|
||||
1997-02-11 05:27 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* locale/weight.h (collate_rules): It's an u_int32_t array.
|
||||
(get_weight): Compute initial SLOT value correctly.
|
||||
|
||||
1997-02-10 17:45 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* string/argz-ctsep.c: Initialize *LEN when successful.
|
||||
|
||||
1997-02-09 02:59 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* version.h (VERSION): Bump to 2.0.2.
|
||||
@ -24,6 +33,10 @@
|
||||
* stdio/vsnprintf.c: Likewise.
|
||||
Reported by Philip Blundell <pjb27@cam.ac.uk>.
|
||||
|
||||
* libio/vsnprintf.c: If MAXLEN is 0 return 0.
|
||||
* stdio/vsnprintf.c: Likewise.
|
||||
Reported by Philip Blundell <pjb27@cam.ac.uk>.
|
||||
|
||||
1997-02-07 17:43 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* sysdeps/generic/sysd-stdio.c: Include <errno.h>.
|
||||
@ -39,6 +52,10 @@
|
||||
|
||||
* rellns-sh: No need to check for existance of first parameter.
|
||||
|
||||
1997-02-06 13:49 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
|
||||
|
||||
* rellns-sh: No need to check for existance of first parameter.
|
||||
|
||||
1997-02-06 14:50 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
|
||||
|
||||
* sysdeps/posix/getcwd.c (__getcwd): Fix resource leaks. Reported
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Written by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
||||
|
||||
@ -52,7 +52,7 @@ typedef struct weight_t
|
||||
#define collate_undefined \
|
||||
(_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_UNDEFINED))
|
||||
#define collate_rules \
|
||||
(_NL_CURRENT (LC_COLLATE, _NL_COLLATE_RULES))
|
||||
((u_int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_RULES))
|
||||
|
||||
|
||||
static __inline int get_weight (const STRING_TYPE **str, weight_t *result);
|
||||
@ -69,7 +69,7 @@ get_weight (const STRING_TYPE **str, weight_t *result)
|
||||
const size_t level_size = collate_hash_size * (collate_nrules + 1);
|
||||
size_t level;
|
||||
|
||||
slot = (ch * (collate_nrules + 1)) % collate_hash_size;
|
||||
slot = (ch % collate_hash_size) * (collate_nrules + 1);
|
||||
|
||||
level = 0;
|
||||
while (__collate_table[slot] != (u_int32_t) ch)
|
||||
|
77
posix/getopt_init.c
Normal file
77
posix/getopt_init.c
Normal file
@ -0,0 +1,77 @@
|
||||
/* Perform additional initialization for getopt functions in GNU libc.
|
||||
Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 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. */
|
||||
|
||||
/* Attention: this file is *not* necessary when the GNU getopt functions
|
||||
are used outside the GNU libc. Some additional functionality of the
|
||||
getopt functions in GNU libc require this additional work. */
|
||||
|
||||
#include <getopt.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "../stdio-common/_itoa.h"
|
||||
|
||||
/* External variable to synchronize work. */
|
||||
extern char *__getopt_nonoption_flags;
|
||||
|
||||
extern pid_t __libc_pid;
|
||||
|
||||
|
||||
/* Remove the environment variable "_<PID>_GNU_nonoption_argv_flags_" if
|
||||
it is still available. If the getopt functions are also used in the
|
||||
application it does not exist anymore since it was saved for the use
|
||||
in getopt. */
|
||||
void
|
||||
__getopt_clean_environment (void)
|
||||
{
|
||||
/* Bash 2.0 puts a special variable in the environment for each
|
||||
command it runs, specifying which ARGV elements are the results
|
||||
of file name wildcard expansion and therefore should not be
|
||||
considered as options. */
|
||||
static const char envvar_tail[] = "_GNU_nonoption_argv_flags_";
|
||||
char var[100];
|
||||
char *cp, **ep;
|
||||
size_t len;
|
||||
|
||||
/* Generate name of the environment variable. We must know the PID
|
||||
and we must not use `sprintf'. */
|
||||
if (__libc_pid == 0)
|
||||
__libc_pid = getpid ();
|
||||
|
||||
/* Construct "_<PID>_GNU_nonoption_argv_flags_" string. */
|
||||
cp = memcpy (&var[sizeof (var) - sizeof (envvar_tail)], envvar_tail,
|
||||
sizeof (envvar_tail));
|
||||
cp = _itoa_word (__libc_pid, cp, 10, 0);
|
||||
*--cp = '_';
|
||||
len = (var + sizeof (var) - 1) - cp;
|
||||
|
||||
for (ep = __environ; *ep != NULL; ++ep)
|
||||
if (!strncmp (*ep, cp, len) && (*ep)[len] == '=')
|
||||
{
|
||||
/* Found it. Store this pointer and move later ones back. */
|
||||
char **dp = ep;
|
||||
__getopt_nonoption_flags = &(*ep)[len + 1];
|
||||
do
|
||||
dp[0] = dp[1];
|
||||
while (*dp++);
|
||||
/* Continue the loop in case the name appears again. */
|
||||
}
|
||||
}
|
29
stdlib/atoll.c
Normal file
29
stdlib/atoll.c
Normal file
@ -0,0 +1,29 @@
|
||||
/* Copyright (C) 1991, 1997 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., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#undef atol
|
||||
|
||||
|
||||
/* Convert a string to a long int. */
|
||||
long long int
|
||||
atoll (const char *nptr)
|
||||
{
|
||||
return strtoll (nptr, (char **) NULL, 10);
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
|
||||
|
||||
@ -57,6 +57,8 @@ __argz_create_sep (const char *string, int delim, char **argz, size_t *len)
|
||||
*argz = NULL;
|
||||
*len = 0;
|
||||
}
|
||||
|
||||
*len = nlen;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user