mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
cb09a2cda2
name to find codeset name (if any) and normalize it. If the normalized name differs, look up only that in the archive. * locale/programs/locarchive.c (add_locale_to_archive): If the name contains a codeset, normalize the codeset store only the normalized name in the archive. If not, add an alias containing the locale's normalized codeset name. Apply codeset name normalization when matching entries in the alias file. * locale/programs/locarchive.c (delete_locales_from_archive): Don't decrement HEAD->namehash_used here. (add_locale): Only need to insert name string when name_offset != 0. * locale/programs/localedef.c (options): Add -A/--alias-file. (alias_file): New variable. (parse_opt): Grok -A, set that. * locale/programs/localedef.h: Declare it. * locale/programs/locarchive.c (insert_name): New function, broken out of ... (add_locale_to_archive): ... here. Call that. (add_alias): New function. (add_locale): New static function, add_locale_to_archive renamed. (add_locale_to_archive): Call that and use add_alias to add an alias for the name with codeset if the given name lacks it. (enlarge_archive): Call add_locale instead of add_locale_to_archive. * locale/Makefile (routines): Add loadarchive. * locale/loadarchive.c: New file, started from code by Ulrich Drepper. (_nl_load_locale_from_archive): New function. * locale/localeinfo.h: Declare it. * locale/findlocale.c (_nl_find_locale): If using default locale path, try _nl_load_locale_from_archive first. * locale/loadlocale.c (_nl_intern_locale_data): New function, broken out of _nl_load_locale. (_nl_load_locale): Call that. * locale/localeinfo.h: Declare it. (struct locale_data): Replace member `mmaped' with `alloc', an enum. (struct locale_data): Remove unused member `options'. * locale/findlocale.c (_nl_remove_locale): Update uses. * locale/loadlocale.c (_nl_load_locale, _nl_unload_locale): Likewise. * locale/C-collate.c: Update initializer. * locale/C-identification.c: Likewise. * locale/C-measurement.c: Likewise. * locale/C-telephone.c: Likewise. * locale/C-address.c: Likewise. * locale/C-name.c: Likewise. * locale/C-paper.c: Likewise. * locale/C-time.c: Likewise. * locale/C-numeric.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-messages.c : Likewise. * locale/C-ctype.c: Likewise. * locale/hashval.h [! LONGBITS]: Include <limits.h> here and use CHAR_BIT instead of BITSPERBYTE. * locale/localeinfo.h (_nl_find_locale, _nl_load_locale, _nl_unload_locale): Add `internal_function attribute_hidden' to decls. * locale/findlocale.c (_nl_find_locale): Add internal_function to defn. (_nl_remove_locale): Likewise. * locale/loadlocale.c (_nl_load_locale, _nl_unload_locale): Likewise. * locale/findlocale.c (_nl_default_locale_path): New variable. (_nl_find_locale): If LOCALE_PATH is null, default to that. * locale/localeinfo.h: Declare it. * locale/setlocale.c (setlocale): Use _nl_default_locale_path in place of LOCALEDIR. If no LOCPATH, pass null to _nl_find_locale. * locale/newlocale.c (__newlocale): Likewise. * misc/err.c (vwarnx, vwarn): Fix typos in libc_hidden_def uses. * inet/rexec.c (rexec_af): Add libc_hidden_def. * sysdeps/generic/morecore.c: Likewise. * signal/allocrtsig.c (__libc_current_sigrtmin): Likewise. (__libc_current_sigrtmax): Likewise. 2002-08-08 Roland McGrath <roland@redhat.com> * locale/loadlocale.c (_nl_load_locale): Don't use MAP_INHERIT. * catgets/open_catalog.c (__open_catalog): Likewise. * locale/programs/locarchive.c (INITIAL_NUM_NAMES): Renamed from typo INITIAL_NUM_NANES. (create_archive): Update use.
191 lines
5.0 KiB
C
191 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;
|
|
static char ahostbuf[NI_MAXHOST];
|
|
|
|
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){
|
|
strncpy(ahostbuf, res0->ai_canonname, sizeof(ahostbuf));
|
|
ahostbuf[sizeof(ahostbuf)-1] = '\0';
|
|
*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);
|
|
}
|