mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
c877418f2e
New macros. * elf/dl-close.c (free_mem): Use libc_freeres_fn macro, remove text_set_element. * elf/dl-libc.c (free_mem): Likewise. * iconv/gconv_conf.c (free_mem): Likewise. * iconv/gconv_db.c (free_mem): Likewise. * iconv/gconv_dl.c (free_mem): Likewise. * iconv/gconv_cache.c (free_mem): Likewise. * intl/finddomain.c (free_mem): Likewise. * intl/dcigettext.c (free_mem): Likewise. * locale/setlocale.c (free_mem): Likewise. * misc/fstab.c (fstab_free): Likewise. * nss/nsswitch.c (free_mem): Likewise. * posix/regcomp.c (free_mem): Likewise. * resolv/gai_misc.c (free_res): Likewise. * stdlib/fmtmsg.c (free_mem): Likewise. * sunrpc/clnt_perr.c (free_mem): Likewise. * sysdeps/generic/setenv.c (free_mem): Likewise. * sysdeps/unix/sysv/linux/shm_open.c (freeit): Likewise. * sysdeps/pthread/aio_misc.c (free_res): Likewise. * time/tzset.c (free_mem): Likewise. * malloc/mtrace.c (release_libc_mem): Add __libc_freeres_fn_section. * locale/loadarchive.c (_nl_archive_subfreeres): Likewise. * malloc/set-freeres.c (__libc_freeres): Likewise. * login/getutent.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutent): Allocate buffer the first time it is run. * login/getutid.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutid): Allocate buffer the first time it is run. * login/getutline.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutline): Allocate buffer the first time it is run. * malloc/mtrace.c (malloc_trace_buffer): Change into char *. (mtrace): Allocate malloc_trace_buffer. * resolv/nsap_addr.c (inet_nsap_ntoa): Decrease size of tmpbuf. * resolv/ns_print.c (ns_sprintrrf): Decrease size of t. * string/strerror.c: Include libintl.h and errno.h. (buf): New variable. (strerror): Only allocate buffer if actually needed (unknown error). * time/tzfile.c (transitions): Add libc_freeres_ptr. (freeres): Remove. 2002-10-25 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (libc_freeres_ptr): New macro. * malloc/set-freeres.c (__libc_freeres_ptrs): Define using symbol_set_define. (__libc_freeres): Free all pointers in that section. * Makerules (build-shlib): Add $(LDSEDCMD-$(@F:lib%.so=%).so) to sed commands when creating .lds script. (LDSEDCMD-c.so): New variable. * inet/rcmd.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rcmd_af): Use strdup to allocate ahostbuf. * inet/rexec.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rexec_af): Use strdup to allocate ahostbuf. * stdio-common/reg-printf.c (printf_funcs): Remove. (__printf_arginfo_table): Change into printf_arginfo_function **. Add libc_freeres_ptr. (__register_printf_function): Allocate __printf_arginfo_table and __printf_function_table the first time it is called. * stdio-common/printf-parse.h (__printf_arginfo_table): Change into printf_arginfo_function **. (parse_one_spec): Add __builtin_expect. * grp/fgetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * inet/getnetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * intl/localealias.c (libc_freeres_ptr): Define if !_LIBC. (string_space, map): Add libc_freeres_ptr. (free_mem): Remove. * misc/efgcvt.c (FCVT_BUFPTR): Add libc_freeres_ptr. (free_mem): Remove. * misc/mntent.c (getmntent_buffer): Add libc_freeres_ptr. (free_mem): Remove. * crypt/md5-crypt.c (libc_freeres_ptr): Define if !_LIBC. (buffer): Add libc_freeres_ptr. (free_mem): Remove for _LIBC. * nss/getXXbyYY.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * nss/getXXent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * pwd/fgetpwent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * resolv/res_hconf.c (ifaddrs): Add libc_freeres_ptr. (free_mem): Remove. * shadow/fgetspent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/posix/ttyname.c (getttyname_name): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/getsysstats.c (mount_proc): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/ttyname.c (getttyname_name, ttyname_buf): Add libc_freeres_ptr. (free_mem): Remove. 2002-10-30 Jakub Jelinek <jakub@redhat.com> * malloc/obstack.c [_LIBC] (obstack_free): Change into strong_alias instead of duplicating the whole function in libc.
193 lines
5.0 KiB
C
193 lines
5.0 KiB
C
/*
|
|
* Copyright (c) 1980, 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:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 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
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <alloca.h>
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
int rexecoptions;
|
|
libc_freeres_ptr (static char *ahostbuf);
|
|
|
|
int
|
|
rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
|
|
char **ahost;
|
|
int rport;
|
|
const char *name, *pass, *cmd;
|
|
int *fd2p;
|
|
sa_family_t af;
|
|
{
|
|
struct sockaddr_storage sa2, from;
|
|
struct addrinfo hints, *res0;
|
|
const char *orig_name = name;
|
|
const char *orig_pass = pass;
|
|
u_short port = 0;
|
|
int s, timo = 1, s3;
|
|
char c;
|
|
int gai;
|
|
char servbuff[NI_MAXSERV];
|
|
|
|
__snprintf(servbuff, sizeof(servbuff), "%d", ntohs(rport));
|
|
servbuff[sizeof(servbuff) - 1] = '\0';
|
|
|
|
memset(&hints, '\0', sizeof(hints));
|
|
hints.ai_family = af;
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
hints.ai_flags = AI_CANONNAME;
|
|
gai = getaddrinfo(*ahost, servbuff, &hints, &res0);
|
|
if (gai){
|
|
/* XXX: set errno? */
|
|
return -1;
|
|
}
|
|
|
|
if (res0->ai_canonname){
|
|
free (ahostbuf);
|
|
ahostbuf = strdup (res0->ai_canonname);
|
|
if (ahostbuf == NULL) {
|
|
perror ("rexec: strdup");
|
|
return (-1);
|
|
}
|
|
*ahost = ahostbuf;
|
|
} else
|
|
*ahost = NULL;
|
|
ruserpass(res0->ai_canonname, &name, &pass);
|
|
retry:
|
|
s = __socket(res0->ai_family, res0->ai_socktype, 0);
|
|
if (s < 0) {
|
|
perror("rexec: socket");
|
|
return (-1);
|
|
}
|
|
if (__connect(s, res0->ai_addr, res0->ai_addrlen) < 0) {
|
|
if (errno == ECONNREFUSED && timo <= 16) {
|
|
(void) __close(s);
|
|
__sleep(timo);
|
|
timo *= 2;
|
|
goto retry;
|
|
}
|
|
perror(res0->ai_canonname);
|
|
return (-1);
|
|
}
|
|
if (fd2p == 0) {
|
|
(void) __write(s, "", 1);
|
|
port = 0;
|
|
} else {
|
|
char num[32];
|
|
int s2, sa2len;
|
|
|
|
s2 = __socket(res0->ai_family, res0->ai_socktype, 0);
|
|
if (s2 < 0) {
|
|
(void) __close(s);
|
|
return (-1);
|
|
}
|
|
__listen(s2, 1);
|
|
sa2len = sizeof (sa2);
|
|
if (__getsockname(s2, (struct sockaddr *)&sa2, &sa2len) < 0) {
|
|
perror("getsockname");
|
|
(void) __close(s2);
|
|
goto bad;
|
|
} else if (sa2len != SA_LEN((struct sockaddr *)&sa2)) {
|
|
__set_errno(EINVAL);
|
|
(void) __close(s2);
|
|
goto bad;
|
|
}
|
|
port = 0;
|
|
if (!getnameinfo((struct sockaddr *)&sa2, sa2len,
|
|
NULL, 0, servbuff, sizeof(servbuff),
|
|
NI_NUMERICSERV))
|
|
port = atoi(servbuff);
|
|
(void) sprintf(num, "%u", port);
|
|
(void) __write(s, num, strlen(num)+1);
|
|
{ int len = sizeof (from);
|
|
s3 = accept(s2, (struct sockaddr *)&from, &len);
|
|
__close(s2);
|
|
if (s3 < 0) {
|
|
perror("accept");
|
|
port = 0;
|
|
goto bad;
|
|
}
|
|
}
|
|
*fd2p = s3;
|
|
}
|
|
(void) __write(s, name, strlen(name) + 1);
|
|
/* should public key encypt the password here */
|
|
(void) __write(s, pass, strlen(pass) + 1);
|
|
(void) __write(s, cmd, strlen(cmd) + 1);
|
|
|
|
/* We don't need the memory allocated for the name and the password
|
|
in ruserpass anymore. */
|
|
if (name != orig_name)
|
|
free ((char *) name);
|
|
if (pass != orig_pass)
|
|
free ((char *) pass);
|
|
|
|
if (__read(s, &c, 1) != 1) {
|
|
perror(*ahost);
|
|
goto bad;
|
|
}
|
|
if (c != 0) {
|
|
while (__read(s, &c, 1) == 1) {
|
|
(void) __write(2, &c, 1);
|
|
if (c == '\n')
|
|
break;
|
|
}
|
|
goto bad;
|
|
}
|
|
freeaddrinfo(res0);
|
|
return (s);
|
|
bad:
|
|
if (port)
|
|
(void) __close(*fd2p);
|
|
(void) __close(s);
|
|
freeaddrinfo(res0);
|
|
return (-1);
|
|
}
|
|
libc_hidden_def (rexec_af)
|
|
|
|
int
|
|
rexec(ahost, rport, name, pass, cmd, fd2p)
|
|
char **ahost;
|
|
int rport;
|
|
const char *name, *pass, *cmd;
|
|
int *fd2p;
|
|
{
|
|
return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
|
|
}
|