+2005-07-13 [colin] 1.9.12cvs41
+
+ * src/plugins/pgpmime/pgpmime.c
+ * src/plugins/pgpmime/sgpgme.c
+ Use gpgme_data_release_and_get_mem instead
+ of gpgme_data_read.
+
2005-07-13 [colin] 1.9.12cvs40
* configure.ac
( cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/statusbar.c; ) > 1.9.12cvs38.patchset
( cvs diff -u -r 1.100.2.21 -r 1.100.2.22 AUTHORS; cvs diff -u -r 1.43.2.19 -r 1.43.2.20 src/toolbar.c; cvs diff -u -r 1.19.2.3 -r 1.19.2.4 src/toolbar.h; ) > 1.9.12cvs39.patchset
( cvs diff -u -r 1.654.2.674 -r 1.654.2.675 configure.ac; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/passphrase.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/select-keys.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/sgpgme.h; ) > 1.9.12cvs40.patchset
+( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpmime/sgpgme.c; ) > 1.9.12cvs41.patchset
gpgme_data_t cipher = NULL, plain = NULL;
static gint id = 0;
FILE *dstfp;
- gint nread;
gchar *fname;
- gchar buf[BUFFSIZE];
gpgme_verify_result_t sigstat = NULL;
PrivacyDataPGP *data = NULL;
gpgme_ctx_t ctx;
+ gchar *chars;
+ int len;
if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
return NULL;
fprintf(dstfp, "MIME-Version: 1.0\n");
- while ((nread = gpgme_data_read(plain, buf, sizeof(buf))) > 0) {
- debug_print("read %d:%s\n", nread, buf);
- fwrite (buf, nread, 1, dstfp);
- }
- debug_print("nread %d!\n", nread);
+ chars = gpgme_data_release_and_get_mem(plain, &len);
+ if (len > 0)
+ fwrite(chars, len, 1, dstfp);
fclose(dstfp);
-
- gpgme_data_release(plain);
parseinfo = procmime_scan_file(fname);
g_free(fname);
return NULL;
}
- err = gpgme_data_rewind(plain); /* why doesn't gpgme_data_seek() work here?! */
-/* err = gpgme_data_seek(plain, 0, SEEK_SET);*/
+ err = gpgme_data_seek(plain, 0, SEEK_SET);
if (err) {
debug_print("can't seek (%d %d %s)\n", err, errno, strerror(errno));
}