Changeset 1c6c4d3 for functions.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:

• functions.c (modified) (5 diffs)

functions.c

@@ -155 +155 @@
   /* display the message as an admin message in the receive window */
   if (owl_global_is_displayoutgoing(&g) && owl_zwrite_is_personal(&z)) {
-    tmpbuff=owl_malloc(strlen(owl_editwin_get_text(owl_global_get_typwin(&g)))+1024);
     owl_zwrite_get_recipstr(&z, buff);
-    sprintf(tmpbuff, "Message sent to %s", buff);
+    tmpbuff = owl_sprintf("Message sent to %s", buff);
     owl_function_adminmsg_outgoing(tmpbuff, owl_editwin_get_text(owl_global_get_typwin(&g)), line);
     owl_free(tmpbuff);
@@ -1162 +1161 @@
   }
 
-  buff=malloc(num*200);
+  buff=owl_malloc(num*200);
   strcpy(buff, "");
   for (i=0; i<num; i++) {
@@ -1173 +1172 @@
 
   owl_function_popless_text(buff);
-  free(buff);
+  owl_free(buff);
   ZFlushSubscriptions();
 }
@@ -1266 +1265 @@
   owl_view *v;
   owl_filter *f;
-  char buff[LINE];
 
   /* get the trash filter */
@@ -1287 +1285 @@
   }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-  sprintf(buff, "%i messages marked for deletion", count);
-  owl_function_makemsg(buff);
+  owl_function_makemsg("%i messages marked for deletion", count);
   owl_global_set_needrefresh(&g);
 }