gpgme/gpgme (14 files)
cvs user marcus
cvs at cvs.gnupg.org
Thu Mar 24 13:51:11 CET 2005
Date: Thursday, March 24, 2005 @ 14:05:13
Author: marcus
Path: /cvs/gpgme/gpgme/gpgme
Added: priv-io.h
Modified: ChangeLog Makefile.am data.c engine-gpgsm.c posix-io.c rungpg.c
version.c w32-io.c wait-global.c wait-private.c wait-user.c
wait.c
Removed: io.h
2005-03-24 Marcus Brinkmann <marcus at g10code.de>
* io.h: Rename to ...
* priv-io.h: ... this.
* Makefile.am (libgpgme_real_la_SOURCES): Change io.h to priv-io.h.
* data.c, engine-gpgsm.c, posix-io.c, rungpg.c, version.c,
w32-io.c, wait-private.c, wait-global.c, wait-user.c, wait.c:
Change all includes of "io.h" to "priv-io.h"
----------------+
ChangeLog | 9 +++++++
Makefile.am | 4 +--
data.c | 4 +--
engine-gpgsm.c | 4 +--
io.h | 67 -------------------------------------------------------
posix-io.c | 4 +--
priv-io.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
rungpg.c | 4 +--
version.c | 4 +--
w32-io.c | 2 -
wait-global.c | 4 +--
wait-private.c | 4 +--
wait-user.c | 4 +--
wait.c | 4 +--
14 files changed, 97 insertions(+), 88 deletions(-)
Index: gpgme/gpgme/ChangeLog
diff -u gpgme/gpgme/ChangeLog:1.392 gpgme/gpgme/ChangeLog:1.393
--- gpgme/gpgme/ChangeLog:1.392 Wed Mar 9 17:03:04 2005
+++ gpgme/gpgme/ChangeLog Thu Mar 24 14:05:12 2005
@@ -1,3 +1,12 @@
+2005-03-24 Marcus Brinkmann <marcus at g10code.de>
+
+ * io.h: Rename to ...
+ * priv-io.h: ... this.
+ * Makefile.am (libgpgme_real_la_SOURCES): Change io.h to priv-io.h.
+ * data.c, engine-gpgsm.c, posix-io.c, rungpg.c, version.c,
+ w32-io.c, wait-private.c, wait-global.c, wait-user.c, wait.c:
+ Change all includes of "io.h" to "priv-io.h"
+
2005-03-09 Werner Koch <wk at g10code.com>
* w32-util.c (_gpgme_get_gpg_path, _gpgme_get_gpgsm_path): Do not
Index: gpgme/gpgme/Makefile.am
diff -u gpgme/gpgme/Makefile.am:1.55 gpgme/gpgme/Makefile.am:1.56
--- gpgme/gpgme/Makefile.am:1.55 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/Makefile.am Thu Mar 24 14:05:12 2005
@@ -1,5 +1,5 @@
# Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
#
# This file is part of GPGME.
#
@@ -79,7 +79,7 @@
key.c keylist.c trust-item.c trustlist.c \
import.c export.c genkey.c delete.c edit.c \
engine.h engine-backend.h engine.c rungpg.c status-table.h \
- $(gpgsm_components) sema.h io.h $(system_components) \
+ $(gpgsm_components) sema.h priv-io.h $(system_components) \
debug.c debug.h gpgme.c version.c error.c
# libgpgme_la_SOURCES = ath.h ath.c
Index: gpgme/gpgme/data.c
diff -u gpgme/gpgme/data.c:1.43 gpgme/gpgme/data.c:1.44
--- gpgme/gpgme/data.c:1.43 Wed Mar 9 17:03:04 2005
+++ gpgme/gpgme/data.c Thu Mar 24 14:05:12 2005
@@ -1,5 +1,5 @@
/* data.c - An abstraction for data objects.
- Copyright (C) 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -31,7 +31,7 @@
#include "data.h"
#include "util.h"
#include "ops.h"
-#include "io.h"
+#include "priv-io.h"
#if defined(HAVE_W32_SYSTEM) && !defined(EOPNOTSUPP)
#define EOPNOTSUPP VALUE_FOR_EOPNOTSUPP
Index: gpgme/gpgme/engine-gpgsm.c
diff -u gpgme/gpgme/engine-gpgsm.c:1.104 gpgme/gpgme/engine-gpgsm.c:1.105
--- gpgme/gpgme/engine-gpgsm.c:1.104 Wed Mar 9 17:03:04 2005
+++ gpgme/gpgme/engine-gpgsm.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* engine-gpgsm.c - GpgSM engine.
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -38,7 +38,7 @@
#include "util.h"
#include "ops.h"
#include "wait.h"
-#include "io.h"
+#include "priv-io.h"
#include "sema.h"
#include "assuan.h"
Index: gpgme/gpgme/io.h
diff -u gpgme/gpgme/io.h:1.14 gpgme/gpgme/io.h:removed
--- gpgme/gpgme/io.h:1.14 Wed Mar 9 17:03:04 2005
+++ gpgme/gpgme/io.h Thu Mar 24 14:05:13 2005
@@ -1,67 +0,0 @@
-/* io.h - Interface to the I/O functions.
- Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 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 IO_H
-#define IO_H
-
-
-/* A single file descriptor passed to spawn. For child fds, dup_to
- specifies the fd it should become in the child. */
-struct spawn_fd_item_s
-{
- int fd;
- int dup_to;
-};
-
-struct io_select_fd_s
-{
- int fd;
- int for_read;
- int for_write;
- int signaled;
- int frozen;
- void *opaque;
-};
-
-/* These function are either defined in posix-io.c or w32-io.c. */
-void _gpgme_io_subsystem_init (void);
-int _gpgme_io_read (int fd, void *buffer, size_t count);
-int _gpgme_io_write (int fd, const void *buffer, size_t count);
-int _gpgme_io_pipe (int filedes[2], int inherit_idx);
-int _gpgme_io_close (int fd);
-int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *),
- void *value);
-int _gpgme_io_set_nonblocking (int fd);
-
-/* Spawn the executable PATH with ARGV as arguments, after forking
- close all fds in FD_PARENT_LIST in the parent and close or dup all
- fds in FD_CHILD_LIST in the child. */
-int _gpgme_io_spawn (const char *path, char **argv,
- struct spawn_fd_item_s *fd_child_list,
- struct spawn_fd_item_s *fd_parent_list);
-int _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal);
-int _gpgme_io_kill (int pid, int hard);
-int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock);
-
-#endif /* IO_H */
-
-
-
Index: gpgme/gpgme/posix-io.c
diff -u gpgme/gpgme/posix-io.c:1.27 gpgme/gpgme/posix-io.c:1.28
--- gpgme/gpgme/posix-io.c:1.27 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/posix-io.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* posix-io.c - Posix I/O functions
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -35,7 +35,7 @@
#include <sys/wait.h>
#include "util.h"
-#include "io.h"
+#include "priv-io.h"
#include "sema.h"
#include "ath.h"
#include "debug.h"
Index: gpgme/gpgme/priv-io.h
diff -u /dev/null gpgme/gpgme/priv-io.h:1.1
--- /dev/null Thu Mar 24 14:05:13 2005
+++ gpgme/gpgme/priv-io.h Thu Mar 24 14:05:12 2005
@@ -0,0 +1,67 @@
+/* priv-io.h - Interface to the private I/O functions.
+ Copyright (C) 2000 Werner Koch (dd9jn)
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 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 IO_H
+#define IO_H
+
+
+/* A single file descriptor passed to spawn. For child fds, dup_to
+ specifies the fd it should become in the child. */
+struct spawn_fd_item_s
+{
+ int fd;
+ int dup_to;
+};
+
+struct io_select_fd_s
+{
+ int fd;
+ int for_read;
+ int for_write;
+ int signaled;
+ int frozen;
+ void *opaque;
+};
+
+/* These function are either defined in posix-io.c or w32-io.c. */
+void _gpgme_io_subsystem_init (void);
+int _gpgme_io_read (int fd, void *buffer, size_t count);
+int _gpgme_io_write (int fd, const void *buffer, size_t count);
+int _gpgme_io_pipe (int filedes[2], int inherit_idx);
+int _gpgme_io_close (int fd);
+int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *),
+ void *value);
+int _gpgme_io_set_nonblocking (int fd);
+
+/* Spawn the executable PATH with ARGV as arguments, after forking
+ close all fds in FD_PARENT_LIST in the parent and close or dup all
+ fds in FD_CHILD_LIST in the child. */
+int _gpgme_io_spawn (const char *path, char **argv,
+ struct spawn_fd_item_s *fd_child_list,
+ struct spawn_fd_item_s *fd_parent_list);
+int _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal);
+int _gpgme_io_kill (int pid, int hard);
+int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock);
+
+#endif /* IO_H */
+
+
+
Index: gpgme/gpgme/rungpg.c
diff -u gpgme/gpgme/rungpg.c:1.103 gpgme/gpgme/rungpg.c:1.104
--- gpgme/gpgme/rungpg.c:1.103 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/rungpg.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* rungpg.c - Gpg Engine.
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -33,7 +33,7 @@
#include "ops.h"
#include "wait.h"
#include "context.h" /*temp hack until we have GpmeData methods to do I/O */
-#include "io.h"
+#include "priv-io.h"
#include "sema.h"
#include "debug.h"
Index: gpgme/gpgme/version.c
diff -u gpgme/gpgme/version.c:1.27 gpgme/gpgme/version.c:1.28
--- gpgme/gpgme/version.c:1.27 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/version.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* version.c - Version check routines.
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -27,7 +27,7 @@
#include <ctype.h>
#include "gpgme.h"
-#include "io.h"
+#include "priv-io.h"
/* For _gpgme_sema_subsystem_init (). */
#include "sema.h"
Index: gpgme/gpgme/w32-io.c
diff -u gpgme/gpgme/w32-io.c:1.31 gpgme/gpgme/w32-io.c:1.32
--- gpgme/gpgme/w32-io.c:1.31 Wed Mar 9 12:47:21 2005
+++ gpgme/gpgme/w32-io.c Thu Mar 24 14:05:12 2005
@@ -36,7 +36,7 @@
#include "util.h"
#include "sema.h"
-#include "io.h"
+#include "priv-io.h"
#include "debug.h"
/* We assume that a HANDLE can be represented by an int which should
Index: gpgme/gpgme/wait-global.c
diff -u gpgme/gpgme/wait-global.c:1.11 gpgme/gpgme/wait-global.c:1.12
--- gpgme/gpgme/wait-global.c:1.11 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/wait-global.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* wait-global.c
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -32,7 +32,7 @@
#include "util.h"
#include "context.h"
#include "wait.h"
-#include "io.h"
+#include "priv-io.h"
/* The global event loop is used for all asynchronous operations
(except key listing) for which no user I/O callbacks are specified.
Index: gpgme/gpgme/wait-private.c
diff -u gpgme/gpgme/wait-private.c:1.10 gpgme/gpgme/wait-private.c:1.11
--- gpgme/gpgme/wait-private.c:1.10 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/wait-private.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* wait-private.c
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -29,7 +29,7 @@
#include "context.h"
#include "wait.h"
#include "ops.h"
-#include "io.h"
+#include "priv-io.h"
#include "util.h"
Index: gpgme/gpgme/wait-user.c
diff -u gpgme/gpgme/wait-user.c:1.6 gpgme/gpgme/wait-user.c:1.7
--- gpgme/gpgme/wait-user.c:1.6 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/wait-user.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* wait-user.c
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -26,7 +26,7 @@
#include "gpgme.h"
#include "context.h"
-#include "io.h"
+#include "priv-io.h"
#include "wait.h"
Index: gpgme/gpgme/wait.c
diff -u gpgme/gpgme/wait.c:1.43 gpgme/gpgme/wait.c:1.44
--- gpgme/gpgme/wait.c:1.43 Tue Dec 7 22:13:36 2004
+++ gpgme/gpgme/wait.c Thu Mar 24 14:05:12 2005
@@ -1,6 +1,6 @@
/* wait.c
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
This file is part of GPGME.
@@ -33,7 +33,7 @@
#include "ops.h"
#include "wait.h"
#include "sema.h"
-#include "io.h"
+#include "priv-io.h"
#include "engine.h"
#include "debug.h"
More information about the Gnupg-commits
mailing list