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

• util.c (modified) (4 diffs)

util.c

@@ -28 +28 @@
     strcpy(buff, " (-/-) ");
   } else {
-    sprintf(buff, " (%i/%i/%i) ", owl_global_get_curmsg(&g)+1,
+    snprintf(buff, 1024, " (%i/%i/%i) ", owl_global_get_curmsg(&g)+1,
             owl_view_get_size(v),
             owl_messagelist_get_size(ml));
@@ -62 +62 @@
     getyx(sepwin, y, x);
     wmove(sepwin, y, x+2);
-    sprintf(buff, " right: %i ", owl_global_get_rightshift(&g));
+    snprintf(buff, 1024, " right: %i ", owl_global_get_rightshift(&g));
     waddstr(sepwin, buff);
   }
@@ -316 +316 @@
 }
 
+/* allocates memory and returns the string or null.
+ * caller must free the string. 
+ * from Linux sprintf man page. 
+ */
+char *owl_sprintf(const char *fmt, ...) {
+  int n, size = 100;
+  char *p;
+  va_list ap;
+  if ((p = owl_malloc (size)) == NULL)
+    return NULL;
+  while (1) {
+    /* Try to print in the allocated space. */
+    va_start(ap, fmt);
+    n = vsnprintf (p, size, fmt, ap);
+    va_end(ap);
+    /* If that worked, return the string. */
+    if (n > -1 && n < size)
+      return p;
+    /* Else try again with more space. */
+    if (n > -1)    /* glibc 2.1 */
+      size = n+1; /* precisely what is needed */
+    else           /* glibc 2.0 */
+      size *= 2;  /* twice the old size */
+    if ((p = owl_realloc (p, size)) == NULL)
+      return NULL;
+  }
+}
+
 char *pretty_sender(char *in) {
   char *out, *ptr;
@@ -331 +359 @@
 
 char *long_sender(char *in) {
-  char *out, *ptr;
+  char *ptr;
 
   /* the caller must free the return */
-  out=owl_malloc(strlen(in)+100);
-  strcpy(out, in);
-  ptr=strchr(out, '@');
-  if (ptr) return(out);
-  sprintf(out, "%s@%s", out, ZGetRealm());
-  return(out);
+  if (NULL != (ptr=strchr(in, '@'))) {
+    return owl_strdup(in);
+  } else {
+    return owl_sprintf("%s@%s", in, ZGetRealm());
+  }
 }