GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Don't use internal __assuan functions.

Browse Source 
* configure.ac (nanosleep): Detect.
* src/assuan-support.c: Don't use __assuan_usleep.
(my_socketpair): Don't use __assuan_socketpair.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-04-05 14:42:59 +09:00
parent 110a375401
commit a36d71a8e3
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -739,7 +739,7 @@ fi
# #
# Check for getgid etc # Check for getgid etc
AC_CHECK_FUNCS(getgid getegid closefrom) AC_CHECK_FUNCS(getgid getegid closefrom nanosleep)
# Replacement functions. # Replacement functions.

32
src/assuan-support.c
View File

@ -30,7 +30,11 @@
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
# include <sys/types.h> # include <sys/types.h>
#endif #endif
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#ifndef HAVE_W32_SYSTEM #ifndef HAVE_W32_SYSTEM
#include <unistd.h>
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
@ -68,8 +72,28 @@ _gpgme_assuan_log_cb (assuan_context_t ctx, void *hook,
static void static void
my_usleep (assuan_context_t ctx, unsigned int usec) my_usleep (assuan_context_t ctx, unsigned int usec)
{ {
/* FIXME: Add to ath. */ (void)ctx;
__assuan_usleep (ctx, usec);
if (!usec)
return;
#ifdef HAVE_W32_SYSTEM
Sleep (usec / 1000);
#else
# ifdef HAVE_NANOSLEEP
{
struct timespec req;
struct timespec rem;
req.tv_sec = usec / 1000000;
req.tv_nsec = (usec % 1000000) * 1000;
while (nanosleep (&req, &rem) < 0 && errno == EINTR)
req = rem;
}
# else
usleep (usec);
# endif
#endif
} }
@ -312,8 +336,8 @@ static int
my_socketpair (assuan_context_t ctx, int namespace, int style, my_socketpair (assuan_context_t ctx, int namespace, int style,
int protocol, assuan_fd_t filedes[2]) int protocol, assuan_fd_t filedes[2])
{ {
#ifdef HAVE_W32_SYSTEM
(void)ctx; (void)ctx;
#ifdef HAVE_W32_SYSTEM
(void)namespace; (void)namespace;
(void)style; (void)style;
(void)protocol; (void)protocol;
@ -322,7 +346,7 @@ my_socketpair (assuan_context_t ctx, int namespace, int style,
return -1; return -1;
#else #else
/* FIXME: Debug output missing. */ /* FIXME: Debug output missing. */
return __assuan_socketpair (ctx, namespace, style, protocol, filedes); return socketpair (namespace, style, protocol, filedes);
#endif #endif
} }