[git] Assuan - branch, master, updated. libassuan-2.0.1-33-gb74a70f
by Werner Koch
cvs at cvs.gnupg.org
Mon Mar 28 11:47:00 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via b74a70f89d2a17b2960105d1aab8e09011dc65b2 (commit)
from b00ae5099d3e6eda3cb7d1d1cfb0cbfd87e918f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b74a70f89d2a17b2960105d1aab8e09011dc65b2
Author: Werner Koch <wk at gnupg.org>
Date: Mon Mar 28 11:19:43 2011 +0200
Include sys/select.h in a test utility.
This fixes bug#1328 (libassuan: ce-server fails to compile on Darwin
due to missing include).
diff --git a/ChangeLog b/ChangeLog
index 803cb28..c26fbf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-28 Werner Koch <wk at g10code.com>
+
+ * configure.ac (AC_CHECK_HEADERS): Check for sys/select.h which is
+ needed by one test utility.
+
2010-12-23 Werner Koch <wk at g10code.com>
* configure.ac: Add a git commit identifier to the version.
diff --git a/configure.ac b/configure.ac
index b7de45b..d29c82e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac - for libassuan
# Copyright (C) 2001-2003, 2006, 2007, 2009 Free Software Foundation, Inc.
-#
+#
# This file is part of Assuan.
#
# Assuan is free software; you can redistribute it and/or modify it
@@ -164,9 +164,9 @@ if test "$GCC" = yes; then
fi
-#
+#
# Options depending on the host OS.
-#
+#
have_dosish_system=no
have_w32_system=no
have_w32ce_system=no
@@ -194,7 +194,7 @@ esac
if test "$have_dosish_system" = yes; then
AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
- [Defined if we run on some of the PCDOS like systems
+ [Defined if we run on some of the PCDOS like systems
(DOS, Windoze. OS/2) with special properties like
no file modes])
fi
@@ -207,7 +207,7 @@ if test "$have_w32_system" = yes; then
fi
BUILD_TIMESTAMP=`date --iso-8601=minutes`
AC_SUBST(BUILD_TIMESTAMP)
- changequote(,)dnl
+ changequote(,)dnl
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
changequote([,])dnl
case "$VERSION" in
@@ -254,7 +254,8 @@ AC_SUBST(LIBASSUAN_CONFIG_EXTRA_LIBS)
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([string.h locale.h sys/uio.h stdint.h inttypes.h \
- sys/types.h sys/stat.h unistd.h sys/time.h fcntl.h])
+ sys/types.h sys/stat.h unistd.h sys/time.h fcntl.h \
+ sys/select.h ])
AC_TYPE_UINTPTR_T
AC_TYPE_UINT16_T
@@ -344,14 +345,14 @@ AC_REPLACE_FUNCS(vasprintf)
#
AC_MSG_CHECKING(for SO_PEERCRED)
AC_CACHE_VAL(assuan_cv_sys_so_peercred,
- [AC_TRY_COMPILE([#include <sys/socket.h>],
- [struct ucred cr;
+ [AC_TRY_COMPILE([#include <sys/socket.h>],
+ [struct ucred cr;
int cl = sizeof cr;
getsockopt (1, SOL_SOCKET, SO_PEERCRED, &cr, &cl);],
assuan_cv_sys_so_peercred=yes,
assuan_cv_sys_so_peercred=no)
])
-AC_MSG_RESULT($assuan_cv_sys_so_peercred)
+AC_MSG_RESULT($assuan_cv_sys_so_peercred)
if test $assuan_cv_sys_so_peercred = yes; then
AC_DEFINE(HAVE_SO_PEERCRED, 1,
[Defined if SO_PEERCRED is supported (Linux specific)])
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index 692bdd0..bd57ca0 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -1,5 +1,6 @@
/* assuan-handler.c - dispatch commands
- Copyright (C) 2001, 2002, 2003, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2007, 2009,
+ 2011 Free Software Foundation, Inc.
This file is part of Assuan.
diff --git a/tests/ChangeLog b/tests/ChangeLog
index c2c3f56..8d402ad 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-28 Werner Koch <wk at g10code.com>
+
+ * ce-server.c: Include sys/select.h if needed. Fixes bug#1328.
+
2010-10-11 Werner Koch <wk at g10code.com>
* Makefile.am (w32cetools): Move ce-server to here.
@@ -68,4 +72,3 @@
This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
diff --git a/tests/ce-server.c b/tests/ce-server.c
index 9975e53..24cf734 100644
--- a/tests/ce-server.c
+++ b/tests/ce-server.c
@@ -35,6 +35,9 @@
# include <sys/socket.h>
# include <netinet/in.h>
# include <arpa/inet.h>
+# ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+# else
#endif
#include <errno.h>
@@ -69,8 +72,8 @@ typedef struct fdinfo_s *fdinfo_t;
struct state_s
{
/* The current working directory - access using get_cwd(). */
- char *cwd;
-
+ char *cwd;
+
/* If valid, a socket in listening state created by the dataport
command. */
assuan_fd_t dataport_listen_fd;
@@ -113,7 +116,7 @@ my_read (assuan_fd_t fd, void *buffer, size_t size)
case WSAENOTSOCK:
{
DWORD nread = 0;
-
+
res = ReadFile (fd, buffer, size, &nread, NULL);
if (!res)
{
@@ -124,7 +127,7 @@ my_read (assuan_fd_t fd, void *buffer, size_t size)
break;
default:
- gpg_err_set_errno (EIO);
+ gpg_err_set_errno (EIO);
}
res = -1;
}
@@ -132,7 +135,7 @@ my_read (assuan_fd_t fd, void *buffer, size_t size)
res = (int) nread;
}
break;
-
+
case WSAEWOULDBLOCK:
gpg_err_set_errno (EAGAIN);
break;
@@ -174,17 +177,17 @@ my_writen (assuan_fd_t fd, const char *buffer, size_t length)
if (nwritten == -1 && WSAGetLastError () == WSAENOTSOCK)
{
DWORD nwrite;
-
+
nwritten = WriteFile (fd, buffer, length, &nwrite, NULL);
if (!nwritten)
{
switch (GetLastError ())
{
- case ERROR_BROKEN_PIPE:
+ case ERROR_BROKEN_PIPE:
case ERROR_NO_DATA:
gpg_err_set_errno (EPIPE);
break;
-
+
default:
gpg_err_set_errno (EIO);
break;
@@ -211,7 +214,7 @@ my_writen (assuan_fd_t fd, const char *buffer, size_t length)
-static state_t
+static state_t
new_state (void)
{
state_t state = xcalloc (1, sizeof *state);
@@ -220,8 +223,8 @@ new_state (void)
state->dataport_fd = ASSUAN_INVALID_FD;
return state;
}
-
-static void
+
+static void
release_state (state_t state)
{
fdinfo_t fi, fi2;
@@ -285,7 +288,7 @@ wchar_to_utf8 (const wchar_t *string)
n = WideCharToMultiByte (CP_ACP, 0, string, length, result, n, NULL, NULL);
if (n < 0)
log_fatal ("WideCharToMultiByte failed\n");
-
+
result[n] = 0;
return result;
}
@@ -303,14 +306,14 @@ utf8_to_wchar (const char *string)
log_fatal ("MultiByteToWideChar failed\n");
nbytes = (size_t)(n+1) * sizeof(*result);
- if (nbytes / sizeof(*result) != (n+1))
+ if (nbytes / sizeof(*result) != (n+1))
log_fatal ("utf8_to_wchar: integer overflow\n");
result = xmalloc (nbytes);
n = MultiByteToWideChar (CP_UTF8, 0, string, length, result, n);
if (n < 0)
log_fatal ("MultiByteToWideChar failed\n");
result[n] = 0;
-
+
return result;
}
#endif /*HAVE_W32CE_SYSTEM*/
@@ -320,7 +323,7 @@ static char *
gnu_getcwd (void)
{
size_t size = 100;
-
+
while (1)
{
char *buffer = xmalloc (size);
@@ -435,7 +438,7 @@ output_notify (assuan_context_t ctx, char *line)
-static const char hlp_echo[] =
+static const char hlp_echo[] =
"ECHO <line>\n"
"\n"
"Print LINE as data lines.\n";
@@ -451,7 +454,7 @@ cmd_echo (assuan_context_t ctx, char *line)
-static const char hlp_cat[] =
+static const char hlp_cat[] =
"CAT [<filename>]\n"
"\n"
"Copy the content of FILENAME to the descriptor set by the OUTPUT\n"
@@ -526,7 +529,7 @@ cmd_cat (assuan_context_t ctx, char *line)
else
nread = n;
}
-
+
if (fd_out != ASSUAN_INVALID_FD)
{
@@ -560,7 +563,7 @@ leave:
}
-static const char hlp_pwd[] =
+static const char hlp_pwd[] =
"PWD\n"
"\n"
"Print the curent working directory of this session.\n";
@@ -570,7 +573,7 @@ cmd_pwd (assuan_context_t ctx, char *line)
state_t state = assuan_get_pointer (ctx);
gpg_error_t err;
const char *string;
-
+
string = get_cwd (state);
err = assuan_send_data (ctx, string, strlen (string));
@@ -578,7 +581,7 @@ cmd_pwd (assuan_context_t ctx, char *line)
}
-static const char hlp_cd[] =
+static const char hlp_cd[] =
"CD [dir]\n"
"\n"
"Change the curretn directory of the session.\n";
@@ -605,7 +608,7 @@ cmd_cd (assuan_context_t ctx, char *line)
newdir = xstrdup (line);
else
newdir = xstrconcat (get_cwd (state), "/", line, NULL);
-
+
while (strlen(newdir) > 1 && line[strlen(newdir)-1] == '/')
line[strlen(newdir)-1] = 0;
xfree (state->cwd);
@@ -620,7 +623,7 @@ cmd_cd (assuan_context_t ctx, char *line)
#ifdef HAVE_W32CE_SYSTEM
-static const char hlp_ls[] =
+static const char hlp_ls[] =
"LS [<pattern>]\n"
"\n"
"List the files described by PATTERN.\n";
@@ -661,7 +664,7 @@ cmd_ls (assuan_context_t ctx, char *line)
DWORD attr = fi.dwFileAttributes;
fname = wchar_to_utf8 (fi.cFileName);
- snprintf (buf, sizeof buf,
+ snprintf (buf, sizeof buf,
"%c%c%c%c%c%c%c%c%c%c%c%c%c %7lu%c %s\n",
(attr & FILE_ATTRIBUTE_DIRECTORY)
? ((attr & FILE_ATTRIBUTE_DEVICE)? 'c':'d'):'-',
@@ -693,7 +696,7 @@ cmd_ls (assuan_context_t ctx, char *line)
else
{
log_info ("FindNextFile returned %d\n", GetLastError ());
- err = gpg_error_from_syserror ();
+ err = gpg_error_from_syserror ();
}
FindClose (hd);
@@ -704,7 +707,7 @@ cmd_ls (assuan_context_t ctx, char *line)
#ifdef HAVE_W32CE_SYSTEM
-static const char hlp_run[] =
+static const char hlp_run[] =
"RUN <filename> [<args>]\n"
"\n"
"Run the program in FILENAME with the arguments ARGS.\n"
@@ -829,16 +832,16 @@ cmd_run (assuan_context_t ctx, char *line)
goto leave;
}
- log_info ("CreateProcess ready: hProcess=%p hThread=%p"
- " dwProcessID=%d dwThreadId=%d\n",
+ log_info ("CreateProcess ready: hProcess=%p hThread=%p"
+ " dwProcessID=%d dwThreadId=%d\n",
pi.hProcess, pi.hThread,
(int) pi.dwProcessId, (int) pi.dwThreadId);
ResumeThread (pi.hThread);
- CloseHandle (pi.hThread);
+ CloseHandle (pi.hThread);
code = WaitForSingleObject (pi.hProcess, INFINITE);
- switch (code)
+ switch (code)
{
case WAIT_FAILED:
err = gpg_error_from_syserror ();;
@@ -863,7 +866,7 @@ cmd_run (assuan_context_t ctx, char *line)
err = 0;
}
break;
-
+
default:
err = gpg_error_from_syserror ();;
log_error ("WaitForSingleObject returned unexpected "
@@ -871,7 +874,7 @@ cmd_run (assuan_context_t ctx, char *line)
break;
}
CloseHandle (pi.hProcess);
-
+
leave:
for (idx=0; idx < 3; idx++)
{
@@ -901,7 +904,7 @@ cmd_run (assuan_context_t ctx, char *line)
-static const char hlp_newdataport[] =
+static const char hlp_newdataport[] =
"NEWDATAPORT\n"
"\n"
"Create a new dataport. The server creates a listening socket and\n"
@@ -963,7 +966,7 @@ cmd_newdataport (assuan_context_t ctx, char *line)
log_error ("listen() failed: %s\n", strerror (errno));
goto leave;
}
-
+
if (listen (HANDLE2SOCKET (state->dataport_listen_fd), 1))
{
err = gpg_error_from_syserror ();
@@ -1088,7 +1091,7 @@ cmd_dataport (assuan_context_t ctx, char *line)
-static const char hlp_getinfo[] =
+static const char hlp_getinfo[] =
"GETINFO <what>\n"
"\n"
"Multipurpose function to return a variety of information.\n"
@@ -1138,7 +1141,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
-static const char hlp_shutdown[] =
+static const char hlp_shutdown[] =
"SHUTDOWN\n"
"\n"
"Shutdown the server process\n";
@@ -1182,7 +1185,7 @@ register_commands (assuan_context_t ctx)
for (i=0; table[i].name; i++)
{
- rc = assuan_register_command (ctx, table[i].name,
+ rc = assuan_register_command (ctx, table[i].name,
table[i].handler, table[i].help);
if (rc)
return rc;
@@ -1225,7 +1228,7 @@ server (void)
if (server_fd == ASSUAN_INVALID_FD)
log_fatal ("socket() failed: %s\n", strerror (errno));
- if (setsockopt (HANDLE2SOCKET (server_fd),
+ if (setsockopt (HANDLE2SOCKET (server_fd),
SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof one))
log_error ("setsockopt(SO_REUSEADDR) failed: %s\n", strerror (errno));
@@ -1234,7 +1237,7 @@ server (void)
name.sin_addr.s_addr = htonl (INADDR_ANY);
if (assuan_sock_bind (server_fd, (struct sockaddr *) &name, sizeof name))
log_fatal ("bind() failed: %s\n", strerror (errno));
- if (assuan_sock_get_nonce ((struct sockaddr*)&name, sizeof name,
+ if (assuan_sock_get_nonce ((struct sockaddr*)&name, sizeof name,
&server_nonce))
log_fatal ("assuan_sock_get_nonce failed: %s\n", strerror (errno));
@@ -1264,9 +1267,9 @@ server (void)
assuan_register_input_notify (ctx, input_notify);
assuan_register_output_notify (ctx, output_notify);
-
+
state = new_state ();
-
+
assuan_set_pointer (ctx, state);
while (!shutdown_pending)
@@ -1280,7 +1283,7 @@ server (void)
log_error ("assuan_accept failed: %s\n", gpg_strerror (err));
break;
}
-
+
log_info ("client connected. Client's pid is %ld\n",
(long)assuan_get_pid (ctx));
do
@@ -1346,7 +1349,7 @@ server (void)
if (err)
log_error ("assuan_process failed: %s\n", gpg_strerror (err));
}
-
+
assuan_sock_close (server_fd);
assuan_release (ctx);
release_state (state);
@@ -1356,12 +1359,12 @@ server (void)
-/*
-
+/*
+
M A I N
*/
-int
+int
main (int argc, char **argv)
{
gpg_error_t err;
@@ -1413,4 +1416,3 @@ main (int argc, char **argv)
return errorcount ? 1 : 0;
}
-
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++
configure.ac | 19 +++++-----
src/assuan-handler.c | 3 +-
tests/ChangeLog | 5 ++-
tests/ce-server.c | 96 +++++++++++++++++++++++++------------------------
5 files changed, 70 insertions(+), 58 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list