2000-08-20 Ulrich Drepper <drepper@redhat.com>
+ * argp/argp-help.c: Unify use of function aliases to make more compact
+ PLT.
+ * include/libintl.h: Likewise.
+ * inet/rcmd.c: Likewise.
+ * intl/dcigettext.c: Likewise.
+ * libio/iofputws.c: Likewise.
+ * libio/iofputws_u.c: Likewise.
+ * libio/iogetwline.c: Likewise.
+ * libio/swprintf.c: Likewise.
+ * malloc/malloc.c: Likewise.
+ * nss/digits_dots.c: Likewise.
+ * posix/fnmatch.c: Likewise.
+ * posix/spawn_faction_addclose.c: Likewise.
+ * posix/spawn_faction_adddup2.c: Likewise.
+ * posix/spawn_faction_addopen.c: Likewise.
+ * posix/spawni.c: Likewise.
+ * posix/wordexp.c: Likewise.
+ * posix/spawni.c: Likewise.
+ * resolv/res_hconf.c: Likewise.
+ * resolv/res_init.c: Likewise.
+ * shadow/lckpwdf.c: Likewise.
+ * signal/sighold.c: Likewise.
+ * signal/sigrelse.c: Likewise.
+ * stdio-common/printf-parse.h: Likewise.
+ * stdio-common/printf-prs.c: Likewise.
+ * stdio-common/printf_fp.c: Likewise.
+ * stdio-common/vfprintf.c: Likewise.
+ * stdio-common/vfscanf.c: Likewise.
+ * stdlib/rpmatch.c: Likewise.
+ * sunrpc/create_xid.c: Likewise.
+ * sunrpc/key_call.c: Likewise.
+ * sysdeps/generic/setrlimit64.c: Likewise.
+ * sysdeps/generic/utmp_file.c: Likewise.
+ * sysdeps/generic/vlimit.c: Likewise.
+ * sysdeps/posix/posix_fallocate.c: Likewise.
+ * sysdeps/posix/posix_fallocate64.c: Likewise.
+ * sysdeps/posix/sigpause.c: Likewise.
+ * sysdeps/posix/sigset.c: Likewise.
+ * sysdeps/unix/grantpt.c: Likewise.
+ * sysdeps/unix/bsd/ualarm.c: Likewise.
+ * sysdeps/unix/sysv/linux/dl-origin.c: Likewise.
+ * sysdeps/unix/sysv/linux/getloadavg.c: Likewise.
+ * sysdeps/unix/sysv/linux/ttyname.c: Likewise.
+ * sysdeps/unix/sysv/linux/ulimit.c: Likewise.
+ * time/strftime.c: Likewise.
+ * wcsmbs/wcscoll.c: Likewise.
+ * wcsmbs/wcsxfrm.c: Likewise.
+
* time/tst-getdate.c (main): Make error messages more human readable.
- * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generic
- postinc/postdec instruction.
+ * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate
+ postinc/predec instruction.
(_FPU_SETCW): Likewise.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
/* Hierarchial argument parsing help output
- Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
if (! stream)
return;
- flockfile (stream);
+ __flockfile (stream);
if (! uparams.valid)
fill_in_uparams (state);
fs = __argp_make_fmtstream (stream, 0, uparams.rmargin, 0);
if (! fs)
{
- funlockfile (stream);
+ __funlockfile (stream);
return;
}
anything = 1;
}
- funlockfile (stream);
+ __funlockfile (stream);
if (hol)
hol_free (hol);
{
va_list ap;
- flockfile (stream);
+ __flockfile (stream);
fputs_unlocked (state ? state->name : program_invocation_short_name,
stream);
__argp_state_help (state, stream, ARGP_HELP_STD_ERR);
- funlockfile (stream);
+ __funlockfile (stream);
}
}
}
if (stream)
{
- flockfile (stream);
+ __flockfile (stream);
fputs_unlocked (state ? state->name : program_invocation_short_name,
stream);
putc_unlocked ('\n', stream);
- funlockfile (stream);
+ __funlockfile (stream);
if (status && (!state || !(state->flags & ARGP_NO_EXIT)))
exit (status);
# define N_(msgid) msgid
# undef _
-# ifdef dgettext
/* This is defined as an optimizing macro, so use it. */
-# define _(msgid) dgettext (_libc_intl_domainname, (msgid))
-# else
-/* Be sure to use only the __ name when `dgettext' is a plain function
- instead of an optimizing macro. */
-# define _(msgid) __dgettext (_libc_intl_domainname, (msgid))
-# endif
+# define _(msgid) __dcgettext (_libc_intl_domainname, (msgid), LC_MESSAGES)
#endif
hints.ai_flags = AI_CANONNAME;
hints.ai_family = af;
hints.ai_socktype = SOCK_STREAM;
- (void)snprintf(num, sizeof(num), "%d", ntohs(rport));
+ (void)__snprintf(num, sizeof(num), "%d", ntohs(rport));
error = getaddrinfo(*ahost, num, &hints, &res);
if (error) {
fprintf(stderr, "rcmd: getaddrinfo: %s\n",
continue;
}
if (refused && timo <= 16) {
- (void)sleep(timo);
+ (void)__sleep(timo);
timo *= 2;
ai = res;
refused = 0;
__set_errno (EAFNOSUPPORT);
return -1;
}
- s = socket(family, SOCK_STREAM, 0);
+ s = __socket(family, SOCK_STREAM, 0);
if (s < 0)
return -1;
# ifndef stpcpy
# define stpcpy __stpcpy
# endif
+# define tfind __tfind
#else
# if !defined HAVE_GETCWD
char *getwd ();
#include "gettext.h"
#include "gettextP.h"
-#define YYDEBUG 1
#define YYLEX_PARAM &((struct parse_args *) arg)->cp
#define YYPARSE_PARAM arg
-#line 33 "plural.y"
+#line 32 "plural.y"
typedef union {
unsigned long int num;
struct expression *exp;
} YYSTYPE;
-#line 38 "plural.y"
+#line 37 "plural.y"
/* Prototypes for local functions. */
static struct expression *new_exp (enum operator op, int n, ...);
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 56, 62, 67, 72, 77, 82, 87, 92, 97, 102,
- 107, 112, 117, 123
+ 55, 61, 66, 71, 76, 81, 86, 91, 96, 101,
+ 106, 111, 116, 122
};
#endif
switch (yyn) {
case 1:
-#line 57 "plural.y"
+#line 56 "plural.y"
{
((struct parse_args *) arg)->res = yyvsp[0].exp;
;
break;}
case 2:
-#line 63 "plural.y"
+#line 62 "plural.y"
{
if ((yyval.exp = new_exp (qmop, 3, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 3:
-#line 68 "plural.y"
+#line 67 "plural.y"
{
if ((yyval.exp = new_exp (lor, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 4:
-#line 73 "plural.y"
+#line 72 "plural.y"
{
if ((yyval.exp = new_exp (land, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 5:
-#line 78 "plural.y"
+#line 77 "plural.y"
{
if ((yyval.exp = new_exp (equal, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 6:
-#line 83 "plural.y"
+#line 82 "plural.y"
{
if ((yyval.exp = new_exp (not_equal, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 7:
-#line 88 "plural.y"
+#line 87 "plural.y"
{
if ((yyval.exp = new_exp (plus, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 8:
-#line 93 "plural.y"
+#line 92 "plural.y"
{
if ((yyval.exp = new_exp (minus, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 9:
-#line 98 "plural.y"
+#line 97 "plural.y"
{
if ((yyval.exp = new_exp (mult, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 10:
-#line 103 "plural.y"
+#line 102 "plural.y"
{
if ((yyval.exp = new_exp (divide, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 11:
-#line 108 "plural.y"
+#line 107 "plural.y"
{
if ((yyval.exp = new_exp (module, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
YYABORT
;
break;}
case 12:
-#line 113 "plural.y"
+#line 112 "plural.y"
{
if ((yyval.exp = new_exp (var, 0)) == NULL)
YYABORT
;
break;}
case 13:
-#line 118 "plural.y"
+#line 117 "plural.y"
{
if ((yyval.exp = new_exp (num, 0)) == NULL)
YYABORT;
;
break;}
case 14:
-#line 124 "plural.y"
+#line 123 "plural.y"
{
yyval.exp = yyvsp[-1].exp
;
}
return 1;
}
-#line 129 "plural.y"
+#line 128 "plural.y"
static struct expression *
const char *exp = *pexp;
int result;
- yydebug = 1;
-
while (1)
{
if (exp[0] == '\\' && exp[1] == '\n')
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
const wchar_t *str;
_IO_FILE *fp;
{
- _IO_size_t len = wcslen (str);
+ _IO_size_t len = __wcslen (str);
int result = EOF;
CHECK_FILE (fp, EOF);
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
const wchar_t *str;
_IO_FILE *fp;
{
- _IO_size_t len = wcslen (str);
+ _IO_size_t len = __wcslen (str);
int result = EOF;
CHECK_FILE (fp, EOF);
if (_IO_fwide (fp, 1) == 1
#include <string.h>
#include <wchar.h>
+#ifdef _LIBC
+# define wmemcpy __wmemcpy
+#endif
+
#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO
_IO_size_t
-/* Copyright (C) 1991, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1997,1998,1999,2000 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
int done;
va_start (arg, format);
- done = vswprintf (s, n, format, arg);
+ done = __vswprintf (s, n, format, arg);
va_end (arg);
return done;
static size_t __libc_pagesize;
+#define access __access
#define mmap __mmap
#define munmap __munmap
#define mremap __mremap
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifdef USE_NSCD
+# define inet_aton __inet_aton
+#endif
+
/*
* disallow names consisting only of digits/dots, unless
* they end in a dot.
# include "../locale/elem-hash.h"
# define CONCAT(a,b) __CONCAT(a,b)
+# define mbsinit __mbsinit
+# define mbsrtowcs __mbsrtowcs
#endif
/* Comment out all this code if we are using the GNU C Library, and are not
posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions,
int fd)
{
- int maxfd = sysconf (_SC_OPEN_MAX);
+ int maxfd = __sysconf (_SC_OPEN_MAX);
struct __spawn_action *rec;
/* Test for the validity of the file descriptor. */
posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions,
int fd, int newfd)
{
- int maxfd = sysconf (_SC_OPEN_MAX);
+ int maxfd = __sysconf (_SC_OPEN_MAX);
struct __spawn_action *rec;
/* Test for the validity of the file descriptor. */
int fd, const char *path, int oflag,
mode_t mode)
{
- int maxfd = sysconf (_SC_OPEN_MAX);
+ int maxfd = __sysconf (_SC_OPEN_MAX);
struct __spawn_action *rec;
/* Test for the validity of the file descriptor. */
short int flags;
/* Generate the new process. */
- new_pid = fork ();
+ new_pid = __fork ();
if (new_pid != 0)
{
if (new_pid < 0)
switch (action->tag)
{
case spawn_do_close:
- if (close (action->action.close_action.fd) != 0)
+ if (__close (action->action.close_action.fd) != 0)
/* Signal the error. */
_exit (SPAWN_ERROR);
break;
case spawn_do_open:
{
- int new_fd = open (action->action.open_action.path,
- action->action.open_action.oflag,
- action->action.open_action.mode);
+ int new_fd = __open (action->action.open_action.path,
+ action->action.open_action.oflag,
+ action->action.open_action.mode);
if (new_fd == -1)
/* The `open' call failed. */
/* The `dup2' call failed. */
_exit (SPAWN_ERROR);
- if (close (new_fd) != 0)
+ if (__close (new_fd) != 0)
/* The `close' call failed. */
_exit (SPAWN_ERROR);
}
/* POSIX.2 wordexp implementation.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
}
/* Make sure the subshell doesn't field-split on our behalf. */
- unsetenv ("IFS");
+ __unsetenv ("IFS");
__close (fildes[0]);
__execve (_PATH_BSHELL, (char *const *) args, __environ);
fildes[0] = fildes[1] = -1;
exec_comm_child(comm, fildes, 0, 1);
}
-
+
if (__waitpid (pid, &status, 0) == pid && status != 0)
return WRDE_SYNTAX;
}
if (pattern && !value)
goto no_space;
- setenv (env, value, 1);
+ __setenv (env, value, 1);
break;
default:
-/* Copyright (C) 1993, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
Contributed by David Mosberger (davidm@azstarnet.com).
The GNU C Library is free software; you can redistribute it and/or
for (i = 0; i < sizeof (cmd) / sizeof (cmd[0]); ++i)
{
- if (strncasecmp (start, cmd[i].name, len) == 0
+ if (__strncasecmp (start, cmd[i].name, len) == 0
&& strlen (cmd[i].name) == len)
{
c = &cmd[i];
/* Only reorder if we're supposed to. */
if ((_res_hconf.flags & HCONF_FLAG_REORDER) == 0)
return;
-
+
/* Can't deal with anything but IPv4 for now... */
if (hp->h_addrtype != AF_INET)
return;
int sd, num, i;
/* Save errno. */
int save = errno;
-
+
/* Initialize interface table. */
num_ifs = 0;
ifaddrs = malloc (num * sizeof (ifaddrs[0]));
if (!ifaddrs)
goto cleanup1;
-
+
/* Copy usable interfaces in ifaddrs structure. */
for (cur_ifr = ifr, i = 0; i < num; ++cur_ifr, ++i)
{
if (cur_ifr->ifr_addr.sa_family != AF_INET)
continue;
-
+
ifaddrs[num_ifs].addrtype = AF_INET;
ifaddrs[num_ifs].u.ipv4.addr =
((struct sockaddr_in *) &cur_ifr->ifr_addr)->sin_addr.s_addr;
/* Release lock, preserve error value, and close socket. */
save = errno;
__libc_lock_unlock (lock);
- close (sd);
+ __close (sd);
}
if (num_ifs == 0)
/*
* Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
/*
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
* the name of Digital Equipment Corporation not be used in advertising or
* publicity pertaining to distribution of the document or software without
* specific, written prior permission.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
* since it was noted that INADDR_ANY actually meant ``the first interface
* you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
* it had to be "up" in order for you to reach your own name server. It
- * was later decided that since the recommended practice is to always
+ * was later decided that since the recommended practice is to always
* install local static routes through 127.0.0.1 for all your network
* interfaces, that we could solve this problem without a code change.
*
cp = buf + sizeof("nameserver") - 1;
while (*cp == ' ' || *cp == '\t')
cp++;
- if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
+ if ((*cp != '\0') && (*cp != '\n')
+ && __inet_aton(cp, &a)) {
statp->nsaddr_list[nserv].sin_addr = a;
statp->nsaddr_list[nserv].sin_family = AF_INET;
statp->nsaddr_list[nserv].sin_port =
cp++;
n = *cp;
*cp = 0;
- if (inet_aton(net, &a)) {
+ if (__inet_aton(net, &a)) {
statp->sort_list[nsort].addr = a;
if (ISSORTMASK(n)) {
*cp++ = n;
cp++;
n = *cp;
*cp = 0;
- if (inet_aton(net, &a)) {
+ if (__inet_aton(net, &a)) {
statp->sort_list[nsort].mask = a.s_addr;
} else {
- statp->sort_list[nsort].mask =
+ statp->sort_list[nsort].mask =
net_mask(statp->sort_list[nsort].addr);
}
} else {
- statp->sort_list[nsort].mask =
+ statp->sort_list[nsort].mask =
net_mask(statp->sort_list[nsort].addr);
}
nsort++;
continue;
}
}
- if (nserv > 1)
+ if (nserv > 1)
statp->nscount = nserv;
#ifdef _LIBC
if (nservall - nserv > 0)
res_nclose(res_state statp) {
int ns;
- if (statp->_vcsock >= 0) {
- (void) close(statp->_vcsock);
+ if (statp->_vcsock >= 0) {
+ (void) __close(statp->_vcsock);
statp->_vcsock = -1;
statp->_flags &= ~(RES_F_VC | RES_F_CONN);
}
#endif
{
if (statp->_u._ext.nssocks[ns] != -1) {
- (void) close(statp->_u._ext.nssocks[ns]);
+ (void) __close(statp->_u._ext.nssocks[ns]);
statp->_u._ext.nssocks[ns] = -1;
}
}
/* Now make sure the alarm signal is not blocked. */
sigemptyset (&new_set);
- sigaddset (&new_set, SIGALRM);
+ __sigaddset (&new_set, SIGALRM);
if (__sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0)
RETURN_RESTORE_HANDLER (-1);
/* Add SIG to the calling process' signal mask.
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
return -1;
/* Add the specified signal. */
- if (sigaddset (&set, sig) < 0)
+ if (__sigaddset (&set, sig) < 0)
return -1;
/* Set the new mask. */
/* Remove SIG from the calling process' signal mask.
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
return -1;
/* Remove the specified signal. */
- if (sigdelset (&set, sig) < 0)
+ if (__sigdelset (&set, sig) < 0)
return -1;
/* Set the new mask. */
/* Remove any hints of a wrong encoding. */
ps->__count = 0;
- if (! isascii (*format) && (len = mbrlen (format, MB_CUR_MAX, ps)) > 0)
+ if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0)
format += len;
else
++format;
-/* Copyright (C) 1991, 1992, 1995, 1996, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995,1996,1999,2000 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
# define L_(Str) Str
# define ISDIGIT(Ch) isdigit (Ch)
# define ISASCII(Ch) isascii (Ch)
-# define MBRLEN(Cp, L, St) mbrlen (Cp, L, St)
+# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
# ifdef USE_IN_LIBIO
# define PUT(F, S, N) _IO_sputn (F, S, N)
return bufend;
/* Move the fractional part down. */
- wmemmove (buf + intdig_no + ngroups, buf + intdig_no,
- bufend - (buf + intdig_no));
+ __wmemmove (buf + intdig_no + ngroups, buf + intdig_no,
+ bufend - (buf + intdig_no));
p = buf + intdig_no + ngroups - 1;
do
if (!left) \
PAD (L' '); \
if (fspec == NULL) \
- outchar (btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \
+ outchar (__btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \
else \
- outchar (btowc ((unsigned char) args_value[fspec->data_arg].pa_char));\
+ outchar (__btowc ((unsigned char) \
+ args_value[fspec->data_arg].pa_char)); \
if (left) \
PAD (L' '); \
break; \
: ((c = _IO_getwc_unlocked (s)), \
(void) (c != WEOF && ++read_in), c))
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
# define ISSPACE(Ch) iswspace (Ch)
# define ISDIGIT(Ch) iswdigit (Ch)
# define ISXDIGIT(Ch) iswxdigit (Ch)
{
size_t n;
- n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+ n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
if (n == (size_t) -1)
/* No valid wide character. */
input_error ();
}
}
- n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+ n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c,
+ &state);
if (n == (size_t) -1)
encode_error ();
/* We have to emit the code to get into the intial
state. */
char buf[MB_LEN_MAX];
- size_t n = wcrtomb (buf, L'\0', &state);
+ size_t n = __wcrtomb (buf, L'\0', &state);
if (n > 0 && (flags & MALLOC)
&& str + n >= *strptr + strsize)
{
}
}
- n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+ n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
if (n == (size_t) -1)
encode_error ();
/* We have to emit the code to get into the intial
state. */
char buf[MB_LEN_MAX];
- size_t n = wcrtomb (buf, L'\0', &state);
+ size_t n = __wcrtomb (buf, L'\0', &state);
if (n > 0 && (flags & MALLOC)
&& str + n >= *strptr + strsize)
{
/* Determine whether string value is affirmation or negative response
according to current locale's data.
This file is part of the GNU C Library.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
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
if (*lastp)
{
/* Free the old compiled pattern. */
- regfree (re);
+ __regfree (re);
*lastp = NULL;
}
/* Compile the pattern and cache it for future runs. */
- if (regcomp (re, pattern, REG_EXTENDED) != 0)
+ if (__regcomp (re, pattern, REG_EXTENDED) != 0)
return -1;
*lastp = pattern;
}
/* Try the pattern. */
- return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
+ return __regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
}
/* We cache the response patterns and compiled regexps here. */
-/* Copyright (c) 1998 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
struct timeval now;
__gettimeofday (&now, (struct timezone *) 0);
- srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
+ __srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
is_initialized = 1;
}
{
/* if other side closed socket, build handle again */
clnt_control (kcp->client, CLGET_FD, (char *)&fd);
- if (getpeername (fd,(struct sockaddr *)&name,&namelen) == -1)
+ if (__getpeername (fd,(struct sockaddr *)&name,&namelen) == -1)
{
auth_destroy (kcp->client->cl_auth);
clnt_destroy (kcp->client);
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,1998,2000 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
else
rlimits32.rlim_max = rlimits->rlim_max;
- return setrlimit (resource, &rlimits32);
+ return __setrlimit (resource, &rlimits32);
}
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>
and Paul Janzen <pcj@primenet.com>, 1996.
result = __fcntl (file_fd, F_SETFD, result | FD_CLOEXEC);
if (result == -1)
{
- close (file_fd);
+ __close (file_fd);
return 0;
}
}
-/* Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2000 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
return -1;
lims.rlim_cur = value;
- return setrlimit (rlimit_res, &lims);
+ return __setrlimit (rlimit_res, &lims);
}
__set_errno (EINVAL);
{
len -= step;
- if (pwrite (fd, "", 1, offset) != 1)
+ if (__pwrite (fd, "", 1, offset) != 1)
return errno;
offset += step;
{
len -= step;
- if (pwrite64 (fd, "", 1, offset) != 1)
+ if (__pwrite64 (fd, "", 1, offset) != 1)
return errno;
offset += step;
/* The modern X/Open implementation is requested. */
if (__sigprocmask (0, NULL, &set) < 0
/* Yes, we call `sigdelset' and not `__sigdelset'. */
- || sigdelset (&set, sig_or_mask) < 0)
+ || __sigdelset (&set, sig_or_mask) < 0)
return -1;
}
else
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 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
return SIG_ERR;
/* Add the specified signal. */
- if (sigaddset (&set, sig) < 0)
+ if (__sigaddset (&set, sig) < 0)
return SIG_ERR;
/* Add the signal set to the current signal mask. */
return SIG_ERR;
/* Add the specified signal. */
- if (sigaddset (&set, sig) < 0)
+ if (__sigaddset (&set, sig) < 0)
return SIG_ERR;
/* Remove the signal set from the current signal mask. */
-/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1999, 2000 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
timer.it_interval.tv_sec = 0;
timer.it_interval.tv_usec = interval;
- if (setitimer (ITIMER_REAL, &timer, &otimer) < 0)
+ if (__setitimer (ITIMER_REAL, &timer, &otimer) < 0)
return -1;
return (otimer.it_value.tv_sec * 1000000) + otimer.it_value.tv_usec;
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
if (buf_len)
{
- rv = ptsname_r (fd, buf, buf_len);
+ rv = __ptsname_r (fd, buf, buf_len);
if (rv != 0 || memchr (buf, '\0', buf_len))
/* We either got an error, or we succeeded and the
Try a moderate value. */
grbuflen = 1024;
grtmpbuf = (char *) __alloca (grbuflen);
- getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
+ __getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
gid = p ? p->gr_gid : __getgid ();
/* Make sure the group of the device is that special group. */
{
/* Disable core dumps. */
struct rlimit rl = { 0, 0 };
- setrlimit (RLIMIT_CORE, &rl);
+ __setrlimit (RLIMIT_CORE, &rl);
/* We pase the master pseudo terminal as file descriptor PTY_FILENO. */
if (fd != PTY_FILENO)
char linkval[PATH_MAX];
char *result;
- if (readlink ("/proc/self/exe", linkval, PATH_MAX) != -1
+ if (__readlink ("/proc/self/exe", linkval, PATH_MAX) != -1
&& linkval[0] != '[')
{
/* We can use this value. */
/* Get system load averages. Linux (/proc/loadavg) version.
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000 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
int i;
nread = __read (fd, buf, sizeof buf - 1);
- close (fd);
+ __close (fd);
if (nread < 0)
return -1;
buf[nread - 1] = '\0';
struct dirent *d;
size_t devlen = strlen (dev) + 1;
- dirstream = opendir (dev);
+ dirstream = __opendir (dev);
if (dirstream == NULL)
{
*dostat = -1;
return NULL;
}
- while ((d = readdir (dirstream)) != NULL)
+ while ((d = __readdir (dirstream)) != NULL)
if (((ino_t) d->d_fileno == myino || *dostat)
&& strcmp (d->d_name, "stdin")
&& strcmp (d->d_name, "stdout")
-/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,2000 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
limit.rlim_cur = newlimit * 512;
limit.rlim_max = newlimit * 512;
- result = setrlimit (RLIMIT_FSIZE, &limit);
+ result = __setrlimit (RLIMIT_FSIZE, &limit);
}
break;
# define L_(Str) L##Str
# define NLW(Sym) _NL_W##Sym
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
-# define STRLEN(s) wcslen (s)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
+# define STRLEN(s) __wcslen (s)
#else
# define CHAR_T char
if (era)
{
# ifdef COMPILE_WIDE
- size_t len = wcslen (era->era_wname);
+ size_t len = __wcslen (era->era_wname);
cpy (len, era->era_wname);
# else
size_t len = strlen (era->era_name);
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
# define STRCOLL wcscoll
#endif
#define STRCMP wcscmp
-#define STRLEN wcslen
+#define STRLEN __wcslen
#define WEIGHT_H "../locale/weightwc.h"
#define SUFFIX WC
#define L(arg) L##arg
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
# define STRXFRM wcsxfrm
#endif
#define STRCMP wcscmp
-#define STRLEN wcslen
+#define STRLEN __wcslen
#define STPNCPY __wcpncpy
#define WEIGHT_H "../locale/weightwc.h"
#define SUFFIX WC
projects / platform / upstream / linaro-glibc.git / commitdiff