Changeset 719119de

Timestamp:

Jan 3, 2011, 8:20:52 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

c23f678

Parents:

d222c44

git-author:

David Benjamin <davidben@mit.edu> (12/15/10 00:46:46)

git-committer:

David Benjamin <davidben@mit.edu> (01/03/11 20:20:52)

Message:

Build reply commands from scratch on outgoing zwrites

We currently reuse the original zwrite line which is problematic when
the user passed -m. Instead regenerates the zwrite line from the
parsed owl_zwrite.

Repurpose the zwriteline attribute because anyone using the old
attribute probably has the same bug.

Files:

• message.c (modified) (2 diffs)
• zwrite.c (modified) (1 diff)

message.c

@@ -964 +964 @@
   int ret;
   char hostbuff[5000];
+  char *replyline;
   
   owl_message_init(m);
@@ -981 +982 @@
   owl_message_set_opcode(m, owl_zwrite_get_opcode(z));
   owl_message_set_realm(m, owl_zwrite_get_realm(z)); /* also a hack, but not here */
-  if(z->zwriteline) {
-    owl_message_set_zwriteline(m, z->zwriteline);
-  }
+
+  /* Although not strictly the zwriteline, anyone using the unsantized version
+   * of it probably has a bug. */
+  replyline = owl_zwrite_get_replyline(z);
+  owl_message_set_zwriteline(m, replyline);
+  owl_free(replyline);
+
   owl_message_set_body(m, body);
   owl_message_set_zsig(m, owl_zwrite_get_zsig(z));

zwrite.c

@@ -390 +390 @@
   if (z->zsig) owl_free(z->zsig);
 }
+
+/*
+ * Returns a zwrite line suitable for replying, specifically the
+ * message field is stripped out. Result should be freed with
+ * owl_free.
+ */
+char *owl_zwrite_get_replyline(const owl_zwrite *z)
+{
+  /* Match ordering in zwrite help. */
+  GString *buf = g_string_new("");
+  int i;
+
+  /* Disturbingly, it is apparently possible to z->cmd to be null if
+   * owl_zwrite_create_from_line got something starting with -. And we
+   * can't kill it because this is exported to perl. */
+  owl_string_append_quoted_arg(buf, z->cmd ? z->cmd : "zwrite");
+  if (z->noping) {
+    g_string_append(buf, " -n");
+  }
+  if (z->cc) {
+    g_string_append(buf, " -C");
+  }
+  if (strcmp(z->class, "message")) {
+    g_string_append(buf, " -c ");
+    owl_string_append_quoted_arg(buf, z->class);
+  }
+  if (strcmp(z->inst, "personal")) {
+    g_string_append(buf, " -i ");
+    owl_string_append_quoted_arg(buf, z->inst);
+  }
+  if (z->realm && z->realm[0] != '\0') {
+    g_string_append(buf, " -r ");
+    owl_string_append_quoted_arg(buf, z->realm);
+  }
+  if (z->opcode && z->opcode[0] != '\0') {
+    g_string_append(buf, " -O ");
+    owl_string_append_quoted_arg(buf, z->opcode);
+  }
+  for (i = 0; i < owl_list_get_size(&(z->recips)); i++) {
+    g_string_append_c(buf, ' ');
+    owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), i));
+  }
+
+  return g_string_free(buf, false);
+}