# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 868258081 0
# Node ID 42cf8e9273eea2e42705459bd2ad9e10edabad09
# Parent  b6ced5dad84b30c6b791dd1fffb5d6b0d77d7c6a
(ospeed): Define as short, unless HAVE_TERMIOS_H and LINUX.

diff -r b6ced5dad84b -r 42cf8e9273ee src/sysdep.c
--- a/src/sysdep.c	Mon Jul 07 06:42:35 1997 +0000
+++ b/src/sysdep.c	Mon Jul 07 06:48:01 1997 +0000
@@ -230,7 +230,9 @@
   };
 #endif
 
-#ifdef HAVE_TERMIOS_H
+#if defined (HAVE_TERMIOS_H) || defined (LINUX)
+/* HJL's version of libc is said to need this on the Alpha.
+   On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short.  */
 extern speed_t ospeed;
 #else
 extern short ospeed;
@@ -2275,8 +2277,8 @@
 
       for (;;)
 	{
-	  char *fqdn = (char *) alloca (hostlen + 1 + domain_size);
-	  char *domain = fqdn + hostlen + 1;
+	  char *domain = (char *) alloca (domain_size + 1);
+	  char *fqdn = (char *) alloca (hostlen + 1 + domain_size + 1);
 #if HAVE_SYSINFO && defined (SI_SRPC_DOMAIN)
 	  int sys_domain_size = sysinfo (SI_SRPC_DOMAIN, domain, domain_size);
 	  if (sys_domain_size <= 0)
@@ -2304,7 +2306,13 @@
 	    }
 #endif /* HAVE_GETDOMAINNAME */
 	  strcpy (fqdn, hostname);
-	  fqdn[hostlen] = '.';
+	  if (domain[0] == '.')
+	    strcpy (fqdn + hostlen, domain);
+	  else
+	    {
+	      fqdn[hostlen] = '.';
+	      strcpy (fqdn + hostlen + 1, domain);
+	    }
 	  hostname = fqdn;
 	  break;
 	}
diff -r b6ced5dad84b -r 42cf8e9273ee src/terminfo.c
--- a/src/terminfo.c	Mon Jul 07 06:42:35 1997 +0000
+++ b/src/terminfo.c	Mon Jul 07 06:48:01 1997 +0000
@@ -26,8 +26,10 @@
 
 char *UP, *BC, PC;
 
-#ifdef HAVE_TERMIOS_H
+#if defined (HAVE_TERMIOS_H) || defined (LINUX)
 #include <termios.h>
+/* HJL's version of libc is said to need this on the Alpha.
+   On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short.  */
 speed_t ospeed;
 #else
 short ospeed;