(ospeed): Define as short, unless HAVE_TERMIOS_H and LINUX.

diff --git a/src/sysdep.c b/src/sysdep.c
index 8bde434f52db3e066691203dff6861cbd351670e..63ffd28b5bac3efde042f45e8e2bb875d354cea7 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -230,7 +230,9 @@ static int baud_convert[] =
   };
 #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 @@ init_system_name ()
 
       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 @@ init_system_name ()
            }
 #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 --git a/src/terminfo.c b/src/terminfo.c
index ab6ab9e4ccb46a25b4218dcbf934245e608414d3..ae015b9b6ad1a3847289e0d16e6adfacc8a2d912 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -26,8 +26,10 @@ Boston, MA 02111-1307, USA.  */
 
 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;