remove ultrix support

cde/lib/DtHelp/Helpos.c

@@ -253,38 +253,10 @@ void DtHelpSetCatalogName(
   if (catFile == NULL)
     {
       /* Setup the short and long versions */
-#ifdef __ultrix
-      CatFileName = strdup("DtHelp.cat");  
-#else
       CatFileName = strdup("DtHelp");
-#endif
     }
   else
-    { 
-#ifdef __ultrix
-
-      /* If we have a full path, just use it */
-      if (*catFile == '/')
-        CatFileName = strdup(catFile);
-      else
-        {
-          /* We don't have a full path, and the ultirx os needs the 
-           * ".cat" extention so let's make sure its there.
-           */
-          if (strcmp(&catFile[strlen(catFile) -4], ".cat") == 0)
-            CatFileName = strdup(catFile);
-          else
-            {
-              /* Create our CatFileName with the extention */
-              CatFileName = malloc (strlen(catFile) + 5);    
-                                    /* +5, 1 for NULL, 4 for ".cat" */
-              strcpy(CatFileName, catFile);
-              strcat(CatFileName, ".cat");
-	    }
-         }
-
-        
-#else
+    {
 
       /* If we have a full path, just use it */
       if (*catFile == '/')
@@ -294,7 +266,7 @@ void DtHelpSetCatalogName(
           /* hp-ux os does not work with the ".cat" extention, so
            * if one exists, remove it.
            */
-          
+
            if (strcmp(&catFile[strlen(catFile) -4], ".cat") != 0)
             CatFileName = strdup(catFile);
           else
@@ -306,7 +278,6 @@ void DtHelpSetCatalogName(
               CatFileName[len]= '\0';
             }
         }
-#endif
     }
   _DtHelpProcessUnlock();
 }
@@ -340,22 +311,18 @@ char *_DtHelpGetMessage(
    static nl_catd nlmsg_fd;
 
    _DtHelpProcessLock();
-   if ( first ) 
+   if ( first )
    {
 
      /* Setup our default message catalog names if none have been set! */
      if (CatFileName  == NULL)
        {
          /* Setup the short and long versions */
-#ifdef __ultrix
-         CatFileName = strdup("DtHelp.cat"); 
-#else 
          CatFileName = strdup("DtHelp");
-#endif
        }
-		
+
      loc = _DtHelpGetLocale();
-     if (!loc || !(strcmp (loc, "C"))) 
+     if (!loc || !(strcmp (loc, "C")))
 	/*
 	 * If LANG is not set or if LANG=C, then there
 	 * is no need to open the message catalog - just

cde/lib/DtSvc/DtUtil2/DtosP.h

@@ -112,9 +112,9 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h	4.16 91/09/12";
 
 #ifdef BOGUS_MB_MAX  /* some systems don't properly set MB_[CUR|LEN]_MAX */
 # undef  MB_LEN_MAX
-# define MB_LEN_MAX 1 /* temp fix for ultrix */
+# define MB_LEN_MAX 1 /* temp fix */
 # undef  MB_CUR_MAX
-# define MB_CUR_MAX 1 /* temp fix for ultrix */
+# define MB_CUR_MAX 1 /* temp fix */
 #endif /* BOGUS_MB_MAX */
 
 /**********************************************************************/

cde/lib/DtTerm/TermPrim/TermPrimMessageCatI.h

@@ -46,7 +46,7 @@
 #define NL_SETN_Function 3
 #define NL_SETN_Prim 4
 #define NL_SETN_PrimRend 5
-#define NL_SETN_View 6 
+#define NL_SETN_View 6
 #define NL_SETN_ViewGlobalDialog 7
 #define NL_SETN_ViewMenu 8
 #define NL_SETN_ViewTerminalDialog 9
@@ -54,11 +54,7 @@
 #ifndef NO_MESSAGE_CATALOG
 extern char *_DtTermPrimGetMessage( char *filename, int set, int n, char *s );
 
-# ifdef __ultrix
-#  define _CLIENT_CAT_NAME "dtterm.cat"
-# else  /* __ultrix */
 # define _CLIENT_CAT_NAME "dtterm"
-# endif /* __ultrix */
 # define GETMESSAGE(set, number, string)\
         _DtTermPrimGetMessage(_CLIENT_CAT_NAME, set, number, string)
 #else

cde/lib/tt/bin/dbck/prop.C

@@ -35,10 +35,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>     
+#include <sys/stat.h>
 #include "prop.h"
 #include "ttdbck.h"
 

cde/lib/tt/bin/dbck/spec.C

@@ -37,10 +37,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>     
+#include <sys/stat.h>
 #include "spec.h"
 #include "options_tt.h"
 #include "util/tt_gettext.h"

cde/lib/tt/bin/dbck/spec_repair.C

@@ -35,13 +35,10 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
 #if defined(_AIX)
 #include <time.h>
 #endif
-#include <sys/stat.h>     
+#include <sys/stat.h>
 #include "spec.h"
 #include "options_tt.h"
 #include "ttdbck.h"

cde/lib/tt/bin/shell/mover.C

@@ -44,10 +44,6 @@
 #endif
 #include <stdlib.h>
 #include <errno.h>
-#if defined(ultrix)
-#include <sys/inode.h>
-#define S_ISLNK(m)     (((m)&IFMT) == IFLNK)
-#endif
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include "api/c/tt_c.h"

cde/lib/tt/bin/shell/remover.C

@@ -44,10 +44,6 @@
 #endif
 #include <stdlib.h>
 #include <errno.h>
-#if defined(ultrix)
-#include <sys/inode.h>
-#define S_ISLNK(m)     (((m)&IFMT) == IFLNK)
-#endif
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include "api/c/tt_c.h"

cde/lib/tt/bin/tt_type_comp/mp_type_comp.C

@@ -60,10 +60,6 @@
 #define _TT_DBCLIENT_SIDE
 #include "db/db_server.h"
 
-#if defined(ultrix)
-extern "C" void xdrstdio_create(XDR *, FILE *, enum xdr_op);
-#endif
-
 typedef void (*cmd_fn)();
 
 TT_INSERT_COPYRIGHT

cde/lib/tt/bin/ttdbserverd/dm_server.C

@@ -77,25 +77,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <isam.h>
-
-#if defined(ultrix)
-#	include <sys/time.h>
-#	include <sys/mount.h>
-#	include <sys/fs_types.h>
-#	define KERNEL
-#	include </usr/sys/h/fs_types.h>
-#	undef KERNEL
-#	define MNTTAB "/etc/fstab"
-	const char *TYPE_NFS = "nfs";
-	const char *TYPE_LOCAL = "ufs";
-	extern "C"
-	{
-		int getmnt(int *,struct fs_data*, int, int, char*);
-		time_t time();
-	}
-#else
-#	include <time.h>
-#endif
+#include <time.h>
 
 extern "C" { int isaddindex(int, struct keydesc*); }
 extern "C" { int isbuild(const char*, int, struct keydesc*, int); }

cde/lib/tt/bin/tttar/tttar_file_utils.C

@@ -38,10 +38,6 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined(ultrix)
-#include <sys/inode.h>
-#define S_ISLNK(m)     (((m)&IFMT) == IFLNK)
-#endif
 #include <dirent.h>
 #include "tttar_utils.h"
 #include "tttar_file_utils.h"

cde/lib/tt/lib/api/c/api_xdr.h

@@ -41,11 +41,6 @@
 #include <rpc/xdr.h>
 #include <util/tt_rpc_xdr.h>
 
-#if defined(ultrix)
-#include <rpc/xdr.h>
-#define bool_t int
-#endif
-
 bool_t	_tt_xdr_cstring_list(XDR *xdrs, char ***ar);
 
 #endif /* _API_XDR_H */

cde/lib/tt/lib/mp/mp_desktop.h

@@ -38,17 +38,6 @@
 #include <mp/mp_global.h>
 #include <util/tt_object.h>
 
-#if defined(ultrix)
-extern "C"
-{ extern struct XSizeHints;
-  extern struct XStandardColormap;
-  extern struct XTextProperty;
-  extern struct XWMHints;
-  extern struct XClassHint;
-};
-#endif
-
-
 enum _Tt_dt_type {
 	_TT_DESKTOP_X11,
 	_TT_DESKTOP_LAST

cde/lib/tt/lib/mp/mp_rpc.h

@@ -45,7 +45,7 @@
 # undef __SVR4_I386_ABI_L1__
 #endif
 
-#if defined(ultrix) || defined(_AIX)
+#if defined(_AIX)
 extern "C" {
   void svcerr_auth (SVCXPRT *, enum auth_stat);
   SVCXPRT *svcfd_create(int,int,int);

cde/lib/tt/lib/mp/mp_rpc_client.C

@@ -31,7 +31,7 @@
  *
  * Copyright (c) 1990 by Sun Microsystems, Inc.
  */
-#include <sys/time.h>		// ultrix
+#include <sys/time.h>
 #include <stdio.h>
 #include <signal.h>
 #include <errno.h>
@@ -50,16 +50,6 @@
 #include "util/tt_host.h"
 #include "util/tt_port.h"
 
-#if defined(ultrix)
-extern "C"
-{ extern struct XSizeHints;
-  extern struct XStandardColormap;
-  extern struct XTextProperty;
-  extern struct XWMHints;
-  extern struct XClassHint;
-};
-#endif
-
 #if defined(_AIX)
 /* AIX's FD_ZERO macro uses bzero() without declaring it. */
 #include <strings.h>

cde/lib/tt/lib/mp/mp_session.C

@@ -149,7 +149,7 @@ c_open_unix_socket(char *socket_name)
 	memset(&server_addr, 0, sizeof(server_addr));
 	server_addr.sun_family = AF_UNIX;
 	strcpy(server_addr.sun_path, socket_name);
-#if defined(ultrix) || defined(_AIX) || defined(hpux)
+#if defined(_AIX) || defined(hpux)
         int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
 ily);
         if (connect(sock, (sockaddr *)&server_addr, servlen) < 0) {

cde/lib/tt/lib/mp/mp_stream_socket.C

@@ -57,10 +57,6 @@
 
 #include <sys/time.h>
 
-#if defined(ultrix)
-extern "C" unsigned long inet_addr(char *);
-#endif
-
 #include <arpa/inet.h>
 
 /* 

cde/lib/tt/lib/realpath.ultrix.c

@@ -1,144 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/*%%  (c) Copyright 1993, 1994 Hewlett-Packard Company			 */
-/*%%  (c) Copyright 1993, 1994 International Business Machines Corp.	 */
-/*%%  (c) Copyright 1993, 1994 Sun Microsystems, Inc.			 */
-/*%%  (c) Copyright 1993, 1994 Novell, Inc. 				 */
-/*%%  $XConsortium: realpath.ultrix.c /main/3 1995/10/23 09:50:04 rswiston $ 			 				 */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <strings.h>
-
-char *
-realpath(pathname, finalpath)
-char *pathname;
-char *finalpath;
-{
-  struct stat sbuf;
-  char curpath[MAXPATHLEN],
-  workpath[MAXPATHLEN],
-  linkpath[MAXPATHLEN],
-  namebuf[MAXPATHLEN],
-  *where,
-  *ptr,
-  *last;
-  int len;
-
-   strcpy(curpath, pathname);
-
-   if (*pathname != '/') {
-#if defined(__STDC__) && defined(hp)
-      if (!getcwd(workpath)) {
-#else
-      if (!getwd(workpath)) {
-#endif
-         strcpy(finalpath, ".");
-         return(NULL);
-       }
-    } else *workpath = NULL;
-
-   /* curpath is the path we're still resolving      */
-   /* linkpath is the path a symbolic link points to */
-   /* workpath is the path we've resolved            */
-
- loop:
-   where = curpath;
-   while (*where != NULL) {
-      if (!strcmp(where, ".")) {
-         where++;
-         continue;
-       }
-
-      /* deal with "./" */
-      if (!strncmp(where, "./", 2)) {
-         where += 2;
-         continue;
-       }
-
-      /* deal with "../" */
-      if (!strncmp(where, "../", 3)) {
-         where += 3;
-         ptr = last = workpath;
-         while (*ptr) {
-            if (*ptr == '/') last = ptr;
-            ptr++;
-	  }
-         *last = NULL;
-         continue;
-       }
-
-      ptr = strchr(where, '/');
-      if (!ptr)
-         ptr = where + strlen(where) - 1;
-      else
-         *ptr = NULL;
-
-      strcpy(namebuf, workpath);
-      for (last = namebuf; *last; last++) continue;
-      /* tack on a trailing, or leading, `/` */
-      if (last == namebuf || *--last != '/') {
-        strcat(namebuf, "/");
-      }
-      strcat(namebuf, where);
-
-      where = ++ptr;
-      if (lstat(namebuf, &sbuf) == -1) {
-         strcpy(finalpath, namebuf);
-         return(NULL);
-       }
-
-      if ((sbuf.st_mode & S_IFLNK) == S_IFLNK) {
-         len = readlink(namebuf, linkpath, MAXPATHLEN);
-         if (len == 0) {
-            strcpy(finalpath, namebuf);
-            return(NULL);
-	  }
-         *(linkpath + len) = NULL; /* readlink doesn't null-terminate result */
-         if (*linkpath == '/') *workpath = NULL;
-         if (*where) {
-            strcat(linkpath, "/");
-            strcat(linkpath, where);
-	  }
-         strcpy(curpath, linkpath);
-         goto loop;
-       }
-
-      if ((sbuf.st_mode & S_IFDIR) == S_IFDIR) {
-         strcpy(workpath, namebuf);
-         continue;
-       }
-
-      if (*where) {
-         strcpy(finalpath, namebuf);
-         return(NULL);  /* path/notadir/morepath */
-       } else
-         strcpy(workpath, namebuf);
-    }
-   strcpy(finalpath, workpath);
-   return(finalpath);
-
-}
-

cde/lib/tt/lib/tt_options.h

@@ -355,17 +355,6 @@
 # undef  OPT_CLASSING_ENGINE 
 # define OPT_TAR_HAS_EXCLUDE_OPTION
 
-#elif defined(ultrix)
-
-# undef OPT_UNIX_SOCKET_RPC
-# undef  OPT_TLI 
-# undef  OPT_DLOPEN_X11 
-# undef  OPT_DLOPEN_CE 
-# undef  OPT_ADDMSG_DIRECT 
-# undef  OPT_SECURE_RPC 
-# undef  OPT_CLASSING_ENGINE 
-# undef  OPT_TAR_HAS_EXCLUDE_OPTION
-
 #elif defined(__hpux) || defined(hpux)
 
 # undef  OPT_UNIX_SOCKET_RPC 

cde/lib/tt/lib/util/tt_int_rec.C

@@ -33,9 +33,6 @@
  */
 #include "util/tt_int_rec.h"
 #include "util/tt_iostream.h"
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
 
 _Tt_int_rec::
 _Tt_int_rec()

cde/lib/tt/lib/util/tt_int_rec.h

@@ -35,9 +35,6 @@
 #define TT_INT_REC_H
 #include <util/tt_object.h>
 #include <util/tt_list.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
 
 /* 
  * _Tt_int_rec is essentially just a wrapper around an integer so we can

cde/lib/tt/lib/util/tt_new.h

@@ -41,10 +41,6 @@
 #include <sys/types.h>
 #endif /* __STDC__ */
 #include <stdlib.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#define bool_t int
-#endif
 #if defined(sun)
 #  define MALLOCTYPE	char
 #else

cde/lib/tt/lib/util/tt_new_ptr.h

@@ -42,10 +42,6 @@
 #include "util/tt_generic.h"
 #include "util/tt_new.h"
 
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
-
 class _Tt_object;
 class _Tt_new_ptr : public _Tt_allocated {
       protected:

cde/lib/tt/lib/util/tt_object.h

@@ -34,9 +34,6 @@
 #ifndef _TT_OBJECT_H
 #define _TT_OBJECT_H
 #include "util/tt_ptr.h"
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
 
 declare_ptr_to(_Tt_object)
 

cde/lib/tt/lib/util/tt_object_list.h

@@ -41,10 +41,6 @@
 #	undef remove
 #endif
 
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
-
 class _Tt_object_list_element;
 class _Tt_object_list_ptr;
 class _Tt_object_list: public _Tt_object {

cde/lib/tt/lib/util/tt_string.C

@@ -49,9 +49,6 @@
 
 #include <string.h>
 #include <memory.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
 #include <stdlib.h>
 #include <ctype.h>
 #if defined(__linux__) || defined(CSRG_BASED) || defined(sun)

cde/lib/tt/lib/util/tt_string.h

@@ -59,9 +59,6 @@ extern "C" {
 #include "util/tt_list.h"
 #include "util/tt_object.h"
 #include <memory.h>
-#if defined(ultrix)
-#define bool_t int
-#endif
 
 const int _Tt_string_unlimited	= -1;
 const int _Tt_string_user_width	= -2;

cde/lib/tt/lib/util/tt_xdr_utils.C

@@ -32,10 +32,6 @@
  * Copyright (c) 1990 by Sun Microsystems, Inc.
  */
 #include <stdint.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#define bool_t int
-#endif
 #include <rpc/rpc.h>
 #include <util/tt_xdr_utils.h>
 #include <memory.h>
@@ -81,9 +77,7 @@ tt_x_putbytes(XDR *xp, caddr_t, int len)
     return TRUE;
 }
 
-#if defined(ultrix)
-static int*
-#elif defined(CSRG_BASED) || defined(__linux__)
+#if defined(CSRG_BASED) || defined(__linux__)
 static int32_t*
 #else
 static long *
@@ -104,9 +98,8 @@ tt_x_inline(XDR *xp, int len)
     */
     if (len > 0 && (caddr_t) (intptr_t) len < xp->x_base) {
 	xp->x_handy += RNDUP (len);
-#if defined(ultrix)
-	return (int *) xp->x_private;
-#elif defined(CSRG_BASED) || defined(__linux__)
+
+#if defined(CSRG_BASED) || defined(__linux__)
 	return (int32_t *) xp->x_private;
 #else
 	return (long *) xp->x_private;

cde/lib/tt/mini_isam/iserror.c

@@ -42,9 +42,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <syslog.h>
-#ifdef __ultrix__
-#define LOG_USER LOG_INFO
-#endif
 /*
  * _isfatal_error(msg)
  *

cde/lib/tt/slib/mp_s_procid.C

@@ -948,7 +948,7 @@ signal_new_message(_Tt_message_ptr &m)
 #if defined(sun) && defined(SVR4)
 	typedef int (*Xdrrec_reader)(...);
 	typedef int (*Xdrrec_writer)(...);
-#elif defined(sun) & !defined(SVR4) || defined(ultrix)
+#elif defined(sun) && !defined(SVR4)
 	typedef int (*Xdrrec_reader)();
 	typedef int (*Xdrrec_writer)();
 #else

cde/lib/tt/slib/mp_s_session.C

@@ -115,7 +115,7 @@ s_open_unix_socket(char *socket_name)
 	server_addr.sun_family = AF_UNIX;
 	(void)unlink(socket_name);
 	strcpy(server_addr.sun_path, socket_name);
-#if defined(ultrix) || defined(_AIX)  || defined(hpux)
+#if defined(_AIX)  || defined(hpux)
         int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
 ily);
         if (bind(sock, (struct sockaddr *)&server_addr,servlen) < 0) {
@@ -377,23 +377,6 @@ check_for_live_session()
 	return(TT_OK);
 }
 
-#if defined(ultrix)
-/* strdup - make duplicate of string s */
-#include <string.h>
-#include <malloc.h>
-
-static char *
-strdup(char *s)
-{
-    char *p;
-
-    p = (char *)malloc(strlen(s) + 1);  /* + 1 for '\0' character */
-    if (p != NULL) 
-        strcpy(p,s);
-    return p;
-}
-#endif
-
 // 
 // Advertises a session procid so that any clients that come up within
 // the appropiate domain will find the session id.

cde/lib/tt/slib/mp_typedb.C

@@ -73,10 +73,6 @@
 #include "util/tt_global_env.h"
 #include "util/tt_xdr_version.h"
 
-#if defined(ultrix)
-extern "C" void xdrstdio_create(XDR *, FILE *, enum xdr_op);
-#endif
-
 
 enum _Tt_typedb_flags {
 	_TT_TYPEDB_USER,

cde/lib/tt/slib/mp_typedb.h

@@ -33,9 +33,6 @@
  */
 #ifndef _MP_TYPEDB_H
 #define _MP_TYPEDB_H
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
 
 #include <sys/stat.h>
 #include "util/tt_object.h"