Changeset 5145235 for util.c

Timestamp:

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

File:

• util.c (modified) (2 diffs)

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);