Changeset a8938c7

Timestamp:

Jun 25, 2003, 2:04:05 AM (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:

591e6aa7

Parents:

3733dc2

Message:

Fixed some easy fixed length buffer problems

Files:

• ChangeLog (modified) (1 diff)
• global.c (modified) (9 diffs)
• owl.h (modified) (3 diffs)

ChangeLog

@@ -22 +22 @@
         Don't allow sending to AIM users with spaces
         Removed libfaim/config.log from CVS
+        Fixed some easy fixed-length buffers
 
 2.0.4-pre-1

global.c

@@ -25 +25 @@
   hent=gethostbyname(hostname);
   if (!hent) {
-    strcpy(g->thishost, "localhost");
+    g->thishost=owl_strdup("localhost");
   } else {
-    strcpy(g->thishost, hent->h_name);
+    g->thishost=owl_strdup(hent->h_name);
   }
 
@@ -35 +35 @@
   g->topmsg=0;
   g->needrefresh=1;
+  g->startupargs=NULL;
 
   owl_variable_dict_setup(&(g->vars));
@@ -66 +67 @@
   g->searchstring=NULL;
   g->starttime=time(NULL); /* assumes we call init only a start time */
-  strcpy(g->buffercommand, "");
+  g->buffercommand=NULL;
   g->newmsgproc_pid=0;
   
@@ -84 +85 @@
   /* Fill in some variables which don't have constant defaults */
   /* TODO: come back later and check passwd file first */
-  strcpy(g->homedir, getenv("HOME"));
+  g->homedir=owl_strdup(getenv("HOME"));
 
   owl_messagelist_create(&(g->msglist));
@@ -228 +229 @@
 
 void owl_global_set_buffercommand(owl_global *g, char *command) {
-  strcpy(g->buffercommand, command);
+  if (g->buffercommand) owl_free(g->buffercommand);
+  g->buffercommand=owl_strdup(command);
 }
 
 char *owl_global_get_buffercommand(owl_global *g) {
-  return(g->buffercommand);
+  if (g->buffercommand) return(g->buffercommand);
+  return("");
 }
 
@@ -294 +297 @@
 
 char *owl_global_get_homedir(owl_global *g) {
-  return(g->homedir);
+  if (g->homedir) return(g->homedir);
+  return("/");
 }
 
@@ -428 +432 @@
 
 char *owl_global_get_hostname(owl_global *g) {
-  return(g->thishost);
+  if (g->thishost) return(g->thishost);
+  return("");
 }
 
@@ -470 +475 @@
 
 void owl_global_set_startupargs(owl_global *g, int argc, char **argv) {
-  int i;
+  int i, len;
+
+  if (g->startupargs) owl_free(g->startupargs);
+  
+  len=0;
+  for (i=0; i<argc; i++) {
+    len+=strlen(argv[i]+5);
+  }
+  g->startupargs=malloc(len+5);
 
   strcpy(g->startupargs, "");
@@ -480 +493 @@
 
 char *owl_global_get_startupargs(owl_global *g) {
-  return(g->startupargs);
+  if (g->startupargs) return(g->startupargs);
+  return("");
 }
 

owl.h

@@ -405 +405 @@
   int recwinlines;
   int typwinactive;
-  char thishost[LINE];
-  char homedir[LINE];
+  char *thishost;
+  char *homedir;
   int direction;
   int zaway;
@@ -412 +412 @@
   int haveconfig;
   int config_format;
-  char buffercommand[1024];
+  char *buffercommand;
   owl_editwin tw;
   owl_viewwin vw;
@@ -418 +418 @@
   int debug;
   int starttime;
-  char startupargs[LINE];
+  char *startupargs;
   int userclue;
   int nextmsgid;