Changeset 924ee11

Timestamp:

Mar 29, 2009, 11:35:26 AM (15 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

owl

Children:

73d8a88

Parents:

5345ea7

Message:

sprintf cleanup

File:

• functions.c (modified) (9 diffs)

functions.c

@@ -1825 +1825 @@
 void owl_function_status()
 {
-  char buff[5000];
+  char cwdbuff[MAXPATHLEN+1];
+  char *buff;
   time_t start;
   int up, days, hours, minutes;
@@ -1845 +1846 @@
 
   owl_fmtext_append_normal(&fm, "  Current Directory: ");
-  (void) getcwd(buff, MAXPATHLEN);
+  if(getcwd(cwdbuff, MAXPATHLEN) == NULL) {
+    owl_fmtext_append_normal(&fm, "<Error in getcwd>");
+  } else {
+    owl_fmtext_append_normal(&fm, cwdbuff);
+  }
+  owl_fmtext_append_normal(&fm, "\n");
+
+  buff=owl_sprintf("  Startup Time: %s", ctime(&start));
   owl_fmtext_append_normal(&fm, buff);
-  owl_fmtext_append_normal(&fm, "\n");
-
-  sprintf(buff, "  Startup Time: %s", ctime(&start));
-  owl_fmtext_append_normal(&fm, buff);
+  owl_free(buff);
 
   up=owl_global_get_runtime(&g);
@@ -1859 +1864 @@
   minutes=up/60;
   up-=minutes*60;
-  sprintf(buff, "  Run Time: %i days %2.2i:%2.2i:%2.2i\n", days, hours, minutes, up);
+
+  buff=owl_sprintf("  Run Time: %i days %2.2i:%2.2i:%2.2i\n", days, hours, minutes, up);
   owl_fmtext_append_normal(&fm, buff);
+  owl_free(buff);
 
   owl_fmtext_append_normal(&fm, "\nProtocol Options:\n");
@@ -1884 +1891 @@
   owl_fmtext_append_normal(&fm, "\nMemory Usage:\n");
   owl_fmtext_append_normal(&fm, "  Not currently available.\n");
-  /*
-  sprintf(buff, "%sMemory Malloced: %i\n", buff, owl_global_get_malloced(&g));
-  sprintf(buff, "%sMemory Freed: %i\n", buff, owl_global_get_freed(&g));
-  sprintf(buff, "%sMemory In Use: %i\n", buff, owl_global_get_meminuse(&g));
-  */
 
   owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
@@ -1913 +1915 @@
 {
   owl_fmtext fm;
-  char buff[LINE];
+  char *buff;
 
   owl_fmtext_init_null(&fm);
-  sprintf(buff, "Terminal Lines: %i\nTerminal Columns: %i\n",
-          owl_global_get_lines(&g),
-          owl_global_get_cols(&g));
+  buff=owl_sprintf("Terminal Lines: %i\nTerminal Columns: %i\n",
+                   owl_global_get_lines(&g),
+                   owl_global_get_cols(&g));
   owl_fmtext_append_normal(&fm, buff);
+  owl_free(buff);
 
   if (owl_global_get_hascolors(&g)) {
     owl_fmtext_append_normal(&fm, "Color: Yes\n");
-    sprintf(buff, "Number of color pairs: %i\n", owl_global_get_colorpairs(&g));
+    buff=owl_sprintf("Number of color pairs: %i\n", owl_global_get_colorpairs(&g));
     owl_fmtext_append_normal(&fm, buff);
-    sprintf(buff, "Can change colors: %s\n", can_change_color() ? "yes" : "no");
+    owl_free(buff);
+    buff=owl_sprintf("Can change colors: %s\n", can_change_color() ? "yes" : "no");
     owl_fmtext_append_normal(&fm, buff);
+    owl_free(buff);
   } else {
     owl_fmtext_append_normal(&fm, "Color: No\n");
@@ -1942 +1947 @@
 void owl_function_reply(int type, int enter)
 {
-  char *buff=NULL, *oldbuff;
+  char *buff=NULL, *tmpbuff;
   owl_message *m;
   owl_filter *f;
@@ -2026 +2031 @@
         buff=owl_strdup("zcrypt");
       } else {
-        buff = owl_strdup("zwrite");
+        buff=owl_strdup("zwrite");
       }
       if (strcasecmp(class, "message")) {
-        buff = owl_sprintf("%s -c %s%s%s", oldbuff=buff, owl_getquoting(class), class, owl_getquoting(class));
-        owl_free(oldbuff);
+        tmpbuff=owl_sprintf("%s -c %s%s%s", buff, owl_getquoting(class), class, owl_getquoting(class));
+        owl_free(buff);
+        buff=tmpbuff;
       }
       if (strcasecmp(inst, "personal")) {
-        buff = owl_sprintf("%s -i %s%s%s", oldbuff=buff, owl_getquoting(inst), inst, owl_getquoting(inst));
-        owl_free(oldbuff);
+        tmpbuff=owl_sprintf("%s -i %s%s%s", buff, owl_getquoting(inst), inst, owl_getquoting(inst));
+        owl_free(buff);
+        buff=tmpbuff;
       }
       if (*to != '\0') {
@@ -2042 +2049 @@
           tmp = owl_util_uniq(oldtmp=tmp, cc, "-");
           owl_free(oldtmp);
-          buff = owl_sprintf("%s -C %s", oldbuff=buff, tmp);
-          owl_free(oldbuff);
+          tmpbuff=owl_sprintf("%s -C %s", buff, tmp);
+          owl_free(buff);
+          buff=tmpbuff;
         } else {
           if (owl_global_is_smartstrip(&g)) {
@@ -2050 +2058 @@
             owl_free(tmp2);
           }
-          buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
-          owl_free(oldbuff);
+          tmpbuff=owl_sprintf("%s %s", buff, tmp);
+          owl_free(buff);
+          buff=tmpbuff;
         }
         owl_free(tmp);