Changeset 1c6c4d3 for zephyr.c

Timestamp:

Jun 30, 2002, 4:58:09 PM (22 years ago)

Author:

Erik Nygren <nygren@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:

507d5aa

Parents:

262422c

Message:

	Added owl_sprintf which returns the formatted string, or NULL.
	        The caller must free this string.
		This will allocate enough memory and thus
		avoid potential some buffer overrun situations.
	Started fixing some potential buffer overrun situations.
	Simple implementation of 'zwrite -m' (doesn't yet log an outgoing
	        message as having been sent.)
	The "Not logged in or subscribing to messages" error
	        now includes the name of the recipient.

File:

• zephyr.c (modified) (4 diffs)

zephyr.c

@@ -111 +111 @@
         subs[count].zsub_classinst=owl_strdup(buffer);
       } else {
-        subs[count].zsub_classinst=owl_malloc(1024);
-        sprintf(subs[count].zsub_classinst, "%s@%s", buffer, ZGetRealm());
+        subs[count].zsub_classinst=owl_sprintf("%s@%s", buffer, ZGetRealm());
       }
 
@@ -346 +345 @@
 
 void owl_zephyr_handle_ack(ZNotice_t *retnotice) {
-  char buff[LINE];
   char *tmp;
   
@@ -362 +360 @@
                !strcasecmp(retnotice->z_class_inst, "personal")) {
       tmp=pretty_sender(retnotice->z_recipient);
-      sprintf(buff, "Message sent to %s.", tmp);
+      owl_function_makemsg("Message sent to %s.", tmp);
       free(tmp);
     } else {
-      sprintf(buff, "Message sent to -c %s -i %s\n", retnotice->z_class, retnotice->z_class_inst);
-    }
-    owl_function_makemsg(buff);
+      owl_function_makemsg("Message sent to -c %s -i %s\n", retnotice->z_class, retnotice->z_class_inst);
+    }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
     if (strcasecmp(retnotice->z_class, "message")) {
-      sprintf(buff, "Not logged in or not subscribing to class %s, instance %s",
+      owl_function_makemsg("Not logged in or not subscribing to class %s, instance %s",
               retnotice->z_class, retnotice->z_class_inst);
-      owl_function_makemsg(buff);
     } else {
-      owl_function_makemsg("Not logged in or subscribing to messages.");
-    }
-  } else {
-    char buff[1024];
-    sprintf(buff, "Internal error on ack (%s)", retnotice->z_message);
-    owl_function_makemsg(buff);
+      tmp = pretty_sender(retnotice->z_recipient);
+      owl_function_makemsg("%s: Not logged in or subscribing to messages.", 
+                           tmp);
+      owl_free(tmp);
+    }
+  } else {
+    owl_function_makemsg("Internal error on ack (%s)", retnotice->z_message);
   }
 }
@@ -412 +409 @@
 
   /* display the message as an admin message in the receive window */
-  tmpbuff=owl_malloc(strlen(owl_global_get_zaway_msg(&g))+LINE);
-  sprintf(tmpbuff, "Message sent to %s", owl_message_get_sender(m));
+  tmpbuff = owl_sprintf("Message sent to %s", owl_message_get_sender(m));
   owl_function_adminmsg(tmpbuff, owl_global_get_zaway_msg(&g));
   owl_free(tmpbuff);