Changeset 74037d9

Timestamp:

Dec 30, 2004, 10:04:55 PM (19 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:

1ef65fb

Parents:

8298425

Message:

In 'sub' command, create .zephyr.subs if it doesn't exist [BZ 15]
A fix for certain resize crashes (part from alexmv) [BZ 55]

Files:

• ChangeLog (modified) (1 diff)
• global.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• zephyr.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
-2.1.10-pre-1
+2.1.10-pre-2
         Fix a new problem finding libdes425
-        Don't crash on super-long hostnames
+        Don't crash on super-long hostnames [BZ 52]
+        In 'sub' command, create .zephyr.subs if it doesn't exist [BZ 15]
+        A fix for certain resize crashes (part from alexmv) [BZ 55]
         
 2.1.9

global.c

@@ -394 +394 @@
   }
 
-  /* resizeterm(size.ws_row, size.ws_col); */
+  resizeterm(size.ws_row, size.ws_col);
 
   /* re-initialize the windows */

owl.c

@@ -488 +488 @@
 #endif
       } else if (owl_global_messagequeue_pending(&g)) {
+        /* pick up the non-zephyr message in the message queue */
         m=owl_global_messageuque_popmsg(&g);
+      } else {
+        /* Not supposed to happen, but we seem to get here on resizes */
+        owl_function_debugmsg("Bottomed out looking for zephyr");
+      }
+
+      /* If we didn't pick up a message for some reason, don't go on */
+      if (m==NULL) {
+        owl_function_debugmsg("m is null in main loop");
+        continue;
       }
       

owl.h

@@ -59 +59 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.10-pre-1
-#define OWL_VERSION_STRING "2.1.10-pre-1"
+#define OWL_VERSION         2.1.10-pre-2
+#define OWL_VERSION_STRING "2.1.10-pre-2"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

zephyr.c

@@ -616 +616 @@
   }
 
-  /* first check if it exists already */
+  /* if the file already exists, check to see if the sub is already there */
   file=fopen(subsfile, "r");
-  if (!file) {
-    owl_function_error("Error opening file %s", subsfile);
-    owl_free(line);
-    return;
-  }
-  while (fgets(buff, LINE, file)!=NULL) {
-    if (!strcasecmp(buff, line)) {
-      owl_function_error("Subscription already present in %s", subsfile);
-      owl_free(line);
-      return;
+  if (file) {
+    while (fgets(buff, LINE, file)!=NULL) {
+      if (!strcasecmp(buff, line)) {
+        owl_function_error("Subscription already present in %s", subsfile);
+        owl_free(line);
+        return;
+      }
     }
   }