mirror of
https://github.com/moparisthebest/curl
synced 2024-11-10 03:25:04 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
92 lines
2.5 KiB
C
92 lines
2.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
#include <sys/ioctl.h>
|
|
#endif
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
#if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE))
|
|
#include <sys/filio.h>
|
|
#endif
|
|
#ifdef __VMS
|
|
#include <in.h>
|
|
#include <inet.h>
|
|
#endif
|
|
|
|
#include "nonblock.h"
|
|
|
|
/*
|
|
* curlx_nonblock() set the given socket to either blocking or non-blocking
|
|
* mode based on the 'nonblock' boolean argument. This function is highly
|
|
* portable.
|
|
*/
|
|
int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
|
|
int nonblock /* TRUE or FALSE */)
|
|
{
|
|
#if defined(USE_BLOCKING_SOCKETS)
|
|
|
|
return 0; /* returns success */
|
|
|
|
#elif defined(HAVE_FCNTL_O_NONBLOCK)
|
|
|
|
/* most recent unix versions */
|
|
int flags;
|
|
flags = sfcntl(sockfd, F_GETFL, 0);
|
|
if(nonblock)
|
|
return sfcntl(sockfd, F_SETFL, flags | O_NONBLOCK);
|
|
else
|
|
return sfcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK));
|
|
|
|
#elif defined(HAVE_IOCTL_FIONBIO)
|
|
|
|
/* older unix versions */
|
|
int flags = nonblock ? 1 : 0;
|
|
return ioctl(sockfd, FIONBIO, &flags);
|
|
|
|
#elif defined(HAVE_IOCTLSOCKET_FIONBIO)
|
|
|
|
/* Windows */
|
|
unsigned long flags = nonblock ? 1UL : 0UL;
|
|
return ioctlsocket(sockfd, FIONBIO, &flags);
|
|
|
|
#elif defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
|
|
|
|
/* Amiga */
|
|
long flags = nonblock ? 1L : 0L;
|
|
return IoctlSocket(sockfd, FIONBIO, flags);
|
|
|
|
#elif defined(HAVE_SETSOCKOPT_SO_NONBLOCK)
|
|
|
|
/* BeOS */
|
|
long b = nonblock ? 1L : 0L;
|
|
return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
|
|
|
|
#else
|
|
# error "no non-blocking method was found/used/set"
|
|
#endif
|
|
}
|