resolv: Reformat resolv/res_data.c to GNU style

This commit is contained in:
Florian Weimer 2017-06-30 11:32:04 +02:00
parent 0377511799
commit 6da48ca0b2
2 changed files with 38 additions and 13 deletions

View File

@ -1,3 +1,8 @@
2017-06-30 Florian Weimer <fweimer@redhat.com>
* resolv/res_data.c: Reformat to GNU style.
(res_close): Update comments.
2017-06-30 Florian Weimer <fweimer@redhat.com> 2017-06-30 Florian Weimer <fweimer@redhat.com>
* resolv/res_data.c (res_query, res_search, res_querydomain) * resolv/res_data.c (res_query, res_search, res_querydomain)

View File

@ -1,3 +1,21 @@
/* Miscellaneous definitions for libresolv.
Copyright (C) 1995-2017 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
<http://www.gnu.org/licenses/>. */
/* /*
* Copyright (c) 1995-1999 by Internet Software Consortium. * Copyright (c) 1995-1999 by Internet Software Consortium.
* *
@ -17,18 +35,20 @@
#include <resolv.h> #include <resolv.h>
/* This function belongs to libresolv, which is why it is not included
in res-close.c. */
void void
res_close(void) { __res_close (void)
/* {
* Some stupid programs out there call res_close() before res_init(). /* Some programs call res_close before res_init. Since _res._vcsock
* Since _res._vcsock isn't explicitly initialized, these means that isn't explicitly initialized, these means that we could call
* we could do a close(0), which might lead to some security problems. close (0), which might lead to some security problems. Therefore
* Therefore we check if res_init() was called before by looking at we check if res_init was called before by looking at the RES_INIT
* the RES_INIT bit in _res.options. If it hasn't been set we bail out bit in _res.options. If it hasn't been set we bail out
* early. */ early. */
if ((_res.options & RES_INIT) == 0) if ((_res.options & RES_INIT) == 0)
return; return;
/* We don't free the name server addresses because we never /* We don't free the name server addresses because we never did it
did it and it would be done implicitly on shutdown. */ and it would be done implicitly on shutdown. */
__res_iclose (&_res, false); __res_iclose (&_res, false);
} }