Changeset 7bfc613


Ignore:
Timestamp:
Jul 12, 2010, 12:18:13 PM (11 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.7, release-1.8, release-1.9
Children:
1cc9b615
Parents:
96582d5
Message:
Fix some bugs with 'zcrypt -C'
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r96582d5 r7bfc613  
    411411  }
    412412
    413   owl_zwrite_set_message(z, cryptmsg);
     413  owl_zwrite_set_message_raw(z, cryptmsg);
    414414  owl_zwrite_set_opcode(z, "crypt");
    415    
     415
    416416  owl_zwrite_send_message(z);
    417417  owl_function_makemsg("Waiting for ack...");
     
    420420  if (owl_zwrite_is_personal(z)) {
    421421    /* Create the outgoing message. Restore the un-crypted message for display. */
    422     owl_zwrite_set_message(z, old_msg);
     422    owl_zwrite_set_message_raw(z, old_msg);
    423423    m=owl_function_make_outgoing_zephyr(z);
    424424    if (m) {
  • zwrite.c

    r987cf3f r7bfc613  
    199199}
    200200
     201/* Set the message with no post-processing*/
     202void owl_zwrite_set_message_raw(owl_zwrite *z, const char *msg)
     203{
     204  if (z->message) owl_free(z->message);
     205  z->message = owl_validate_utf8(msg);
     206}
     207
    201208void owl_zwrite_set_message(owl_zwrite *z, const char *msg)
    202209{
Note: See TracChangeset for help on using the changeset viewer.