Changeset 5145235

Timestamp:

Sep 15, 2002, 4:45:38 PM (23 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:

425c013

Parents:

61e79a9

Message:

Fix memory problem in setting default tty.
Removed some commented material from configure.in and owl.c

Files:

• ChangeLog (modified) (1 diff)
• configure.in (modified) (1 diff)
• owl.c (modified) (3 diffs)
• util.c (modified) (2 diffs)

ChangeLog

@@ -7 +7 @@
              lock up.
         Messages now have a direciton (in, out or none).  Filters can
-             this direction
+             match on this direction
         Outbound messages are no longer type 'admin' but are of the
              appropriate message type (i.e. 'zephyr') and are direction

configure.in

@@ -27 +27 @@
         AC_MSG_RESULT(no)
 fi
-
-dnl A hack for myself to use gnu curses
-dnl AC_MSG_CHECKING(for mit gnu hack)
-dnl if test -d /mit/gnu/include; then
-dnl     CFLAGS=${CFLAGS}\ -I/mit/gnu/include
-dnl     AC_MSG_RESULT(yes)
-dnl else
-dnl     AC_MSG_RESULT(no)
-dnl fi
-
-
-dnl Solaris ships with a broken curses.h
-dnl AC_MSG_CHECKING(for solaris broken curses.h)
-dnl if grep "Sun Microsystems" /usr/include/curses.h > /dev/null 2> /dev/null; then
-dnl   if test  "`grep -c getwc\(stdin\) /usr/include/widec.h`" = "2" ; then
-dnl     rm -rf includefix
-dnl     mkdir includefix
-dnl     sed -e 's/<widec.h>/\"widec.h\"/' /usr/include/curses.h > ./includefix/curses.h
-dnl  
-dnl     sed -e 's/<wchar.h>/\"wchar.h\"/' \
-dnl         -e 's/^#define.putwchar.*//' \
-dnl         -e 's/^#define.getwchar().*//' \
-dnl         -e 's/^#define.getwc(p).*//' \
-dnl         -e 's/^#define.putwc(x, p).*//' \
-dnl         /usr/include/widec.h > includefix/widec.h
-dnl     CFLAGS=-I./includefix\ ${CFLAGS}
-dnl     AC_MSG_RESULT(yes)
-dnl   fi
-dnl else
-dnl   AC_MSG_RESULT(no)
-dnl fi
-
-
 
 AC_CHECK_LIB(ncurses, initscr,,

owl.c

@@ -19 +19 @@
 #include <com_err.h>
 #include <signal.h>
+#include <time.h>
 #include <sys/param.h>
 #include "owl.h"
@@ -109 +110 @@
   noecho();
 
-#if 0 /* Removed to prevent flashing of popwin */
-  intrflush(stdscr,FALSE);
-  keypad(stdscr,TRUE);
-  nodelay(stdscr,1);
-  meta(stdscr,TRUE);
-#endif /*0*/
-
   /* define simple color pairs */
   if (has_colors() && COLOR_PAIRS>=8) {
@@ -133 +127 @@
   owl_global_set_startupargs(&g, argcsave, argvsave);
   owl_context_set_readconfig(owl_global_get_context(&g));
+
   if (tty) {
     owl_global_set_tty(&g, tty);

util.c

@@ -2 +2 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <malloc.h>
 #include <ctype.h>
@@ -496 +497 @@
 char *owl_util_get_default_tty() {
   /* call must free the return */
-  char *out;
+  char *out, *tmp;
 
   if (getenv("DISPLAY")) {
     out=owl_strdup(getenv("DISPLAY"));
-  } else if (ttyname(fileno(stdout))) {
-    out=strdup(ttyname(fileno(stdout)));
+  } else if ((tmp=ttyname(fileno(stdout)))!=NULL) {
+    out=owl_strdup(tmp);
     if (!strncmp(out, "/dev/", 5)) {
       owl_free(out);
-      out=strdup(ttyname(fileno(stdout)+5));
+      out=owl_strdup(tmp+5);
     }
   } else {
-    out=strdup("unknown");
+    out=owl_strdup("unknown");
   }
   return(out);