Changeset 8232149

Timestamp:

Dec 31, 2004, 2:29:21 PM (18 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:

667a1b6

Parents:

1ef65fb

Message:

Turn off istrip.
Restore initial terminal settings at problem exit.
Version set to 2.1.10 in prep. for release.

Files:

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

ChangeLog

@@ -1 +1 @@
 $Id$
 
-2.1.10-pre-2
+2.1.10
         Fix a new problem finding libdes425
-        Don't crash on super-long hostnames [BZ 52]
+        Don't crash on very 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]
+        A fix for certain resize crashes (partly from alexmv) [BZ 55]
+        Turn off ISTRIP (gildea)
         
 2.1.9

functions.c

@@ -971 +971 @@
   }
 
-  /* final clean up */
+  /* done with curses */
   endwin();
+
+  /* restore terminal settings */
+  tcsetattr(0, TCSAFLUSH, owl_global_get_startup_tio(&g));
+
   owl_function_debugmsg("Quitting Owl");
   exit(0);

global.c

@@ -886 +886 @@
   return(&(g->zbuddies));
 }
+
+struct termios *owl_global_get_startup_tio(owl_global *g)
+{
+  return(&(g->startup_tio));
+}

owl.c

@@ -46 +46 @@
 #include <sys/param.h>
 #include <sys/types.h>
+#include <termios.h>
 #include <sys/stat.h>
 #include "owl.h"
@@ -77 +78 @@
   struct tm *today;
   char *dir;
+  struct termios tio;
 #ifdef HAVE_LIBZEPHYR
   ZNotice_t notice;
@@ -154 +156 @@
   sigaction(SIGTERM, &sigact, NULL);
   sigaction(SIGHUP, &sigact, NULL);
+
+  /* save initial terminal settings */
+  tcgetattr(0, owl_global_get_startup_tio(&g));
+
+  /* turn ISTRIP off */
+  tcgetattr(0, &tio);
+  tio.c_iflag &= ~ISTRIP;
+  tcsetattr(0, TCSAFLUSH, &tio);
 
   /* screen init */

owl.h

@@ -48 +48 @@
 #include <time.h>
 #include <signal.h>
+#include <termios.h>
 #include <libfaim/aim.h>
 #include "config.h"
@@ -59 +60 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.10-pre-2
-#define OWL_VERSION_STRING "2.1.10-pre-2"
+#define OWL_VERSION         2.1.10
+#define OWL_VERSION_STRING "2.1.10"
 
 /* Feature that is being tested to redirect stderr through a pipe. 
@@ -561 +562 @@
   owl_zbuddylist zbuddies;
   owl_timer zephyr_buddycheck_timer;
+  struct termios startup_tio;
 } owl_global;