lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

resolv: Move res_hostalias into its own file, along with hostalias

Browse Source 
These deprecated symbols continue to be exported from libresolv.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
2021-07-19 07:55:27 +02:00
parent be5773e166
commit 66ac4268f4
3 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resolv/Makefile
View File

@ -152,6 +152,7 @@ libresolv-routines := \
res_data \ res_data \
res_debug \ res_debug \
res_enable_icmp \ res_enable_icmp \
res_hostalias \
res_isourserver \ res_isourserver \
res_mkquery \ res_mkquery \
res_query \ res_query \

51
resolv/res_hostalias.c Normal file
View File

@ -0,0 +1,51 @@
/* HOSTALIASES-based name resolution. Public legacy functions.
Copyright (C) 2017-2021 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 Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <netdb.h>
#include <resolv-internal.h>
#include <resolv_context.h>
/* Common part of res_hostalias and hostalias. */
static const char *
context_hostalias_common (struct resolv_context *ctx,
const char *name, char *dst, size_t siz)
{
if (ctx == NULL)
{
RES_SET_H_ERRNO (&_res, NETDB_INTERNAL);
return NULL;
}
const char *result = __res_context_hostalias (ctx, name, dst, siz);
__resolv_context_put (ctx);
return result;
}
const char *
res_hostalias (res_state statp, const char *name, char *dst, size_t siz)
{
return context_hostalias_common
(__resolv_context_get_override (statp), name, dst, siz);
}
const char *
hostalias (const char *name)
{
static char abuf[MAXDNAME];
return context_hostalias_common
(__resolv_context_get (), name, abuf, sizeof (abuf));
}

30
resolv/res_query.c
View File

@ -635,36 +635,6 @@ res_querydomain (const char *name, const char *domain, int class, int type,
(__resolv_context_get (), name, domain, class, type, answer, anslen); (__resolv_context_get (), name, domain, class, type, answer, anslen);
} }
/* Common part of res_hostalias and hostalias. */
static const char *
context_hostalias_common (struct resolv_context *ctx,
const char *name, char *dst, size_t siz)
{
if (ctx == NULL)
{
RES_SET_H_ERRNO (&_res, NETDB_INTERNAL);
return NULL;
}
const char *result = __res_context_hostalias (ctx, name, dst, siz);
__resolv_context_put (ctx);
return result;
}
const char *
res_hostalias (res_state statp, const char *name, char *dst, size_t siz)
{
return context_hostalias_common
(__resolv_context_get_override (statp), name, dst, siz);
}
const char *
hostalias (const char *name)
{
static char abuf[MAXDNAME];
return context_hostalias_common
(__resolv_context_get (), name, abuf, sizeof (abuf));
}
#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2) #if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
# undef res_query # undef res_query
# undef res_querydomain # undef res_querydomain