Remove Unixware and openserver support

cde/programs/dtcm/dtcm/Imakefile

@@ -17,7 +17,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
 	$(ICONV_INBUF_DEFINE)
 
-#if defined(RsArchitecture) || defined(USLArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(RsArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture)
 TTY_LIBRARIES = $(LOCAL_LIBRARIES) 
 #elif defined(AlphaArchitecture)
 TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)

cde/programs/dtcm/libDtCmP/util.c

@@ -59,17 +59,13 @@
 #include <pwd.h> 
 #include <netdb.h> 
 #include <sys/utsname.h> /* SYS_NMLN */
-#if defined(sun) || defined(USL)
+#if defined(sun)
 #include <sys/systeminfo.h>
 #else
 #include <sys/dir.h>
-#endif /* sun || USL */
+#endif /* sun */
 #include <sys/param.h>
 
-#if defined(USL) && !defined(DOM_NM_LN)
-#define DOM_NM_LN  BUFSIZ
-#endif
-
 #define X_INCLUDE_STRING_H
 #define X_INCLUDE_TIME_H
 #define XOS_USE_NO_LOCKING
@@ -548,13 +544,13 @@ cm_get_local_host()
 	static char *local_host;
 
         if (local_host == NULL) {
-#if defined(sun) || defined(USL)
+#if defined(sun)
                 local_host = (char *)ckalloc(MAXHOSTNAMELEN);
                 (void) sysinfo(SI_HOSTNAME, local_host, MAXHOSTNAMELEN);
 #else
                 local_host = (char *)ckalloc(MAXHOSTNAMELEN);
                 (void) gethostname(local_host, MAXHOSTNAMELEN);
-#endif /* sun || USL */
+#endif /* sun */
         }
         return local_host;
 }
@@ -582,14 +578,14 @@ cm_get_local_domain()
 
         if (local_domain == NULL) {
                 local_domain = ckalloc(BUFSIZ);
-#if defined(sun) || defined(USL)
+#if defined(sun)
                 sysinfo(SI_SRPC_DOMAIN, local_domain, DOM_NM_LN);
 #else
 		if(-1 == getdomainname(local_domain, BUFSIZ)) {
 			fprintf(stderr, "getdomainname() failed %d '%s'\n", errno, strerror(errno));
 		}
 		
-#endif /* sun || USL */
+#endif /* sun */
 	}
         return(local_domain);
 }

cde/programs/dtcm/server/lexit.c

@@ -428,7 +428,7 @@ setinput (FILE* f)
 	return(-1);
       }
 
-#if !defined(USL) && !defined(linux)
+#if !defined(linux)
   /* no madvise so we lose this optimization */
   madvise(start_of_mmapped_area, len, MADV_SEQUENTIAL);
 #endif

cde/programs/dtcm/server/svcmain.c

@@ -46,12 +46,12 @@
 #endif /* _NETINET_IN_H */
 #endif
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 #include <netconfig.h>
 #include <netdir.h>
 #include <sys/stropts.h>
 #include <tiuser.h>
-#endif /* SunOS || USL */
+#endif /* SunOS */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -521,14 +521,12 @@ main(int argc, char **argv)
 	SVCXPRT *udp_transp = (SVCXPRT *)-1;
 	int	fd, error;
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	struct netconfig *nconf_udp;
 	struct netconfig *nconf_tcp;
 	struct t_info info;
-#if !defined(USL) || (defined(USL) && (OSMAJORVERSION > 1))
 	char mname[FMNAMESZ+1];
-#endif
-#endif /* SunOS || USL */
+#endif /* SunOS */
 
 	pw = (struct passwd *)getpwnam("daemon");
 	gr = (struct group *)getgrnam("daemon");
@@ -548,8 +546,7 @@ main(int argc, char **argv)
 
 		standalone = 0;
 
-#if defined(SunOS) || defined(USL)
-#if !defined(USL) || (defined(USL) && (OSMAJORVERSION > 1))
+#if defined(SunOS)
 		/* we need a TLI endpoint rather than a socket */
 		if (ioctl(0, I_LOOK, mname) != 0) {
 			perror("rpc.cmsd: ioctl failed to get module name");
@@ -565,17 +562,11 @@ main(int argc, char **argv)
 			fprintf(stderr, "rpc.cmsd: fd 0 is not timod\n");
 			exit(1);
 		}
-#else  /* !USL || (USL && OSMAJORVERSION > 1) */
-		if (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, "timod")) {
-			perror("rpc.cmsd: ioctl I_POP/I_PUSH failed");
-			exit(1);
-		}
-#endif /* !USL || (USL && OSMAJORVERSION > 1) */
 
 	} else if (t_getinfo(0, &info) == 0) {
 		standalone = 0;
 
-#endif /* SunOS || USL */
+#endif /* SunOS */
 
 	} else
 		standalone = 1;
@@ -621,7 +612,7 @@ main(int argc, char **argv)
 	signal(SIGHUP, sighup_handler);
 
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	/* raise the soft limit of number of file descriptor */
 	/* this is to prevent the backend from running out of open file des */
 	getrlimit(RLIMIT_NOFILE, &rl);
@@ -629,7 +620,7 @@ main(int argc, char **argv)
 	setrlimit(RLIMIT_NOFILE, &rl);
 #endif
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	nconf_udp = getnetconfigent("udp");
 	nconf_tcp = getnetconfigent("tcp");
 
@@ -749,7 +740,7 @@ main(int argc, char **argv)
 		}
 	}
 
-#endif /* SunOS || USL */
+#endif /* SunOS */
 
 #ifndef AIX
 #ifdef HPUX

cde/programs/dtcm/server/utility.c

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rpc/rpc.h>
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 #include <netdb.h>
 #include <sys/systeminfo.h>
 #endif