Changeset 97cdbaf5 for message.c

Timestamp:

Mar 11, 2012, 10:57:35 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

a03a409

Parents:

1f39ded

git-author:

David Benjamin <davidben@mit.edu> (01/23/12 00:38:29)

git-committer:

David Benjamin <davidben@mit.edu> (03/11/12 22:57:35)

Message:

Rewrite call_filter to use g_spawn_async_with_pipes

This simplifies the error-handling code. Also fixes a bug where file
descriptors get double-closed in call_filter. Also adds a unit test. The
separate prog argument is removed to avoid having to deal with
G_SPAWN_FILE_AND_ARGV_ZERO, and since we don't really use it anyway.

File:

• message.c (modified) (2 diffs)

message.c

@@ -875 +875 @@
   if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
     const char *argv[] = {
-      "zcrypt",
+      NULL,
       "-D",
       "-c", owl_message_get_class(m),
@@ -887 +887 @@
 
     zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
-
-    rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
+    argv[0] = zcrypt;
+
+    rv = call_filter(argv, owl_message_get_body(m), &out, &status);
     g_free(zcrypt);