[git] GPGME - branch, master, updated. gpgme-1.1.8-163-gde287a7
by Marcus Brinkmann
cvs at cvs.gnupg.org
Wed Feb 2 14:13:35 CET 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 "GnuPG Made Easy".
The branch, master has been updated
via de287a7996c85e6c6eb740f110df0f904d4cd867 (commit)
via a2b9adafe46c55a2c26dd46163055bbdf3526835 (commit)
from 1f0f033f552b5cd81f02e761a0e31eb9a2c89ab8 (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 de287a7996c85e6c6eb740f110df0f904d4cd867
Merge: 1f0f033 a2b9ada
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Wed Feb 2 13:51:42 2011 +0100
Merge commit 'a2b9adafe46c55a2c26dd46163055bbdf3526835'
diff --cc src/ChangeLog
index fdd3e49,fe85095..fbe92be
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,84 -1,9 +1,90 @@@
+ 2011-02-02 Marcus Brinkmann <mb at g10code.com>
+
+ * w32-util.c (mkstemp): Don't use CreateFile instead of open (the
+ function is not used on Windows CE, and the callers were not
+ adjusted).
+
+2011-01-21 Marcus Brinkmann <mb at g10code.com>
+
+ * engine-gpgconf.c (_gpgme_conf_opt_change): Fix the case that is
+ not self-assignment.
+
+2010-12-08 Werner Koch <wk at g10code.com>
+
+ * gpgme-tool.c (strcpy_escaped_plus): New.
+ (DIM, xtoi_1, xtoi_2): New.
+ (cmd_keylist): Allow for multiple patterns.
+
+2010-11-23 Marcus Brinkmann <mb at g10code.com>
+
+ * w32-io.c (create_reader, create_writer): Use small stack size on
+ Windows CE.
+
+2010-11-23 Marcus Brinkmann <mb at g10code.com>
+
+ * gpgme.h.in (gpgme_conf_arg_new): Make VALUE arg const void *.
+ * gpgconf.c (_gpgme_conf_arg_new): Likewise.
+ (gpgme_conf_arg_new): Likewise.
+ * engine-gpgconf.c (_gpgme_conf_arg_new): Likewise.
+ (gpgconf_write): Remove debug hack.
+
+2010-11-19 Marcus Brinkmann <mb at g10code.com>
+
+ * engine-gpgconf.c (_gpgme_conf_opt_change): Support
+ self-assignment. Requested by Marc Mutz.
+
+2010-11-17 Marcus Brinkmann <mb at g10code.com>
+
+ * vasprintf.c (int_vasprintf) [HAVE_W32CE_SYSTEM]: Just use a
+ fixed size buffer, as va_copy is not easy to fake.
+
+2010-11-15 Marcus Brinkmann <mb at g10code.com>
+
+ * w32-ce.h (strcasecmp, strdup) [_MSC_VER]: Define.
+ * genkey.c, passphrase.c: Include util.h.
+
+ * w32-util.c (_gpgme_w32ce_get_debug_envvar): Fix return value.
+
+2010-11-15 Werner Koch <wk at g10code.com>
+
+ * data-compat.c (gpgme_data_new_from_filepart)
+ (gpgme_data_new_from_file) [W32CE && _MSC_VER]: Return not
+ GPG_ERR_NOT_IMPLEMENTED.
+
+ * w32-ce.h (HKEY_PERFORMANCE_DATA, HKEY_CURRENT_CONFIG, _IOLBF)
+ (abort) [_MSC_VER]: Provide these macros.
+
+ * ath.h [W32CE && _MSC_VER]: Include winsock2.h.
+
+ * ath.c (ath_read, ath_write) [W32CE && _MSC_VER]: Do not call
+ non-available functions.
+
+2010-11-04 Werner Koch <wk at g10code.com>
+
+ * w32-ce.h [_MSC_VER && W32CE]: Undef leave.
+ * export.c: Include util.h so that we get the above undef.
+
+ * memrchr.c: Remove. Used to be a replacement function required
+ by the formerly included assuan code.
+
+2010-11-03 Werner Koch <wk at g10code.com>
+
+ * debug.c (_gpgme_debug) [W32CE]: Replace locatime by GetLocalTime.
+
+ * signers.c (gpgme_signers_clear): Remove useless return.
+ Reported by Patrick Spendrin.
+
+ * w32-util.c: s/__inline__/GPG_ERR_INLINE/
+
+ * setenv.c: Include string.h due to our strerror replacement.
+
+ * w32-ce.h (access, bsearch): New macros.
+ * w32-ce.c (_gpgme_wince_access): New.
+ (RegQueryValueExA): Change DATA to a void*.
+ (_gpgme_wince_bsearch): New. Taken from glibc 2.6.
+
+ Guard include of sys/stat.h and sys/types.h.
+
2010-11-02 Werner Koch <wk at g10code.com>
* data-fd.c (read, write, lseek) [W32CE && ! __MINGW32CE__]: New.
commit a2b9adafe46c55a2c26dd46163055bbdf3526835
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Wed Feb 2 13:47:53 2011 +0100
2011-02-02 Marcus Brinkmann <mb at g10code.com>
* w32-util.c (mkstemp): Don't use CreateFile instead of open (the
function is not used on Windows CE, and the callers were not
adjusted).
diff --git a/src/ChangeLog b/src/ChangeLog
index 562d297..fe85095 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-02 Marcus Brinkmann <mb at g10code.com>
+
+ * w32-util.c (mkstemp): Don't use CreateFile instead of open (the
+ function is not used on Windows CE, and the callers were not
+ adjusted).
+
2010-11-02 Werner Koch <wk at g10code.com>
* data-fd.c (read, write, lseek) [W32CE && ! __MINGW32CE__]: New.
diff --git a/src/w32-util.c b/src/w32-util.c
index ec2fe50..c29ff49 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -473,6 +473,14 @@ _gpgme_get_conf_int (const char *key, int *value)
}
+#ifdef HAVE_W32CE_SYSTEM
+int
+_gpgme_mkstemp (int *fd, char **name)
+{
+ return -1;
+}
+#else
+
/* mkstemp extracted from libc/sysdeps/posix/tempname.c. Copyright
(C) 1991-1999, 2000, 2001, 2006 Free Software Foundation, Inc.
@@ -496,7 +504,7 @@ mkstemp (char *tmpl)
static uint64_t value;
uint64_t random_time_bits;
unsigned int count;
- HANDLE fd = INVALID_HANDLE_VALUE;
+ int fd = -1;
int save_errno = errno;
/* A lower bound on the number of temporary files to attempt to
@@ -552,23 +560,14 @@ mkstemp (char *tmpl)
v /= 62;
XXXXXX[5] = letters[v % 62];
- fd = CreateFileA (tmpl,
- GENERIC_WRITE|GENERIC_READ,
- FILE_SHARE_READ|FILE_SHARE_WRITE,
- NULL,
- CREATE_NEW,
- FILE_ATTRIBUTE_NORMAL,
- NULL);
- if (fd != INVALID_HANDLE_VALUE)
+ fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+ if (fd >= 0)
{
gpg_err_set_errno (save_errno);
- return (int)fd;
+ return fd;
}
- else if (GetLastError () != ERROR_FILE_EXISTS)
- {
- gpg_err_set_errno (EIO);
- return -1;
- }
+ else if (errno != EEXIST)
+ return -1;
}
/* We got out of the loop because we ran out of combinations to try. */
@@ -613,6 +612,7 @@ _gpgme_mkstemp (int *fd, char **name)
*name = tmpname;
return 0;
}
+#endif
-----------------------------------------------------------------------
Summary of changes:
src/ChangeLog | 6 ++++++
src/w32-util.c | 30 +++++++++++++++---------------
2 files changed, 21 insertions(+), 15 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list