Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
/* Routines for dealing with '\0' separated environment vectors
|
|
|
|
|
|
|
|
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
Written by Miles Bader <miles@gnu.ai.mit.edu>
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
|
modify it under the terms of the GNU General Public License as
|
|
|
|
|
published by the Free Software Foundation; either version 2, or (at
|
|
|
|
|
your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program 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
|
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
|
|
|
|
|
#include <malloc.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#include "envz.h"
|
|
|
|
|
|
|
|
|
|
/* The character separating names from values in an envz. */
|
|
|
|
|
#define SEP '='
|
|
|
|
|
|
|
|
|
|
/* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.
|
|
|
|
|
If NAME contains the separator character, only the portion before it is
|
|
|
|
|
used in the comparison. */
|
1996-05-04 09:46:57 +00:00
|
|
|
|
char *
|
Fri May 3 13:32:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* intl/Makefile (CPPFLAGS): Change $(nlsdir) to $(i18ndir) in
LOCALE_ALIAS_PATH.
Fri May 3 03:14:02 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/Makefile (routines): Add l10nflist and explodename.
(distribute): Add loadinfo.h and locale.alias.
(install-others): New variable to install locale.alias.
* intl/dcgettext.c, intl/finddomain.c, intl/gettextP.h,
intl/loadmsgcat.c: Adapt for upcoming gettext-0.10.13. Some code
is now shared with the locale implementation.
* intl/explodename.c, intl/l10nflist.c, intl/loadinfo.h: New file.
Extracted from finddomain.c. This is also used in the locale
implementation.
* intl/locale.alias: New file. Locale alias database compatible
with X Window System's locale alias file. Can now be used in
locale and gettext code.
* libio/stdio.h: Add prototypes for asprint and vasprintf.
* locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c,
locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Add new
field in structure with name of locale ("C" in this case).
* locale/Makefile (routines): Add findlocale.
* locale/findlocale.c: New file. Instead of trying to load the
directly described file we now try to be much smarter when this
fails. Use the same code as gettext does.
* locale/loadlocale.c, locale/setlocale.c: Rewrite to know about
new loading scheme.
* locale/localeinfo.h: Adapt prototypes and declarations for new
setlocale implementation. Remove definition of u32_t type. We
now use u_int32_t from <sys/types.h>.
* locale/programs/charset.h (ILLEGAL_CHAR_VALUE): Provide type
with constant.
* locale/programs/config.h, locale/lc-collate.c,
locale/localeinfo.h, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/weight.h, string/strcoll.c:
Change to use u_int32_t and u_int16_t.
* locale/programs/localedef.c (construct_output_path): Change name
of output locale to contain normalized form of the character set
portion.
* string/Makefile (routines): Add agrz-ctsep and argz-next.
(tests): Add tst-strlen.
* string/argz-ctsep.c: New file. Implement reverse operation
from argz-stringify.
* string/argz-next.c: Non-inline version of function from argz.h.
* string/argz.h, string/envz.h: Make usable as global header file.
* string/envz.c: Fix declarations to use size_t where prototypes
say so.
* string/tst-strlen.c: New file. Another test for critical
situation in strlen implementations.
* sysdeps/i386/i586/strlen.S: Fix bug with highest byte in word
being zero.
* wctype/test_wctype.c: Fix controlling comparison after change to
32 bit character class array.
Fri May 3 12:53:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/sys/socket.h: Remove spurious doubled line.
Thu May 2 22:50:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/getpriority.c: New file.
* sysdeps/unix/sysv/linux/syscalls.list: Add s_getpriority.
Thu May 2 22:41:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_DEFAULT):
Disable all exceptions.
Thu May 2 22:33:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/fpu/e_acos.c, sysdeps/m68k/fpu/e_acosf.c,
sysdeps/m68k/fpu/e_fmod.c, sysdeps/m68k/fpu/e_fmodf.c,
sysdeps/m68k/fpu/isinfl.c, sysdeps/m68k/fpu/isnanl.c,
sysdeps/m68k/fpu/s_atan.c, sysdeps/m68k/fpu/s_atanf.c,
sysdeps/m68k/fpu/s_frexp.c, sysdeps/m68k/fpu/s_frexpf.c,
sysdeps/m68k/fpu/s_ilogb.c, sysdeps/m68k/fpu/s_ilogbf.c,
sysdeps/m68k/fpu/s_isinf.c, sysdeps/m68k/fpu/s_isinff.c,
sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c,
sysdeps/m68k/fpu/s_modf.c, sysdeps/m68k/fpu/s_modff.c: Don't
define __NO_MATH_INLINES, which is already defined on command
line.
Thu May 2 22:18:28 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/libm-ieee754/e_j0f.c (__ieee754_j0f, __ieee754_y0f):
Replace 0x80000000 by 0x48000000.
* sysdeps/libm-ieee754/e_j1f.c (__ieee754_j1f): Likewise.
Thu May 2 21:30:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/svc_simple.c: Make global variable pl local to
registerrpc.
Thu May 2 00:24:04 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/Makefile (tz-cflags): New variable.
(CFLAGS-tzfile.c): New variable.
(CFLAGS-zic.c): Add $(tz-cflags).
(tz-cc): Remove variable.
($(objpfx)tzfile.o, $(objpfx)zic.o): Remove targets.
* sysdeps/mach/hurd/getcwd.c: Jump out of both loops when we find a
name, instead of checking for reaching end of buffer, which happens
when the match is the last entry in the buffer.
1996-05-03 17:44:31 +00:00
|
|
|
|
envz_entry (const char *envz, size_t envz_len, const char *name)
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
{
|
|
|
|
|
while (envz_len)
|
|
|
|
|
{
|
1996-05-04 09:46:57 +00:00
|
|
|
|
const char *p = name;
|
|
|
|
|
const char *entry = envz; /* Start of this entry. */
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
|
|
|
|
|
/* See how far NAME and ENTRY match. */
|
|
|
|
|
while (envz_len && *p == *envz && *p && *p != SEP)
|
|
|
|
|
p++, envz++, envz_len--;
|
|
|
|
|
|
|
|
|
|
if ((*envz == '\0' || *envz == SEP) && (*p == '\0' || *p == SEP))
|
|
|
|
|
/* Bingo! */
|
1996-05-04 09:46:57 +00:00
|
|
|
|
return (char *) entry;
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
|
|
|
|
|
/* No match, skip to the next entry. */
|
|
|
|
|
while (envz_len && *envz)
|
|
|
|
|
envz++, envz_len--;
|
|
|
|
|
if (envz_len)
|
|
|
|
|
envz++, envz_len--; /* skip '\0' */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0
|
|
|
|
|
if there is none. */
|
1996-05-10 15:57:48 +00:00
|
|
|
|
char *
|
Fri May 3 13:32:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* intl/Makefile (CPPFLAGS): Change $(nlsdir) to $(i18ndir) in
LOCALE_ALIAS_PATH.
Fri May 3 03:14:02 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/Makefile (routines): Add l10nflist and explodename.
(distribute): Add loadinfo.h and locale.alias.
(install-others): New variable to install locale.alias.
* intl/dcgettext.c, intl/finddomain.c, intl/gettextP.h,
intl/loadmsgcat.c: Adapt for upcoming gettext-0.10.13. Some code
is now shared with the locale implementation.
* intl/explodename.c, intl/l10nflist.c, intl/loadinfo.h: New file.
Extracted from finddomain.c. This is also used in the locale
implementation.
* intl/locale.alias: New file. Locale alias database compatible
with X Window System's locale alias file. Can now be used in
locale and gettext code.
* libio/stdio.h: Add prototypes for asprint and vasprintf.
* locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c,
locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Add new
field in structure with name of locale ("C" in this case).
* locale/Makefile (routines): Add findlocale.
* locale/findlocale.c: New file. Instead of trying to load the
directly described file we now try to be much smarter when this
fails. Use the same code as gettext does.
* locale/loadlocale.c, locale/setlocale.c: Rewrite to know about
new loading scheme.
* locale/localeinfo.h: Adapt prototypes and declarations for new
setlocale implementation. Remove definition of u32_t type. We
now use u_int32_t from <sys/types.h>.
* locale/programs/charset.h (ILLEGAL_CHAR_VALUE): Provide type
with constant.
* locale/programs/config.h, locale/lc-collate.c,
locale/localeinfo.h, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/weight.h, string/strcoll.c:
Change to use u_int32_t and u_int16_t.
* locale/programs/localedef.c (construct_output_path): Change name
of output locale to contain normalized form of the character set
portion.
* string/Makefile (routines): Add agrz-ctsep and argz-next.
(tests): Add tst-strlen.
* string/argz-ctsep.c: New file. Implement reverse operation
from argz-stringify.
* string/argz-next.c: Non-inline version of function from argz.h.
* string/argz.h, string/envz.h: Make usable as global header file.
* string/envz.c: Fix declarations to use size_t where prototypes
say so.
* string/tst-strlen.c: New file. Another test for critical
situation in strlen implementations.
* sysdeps/i386/i586/strlen.S: Fix bug with highest byte in word
being zero.
* wctype/test_wctype.c: Fix controlling comparison after change to
32 bit character class array.
Fri May 3 12:53:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/sys/socket.h: Remove spurious doubled line.
Thu May 2 22:50:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/getpriority.c: New file.
* sysdeps/unix/sysv/linux/syscalls.list: Add s_getpriority.
Thu May 2 22:41:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_DEFAULT):
Disable all exceptions.
Thu May 2 22:33:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/fpu/e_acos.c, sysdeps/m68k/fpu/e_acosf.c,
sysdeps/m68k/fpu/e_fmod.c, sysdeps/m68k/fpu/e_fmodf.c,
sysdeps/m68k/fpu/isinfl.c, sysdeps/m68k/fpu/isnanl.c,
sysdeps/m68k/fpu/s_atan.c, sysdeps/m68k/fpu/s_atanf.c,
sysdeps/m68k/fpu/s_frexp.c, sysdeps/m68k/fpu/s_frexpf.c,
sysdeps/m68k/fpu/s_ilogb.c, sysdeps/m68k/fpu/s_ilogbf.c,
sysdeps/m68k/fpu/s_isinf.c, sysdeps/m68k/fpu/s_isinff.c,
sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c,
sysdeps/m68k/fpu/s_modf.c, sysdeps/m68k/fpu/s_modff.c: Don't
define __NO_MATH_INLINES, which is already defined on command
line.
Thu May 2 22:18:28 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/libm-ieee754/e_j0f.c (__ieee754_j0f, __ieee754_y0f):
Replace 0x80000000 by 0x48000000.
* sysdeps/libm-ieee754/e_j1f.c (__ieee754_j1f): Likewise.
Thu May 2 21:30:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/svc_simple.c: Make global variable pl local to
registerrpc.
Thu May 2 00:24:04 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/Makefile (tz-cflags): New variable.
(CFLAGS-tzfile.c): New variable.
(CFLAGS-zic.c): Add $(tz-cflags).
(tz-cc): Remove variable.
($(objpfx)tzfile.o, $(objpfx)zic.o): Remove targets.
* sysdeps/mach/hurd/getcwd.c: Jump out of both loops when we find a
name, instead of checking for reaching end of buffer, which happens
when the match is the last entry in the buffer.
1996-05-03 17:44:31 +00:00
|
|
|
|
envz_get (const char *envz, size_t envz_len, const char *name)
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
{
|
1996-05-10 21:33:50 +00:00
|
|
|
|
char *entry = envz_entry (envz, envz_len, name);
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
if (entry)
|
|
|
|
|
{
|
|
|
|
|
while (*entry && *entry != SEP)
|
|
|
|
|
entry++;
|
|
|
|
|
if (*entry)
|
|
|
|
|
entry++;
|
|
|
|
|
else
|
|
|
|
|
entry = 0; /* A null entry. */
|
|
|
|
|
}
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any. */
|
|
|
|
|
void
|
1996-05-04 09:46:57 +00:00
|
|
|
|
envz_remove (char **envz, size_t *envz_len, const char *name)
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
{
|
|
|
|
|
char *entry = envz_entry (*envz, *envz_len, name);
|
|
|
|
|
if (entry)
|
|
|
|
|
argz_delete (envz, envz_len, entry);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN. If an entry
|
|
|
|
|
with the same name already exists in ENVZ, it is removed. If VALUE is
|
|
|
|
|
NULL, then the new entry will a special null one, for which envz_get will
|
|
|
|
|
return NULL, although envz_entry will still return an entry; this is handy
|
|
|
|
|
because when merging with another envz, the null entry can override an
|
|
|
|
|
entry in the other one. Null entries can be removed with envz_strip (). */
|
|
|
|
|
error_t
|
1996-05-13 22:01:00 +00:00
|
|
|
|
envz_add (char **envz, size_t *envz_len, const char *name, const char *value)
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
{
|
|
|
|
|
envz_remove (envz, envz_len, name);
|
|
|
|
|
|
|
|
|
|
if (value)
|
|
|
|
|
/* Add the new value, if there is one. */
|
|
|
|
|
{
|
1996-05-13 22:01:00 +00:00
|
|
|
|
size_t name_len = strlen (name);
|
|
|
|
|
size_t value_len = strlen (value);
|
|
|
|
|
size_t old_envz_len = *envz_len;
|
|
|
|
|
size_t new_envz_len = old_envz_len + name_len + 1 + value_len + 1;
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
char *new_envz = realloc (*envz, new_envz_len);
|
|
|
|
|
|
|
|
|
|
if (new_envz)
|
|
|
|
|
{
|
|
|
|
|
bcopy (name, new_envz + old_envz_len, name_len);
|
|
|
|
|
new_envz[old_envz_len + name_len] = SEP;
|
|
|
|
|
bcopy (value, new_envz + old_envz_len + name_len + 1, value_len);
|
|
|
|
|
new_envz[new_envz_len - 1] = 0;
|
|
|
|
|
|
|
|
|
|
*envz = new_envz;
|
|
|
|
|
*envz_len = new_envz_len;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return ENOMEM;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Add a null entry. */
|
|
|
|
|
return argz_add (envz, envz_len, name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add(). If
|
|
|
|
|
OVERRIDE is true, then values in ENVZ2 will supercede those with the same
|
|
|
|
|
name in ENV, otherwise not. */
|
|
|
|
|
error_t
|
1996-05-13 22:01:00 +00:00
|
|
|
|
envz_merge (char **envz, size_t *envz_len, const char *envz2,
|
Fri May 3 13:32:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* intl/Makefile (CPPFLAGS): Change $(nlsdir) to $(i18ndir) in
LOCALE_ALIAS_PATH.
Fri May 3 03:14:02 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/Makefile (routines): Add l10nflist and explodename.
(distribute): Add loadinfo.h and locale.alias.
(install-others): New variable to install locale.alias.
* intl/dcgettext.c, intl/finddomain.c, intl/gettextP.h,
intl/loadmsgcat.c: Adapt for upcoming gettext-0.10.13. Some code
is now shared with the locale implementation.
* intl/explodename.c, intl/l10nflist.c, intl/loadinfo.h: New file.
Extracted from finddomain.c. This is also used in the locale
implementation.
* intl/locale.alias: New file. Locale alias database compatible
with X Window System's locale alias file. Can now be used in
locale and gettext code.
* libio/stdio.h: Add prototypes for asprint and vasprintf.
* locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c,
locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Add new
field in structure with name of locale ("C" in this case).
* locale/Makefile (routines): Add findlocale.
* locale/findlocale.c: New file. Instead of trying to load the
directly described file we now try to be much smarter when this
fails. Use the same code as gettext does.
* locale/loadlocale.c, locale/setlocale.c: Rewrite to know about
new loading scheme.
* locale/localeinfo.h: Adapt prototypes and declarations for new
setlocale implementation. Remove definition of u32_t type. We
now use u_int32_t from <sys/types.h>.
* locale/programs/charset.h (ILLEGAL_CHAR_VALUE): Provide type
with constant.
* locale/programs/config.h, locale/lc-collate.c,
locale/localeinfo.h, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/weight.h, string/strcoll.c:
Change to use u_int32_t and u_int16_t.
* locale/programs/localedef.c (construct_output_path): Change name
of output locale to contain normalized form of the character set
portion.
* string/Makefile (routines): Add agrz-ctsep and argz-next.
(tests): Add tst-strlen.
* string/argz-ctsep.c: New file. Implement reverse operation
from argz-stringify.
* string/argz-next.c: Non-inline version of function from argz.h.
* string/argz.h, string/envz.h: Make usable as global header file.
* string/envz.c: Fix declarations to use size_t where prototypes
say so.
* string/tst-strlen.c: New file. Another test for critical
situation in strlen implementations.
* sysdeps/i386/i586/strlen.S: Fix bug with highest byte in word
being zero.
* wctype/test_wctype.c: Fix controlling comparison after change to
32 bit character class array.
Fri May 3 12:53:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/sys/socket.h: Remove spurious doubled line.
Thu May 2 22:50:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/getpriority.c: New file.
* sysdeps/unix/sysv/linux/syscalls.list: Add s_getpriority.
Thu May 2 22:41:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_DEFAULT):
Disable all exceptions.
Thu May 2 22:33:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/fpu/e_acos.c, sysdeps/m68k/fpu/e_acosf.c,
sysdeps/m68k/fpu/e_fmod.c, sysdeps/m68k/fpu/e_fmodf.c,
sysdeps/m68k/fpu/isinfl.c, sysdeps/m68k/fpu/isnanl.c,
sysdeps/m68k/fpu/s_atan.c, sysdeps/m68k/fpu/s_atanf.c,
sysdeps/m68k/fpu/s_frexp.c, sysdeps/m68k/fpu/s_frexpf.c,
sysdeps/m68k/fpu/s_ilogb.c, sysdeps/m68k/fpu/s_ilogbf.c,
sysdeps/m68k/fpu/s_isinf.c, sysdeps/m68k/fpu/s_isinff.c,
sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c,
sysdeps/m68k/fpu/s_modf.c, sysdeps/m68k/fpu/s_modff.c: Don't
define __NO_MATH_INLINES, which is already defined on command
line.
Thu May 2 22:18:28 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/libm-ieee754/e_j0f.c (__ieee754_j0f, __ieee754_y0f):
Replace 0x80000000 by 0x48000000.
* sysdeps/libm-ieee754/e_j1f.c (__ieee754_j1f): Likewise.
Thu May 2 21:30:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/svc_simple.c: Make global variable pl local to
registerrpc.
Thu May 2 00:24:04 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/Makefile (tz-cflags): New variable.
(CFLAGS-tzfile.c): New variable.
(CFLAGS-zic.c): Add $(tz-cflags).
(tz-cc): Remove variable.
($(objpfx)tzfile.o, $(objpfx)zic.o): Remove targets.
* sysdeps/mach/hurd/getcwd.c: Jump out of both loops when we find a
name, instead of checking for reaching end of buffer, which happens
when the match is the last entry in the buffer.
1996-05-03 17:44:31 +00:00
|
|
|
|
size_t envz2_len, int override)
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
{
|
|
|
|
|
error_t err = 0;
|
|
|
|
|
|
|
|
|
|
while (envz2_len && ! err)
|
|
|
|
|
{
|
|
|
|
|
char *old = envz_entry (*envz, *envz_len, envz2);
|
|
|
|
|
size_t new_len = strlen (envz2) + 1;
|
|
|
|
|
|
|
|
|
|
if (! old)
|
|
|
|
|
err = argz_append (envz, envz_len, envz2, new_len);
|
|
|
|
|
else if (override)
|
|
|
|
|
{
|
|
|
|
|
argz_delete (envz, envz_len, old);
|
|
|
|
|
err = argz_append (envz, envz_len, envz2, new_len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
envz2 += new_len;
|
|
|
|
|
envz2_len -= new_len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove null entries. */
|
|
|
|
|
void
|
1996-05-13 22:01:00 +00:00
|
|
|
|
envz_strip (char **envz, size_t *envz_len)
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
{
|
|
|
|
|
char *entry = *envz;
|
1996-05-13 22:01:00 +00:00
|
|
|
|
size_t left = *envz_len;
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
while (left)
|
|
|
|
|
{
|
1996-05-13 22:01:00 +00:00
|
|
|
|
size_t entry_len = strlen (entry) + 1;
|
Mon Apr 29 00:11:59 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* errno.h [!__error_t_defined] (error_t): New type.
* sysdeps/mach/hurd/errnos.awk: #define __error_t_defined after the
typedef in errnos.h.
* string/envz.c, string/envz.h: New files.
* string/argz.h, string/argz-append.c, string/argz-count.c,
string/argz-create.c, string/argz-delete.c, string/argz-extract.c,
string/argz-insert.c, string/argz-stringify.c: New files.
* string/Makefile (routines): Add envz, argz-*.
(headers): Add argz.h, envz.h.
1996-04-29 05:21:53 +00:00
|
|
|
|
left -= entry_len;
|
|
|
|
|
if (! index (entry, SEP))
|
|
|
|
|
/* Null entry. */
|
|
|
|
|
bcopy (entry, entry + entry_len, left);
|
|
|
|
|
else
|
|
|
|
|
entry += entry_len;
|
|
|
|
|
}
|
|
|
|
|
*envz_len = entry - *envz;
|
|
|
|
|
}
|