Changeset ce7db4d for commands.c

Timestamp:

Jun 24, 2003, 11:12:09 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

658dc2f

Parents:

723c427

Message:

zwrite -m now logs and displays an outgoing message
zwrite -s now works

File:

• commands.c (modified) (4 diffs)

commands.c

@@ -1526 +1526 @@
 
 char *owl_command_zwrite(int argc, char **argv, char *buff) {
-  char *tmpbuff, *pos, *cmd, *msg;
+  owl_zwrite z;
 
   /* check for a zwrite -m */
-  for (pos = buff; *pos; pos = skiptokens(pos, 1)) {
-    if (!strncmp(pos, "-m ", 3)) {
-      cmd = owl_strdup(buff);
-      msg = cmd+(pos-buff);
-      *msg = '\0';
-      msg += 3;
-      owl_zwrite_create_and_send_from_line(cmd, msg);
-      owl_free(cmd);
-      return NULL;
-    }
+  owl_zwrite_create_from_line(&z, buff);
+  if (owl_zwrite_is_message_set(&z)) {
+    owl_function_zwrite(buff, NULL);
+    owl_zwrite_free(&z);
+    return (NULL);
   }
 
@@ -1544 +1539 @@
     owl_function_makemsg("Not enough arguments to the zwrite command.");
   } else {
-    tmpbuff = owl_strdup(buff);
-    owl_function_zwrite_setup(tmpbuff);
-    owl_global_set_buffercommand(&g, tmpbuff);
-    owl_free(tmpbuff);
-  }
-  return NULL;
+    owl_function_zwrite_setup(buff);
+    owl_global_set_buffercommand(&g, buff);
+  }
+  return(NULL);
 }
 
 char *owl_command_aimwrite(int argc, char **argv, char *buff) {
-  char *tmpbuff;
-
   if (!owl_global_is_aimloggedin(&g)) {
     owl_function_makemsg("You are not logged in to AIM.");
@@ -1565 +1556 @@
   }
 
-  tmpbuff=owl_strdup(buff);
-  owl_function_aimwrite_setup(tmpbuff);
-  owl_global_set_buffercommand(&g, tmpbuff);
-  owl_free(tmpbuff);
+  owl_function_aimwrite_setup(buff);
+  owl_global_set_buffercommand(&g, buff);
   return(NULL);
 }
 
 char *owl_command_zcrypt(int argc, char **argv, char *buff) {
-  char *tmpbuff, *pos, *cmd, *msg;
-  
+  owl_zwrite z;
+
   /* check for a zwrite -m */
-  for (pos = buff; *pos; pos = skiptokens(pos, 1)) {
-    if (!strncmp(pos, "-m ", 3)) {
-      cmd = owl_strdup(buff);
-      msg = cmd+(pos-buff);
-      *msg = '\0';
-      msg += 3;
-      owl_zwrite_create_and_send_from_line(cmd, msg);
-      owl_free(cmd);
-      return NULL;
-    }
+  owl_zwrite_create_from_line(&z, buff);
+  if (owl_zwrite_is_message_set(&z)) {
+    owl_zwrite_send_message(&z);
+    owl_function_make_outgoing_zephyr(owl_zwrite_get_message(&z), buff, owl_zwrite_get_zsig(&z));
+    owl_zwrite_free(&z);
+    return (NULL);
   }
 
@@ -1591 +1576 @@
     owl_function_makemsg("Not enough arguments to the zcrypt command.");
   } else {
-    tmpbuff = owl_strdup(buff);
-    owl_function_zwrite_setup(tmpbuff);
-    owl_global_set_buffercommand(&g, tmpbuff);
-    owl_free(tmpbuff);
+    owl_function_zwrite_setup(buff);
+    owl_global_set_buffercommand(&g, buff);
   }
   return(NULL);