diff --git a/src/Makefile.am b/src/Makefile.am index 10dd83c1..b17aac25 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,7 +55,7 @@ if HAVE_DOSISH_SYSTEM system_components = w32-util.c system_components_not_extra = w32-io.c else -system_components = ath.h posix-util.c posix-io.c +system_components = posix-util.c posix-io.c system_components_not_extra = endif @@ -94,8 +94,7 @@ main_sources = \ engine-spawn.c \ gpgconf.c queryswdb.c \ sema.h priv-io.h $(system_components) sys-util.h dirinfo.c \ - debug.c debug.h gpgme.c version.c error.c \ - ath.h ath.c + debug.c debug.h gpgme.c version.c error.c libgpgme_la_SOURCES = $(main_sources) $(system_components_not_extra) diff --git a/src/ath.c b/src/ath.c deleted file mode 100644 index 996143dc..00000000 --- a/src/ath.c +++ /dev/null @@ -1,161 +0,0 @@ -/* ath.c - Thread-safeness library. - * Copyright (C) 2002, 2003, 2004 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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 this program; if not, see . - * SPDX-License-Identifier: LGPL-2.1-or-later - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#ifdef HAVE_UNISTD_H -# include -#endif -#ifdef HAVE_POLL_H -# include -#else -# ifdef HAVE_SYS_SELECT_H -# include -# else -# ifdef HAVE_SYS_TIME_H -# include -# endif -# endif -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifndef HAVE_W32_SYSTEM -#include -#endif - -#include "gpgme.h" - -#ifdef _MSC_VER - typedef int pid_t; -#endif - -#include "ath.h" - - -#ifdef HAVE_W32_SYSTEM -#include -uintptr_t -ath_self (void) -{ - return (uintptr_t) GetCurrentThreadId (); -} -#else -# ifdef __linux -#include -uintptr_t -ath_self (void) -{ - /* Just to catch users who don't use gpgme-pthread. */ - return (uintptr_t) syscall (__NR_gettid); -} -# else -uintptr_t -ath_self (void) -{ - return (uintptr_t) getpid (); -} -# endif -#endif - - -gpgme_ssize_t -ath_read (int fd, void *buf, size_t nbytes) -{ - return read (fd, buf, nbytes); -} - - -gpgme_ssize_t -ath_write (int fd, const void *buf, size_t nbytes) -{ - return write (fd, buf, nbytes); -} - - -#if !defined(HAVE_POLL_H) -gpgme_ssize_t -ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, - struct timeval *timeout) -{ -#ifdef HAVE_W32_SYSTEM - return -1; /* Not supported. */ -#else - return select (nfd, rset, wset, eset, timeout); -#endif -} -#endif - -gpgme_ssize_t -ath_waitpid (pid_t pid, int *status, int options) -{ -#ifdef HAVE_W32_SYSTEM - return -1; /* Not supported. */ -#else - return waitpid (pid, status, options); -#endif -} - - -int -ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr) -{ -#ifdef HAVE_W32_SYSTEM - return -1; /* Not supported. */ -#else - return accept (s, addr, length_ptr); -#endif -} - - -int -ath_connect (int s, const struct sockaddr *addr, socklen_t length) -{ -#ifdef HAVE_W32_SYSTEM - return -1; /* Not supported. */ -#else - return connect (s, addr, length); -#endif -} - - -int -ath_sendmsg (int s, const struct msghdr *msg, int flags) -{ -#ifdef HAVE_W32_SYSTEM - return -1; /* Not supported. */ -#else - return sendmsg (s, msg, flags); -#endif -} - - -int -ath_recvmsg (int s, struct msghdr *msg, int flags) -{ -#ifdef HAVE_W32_SYSTEM - return -1; /* Not supported. */ -#else - return recvmsg (s, msg, flags); -#endif -} diff --git a/src/ath.h b/src/ath.h deleted file mode 100644 index 8243864a..00000000 --- a/src/ath.h +++ /dev/null @@ -1,88 +0,0 @@ -/* ath.h - Interfaces for thread-safeness library. - Copyright (C) 2002, 2003, 2004 g10 Code GmbH - - This file is part of GPGME. - - GPGME 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. - - GPGME 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 this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ - -#ifndef ATH_H -#define ATH_H - -#ifdef HAVE_STDINT_H -#include -#endif -#ifdef HAVE_W32_SYSTEM - /* fixme: Check how we did it in libgcrypt. */ - struct msghdr { int dummy; }; - typedef int socklen_t; -# include -# include - -#else /*!HAVE_W32_SYSTEM*/ -# ifdef HAVE_POLL_H -# include -# else -# ifdef HAVE_SYS_SELECT_H -# include -# else -# ifdef HAVE_SYS_TIME_H -# include -# endif -# endif -# endif -# ifdef HAVE_SYS_TYPES_H -# include -# endif -# include - -#endif /*!HAVE_W32_SYSTEM*/ - - - -/* Define _ATH_EXT_SYM_PREFIX if you want to give all external symbols - a prefix. */ -#define _ATH_EXT_SYM_PREFIX _gpgme_ - -#ifdef _ATH_EXT_SYM_PREFIX -#define _ATH_PREFIX1(x,y) x ## y -#define _ATH_PREFIX2(x,y) _ATH_PREFIX1(x,y) -#define _ATH_PREFIX(x) _ATH_PREFIX2(_ATH_EXT_SYM_PREFIX,x) -#define ath_read _ATH_PREFIX(ath_read) -#define ath_write _ATH_PREFIX(ath_write) -#define ath_select _ATH_PREFIX(ath_select) -#define ath_waitpid _ATH_PREFIX(ath_waitpid) -#define ath_connect _ATH_PREFIX(ath_connect) -#define ath_accept _ATH_PREFIX(ath_accept) -#define ath_sendmsg _ATH_PREFIX(ath_sendmsg) -#define ath_recvmsg _ATH_PREFIX(ath_recvmsg) -#endif - - -uintptr_t ath_self (void); - -/* Replacement for the POSIX functions, which can be used to allow - other (user-level) threads to run. */ -gpgme_ssize_t ath_read (int fd, void *buf, size_t nbytes); -gpgme_ssize_t ath_write (int fd, const void *buf, size_t nbytes); -gpgme_ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, - struct timeval *timeout); -gpgme_ssize_t ath_waitpid (pid_t pid, int *status, int options); -int ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr); -int ath_connect (int s, const struct sockaddr *addr, socklen_t length); -int ath_sendmsg (int s, const struct msghdr *msg, int flags); -int ath_recvmsg (int s, struct msghdr *msg, int flags); - -#endif /* ATH_H */