Changeset 74037d9


Ignore:
Timestamp:
Dec 30, 2004, 10:04:55 PM (16 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, 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:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r8298425 r74037d9  
    11$Id$
    22
    3 2.1.10-pre-1
     32.1.10-pre-2
    44        Fix a new problem finding libdes425
    5         Don't crash on super-long hostnames
     5        Don't crash on super-long hostnames [BZ 52]
     6        In 'sub' command, create .zephyr.subs if it doesn't exist [BZ 15]
     7        A fix for certain resize crashes (part from alexmv) [BZ 55]
    68       
    792.1.9
  • global.c

    rafbf668 r74037d9  
    394394  }
    395395
    396   /* resizeterm(size.ws_row, size.ws_col); */
     396  resizeterm(size.ws_row, size.ws_col);
    397397
    398398  /* re-initialize the windows */
  • owl.c

    r7fad773 r74037d9  
    488488#endif
    489489      } else if (owl_global_messagequeue_pending(&g)) {
     490        /* pick up the non-zephyr message in the message queue */
    490491        m=owl_global_messageuque_popmsg(&g);
     492      } else {
     493        /* Not supposed to happen, but we seem to get here on resizes */
     494        owl_function_debugmsg("Bottomed out looking for zephyr");
     495      }
     496
     497      /* If we didn't pick up a message for some reason, don't go on */
     498      if (m==NULL) {
     499        owl_function_debugmsg("m is null in main loop");
     500        continue;
    491501      }
    492502     
  • owl.h

    r8298425 r74037d9  
    5959static const char owl_h_fileIdent[] = "$Id$";
    6060
    61 #define OWL_VERSION         2.1.10-pre-1
    62 #define OWL_VERSION_STRING "2.1.10-pre-1"
     61#define OWL_VERSION         2.1.10-pre-2
     62#define OWL_VERSION_STRING "2.1.10-pre-2"
    6363
    6464/* Feature that is being tested to redirect stderr through a pipe.
  • zephyr.c

    rfe67f1f r74037d9  
    616616  }
    617617
    618   /* first check if it exists already */
     618  /* if the file already exists, check to see if the sub is already there */
    619619  file=fopen(subsfile, "r");
    620   if (!file) {
    621     owl_function_error("Error opening file %s", subsfile);
    622     owl_free(line);
    623     return;
    624   }
    625   while (fgets(buff, LINE, file)!=NULL) {
    626     if (!strcasecmp(buff, line)) {
    627       owl_function_error("Subscription already present in %s", subsfile);
    628       owl_free(line);
    629       return;
     620  if (file) {
     621    while (fgets(buff, LINE, file)!=NULL) {
     622      if (!strcasecmp(buff, line)) {
     623        owl_function_error("Subscription already present in %s", subsfile);
     624        owl_free(line);
     625        return;
     626      }
    630627    }
    631628  }
Note: See TracChangeset for help on using the changeset viewer.