Remove Unixware and openserver support

2025-03-09 15:50:02 +00:00 · 2018-05-19 19:50:35 -05:00 · 2018-05-19 19:50:35 -05:00 · 07900bd93b
commit 07900bd93b
parent beea573d17
375 changed files with 725 additions and 9112 deletions
--- a/cde/programs/dtmail/MotifApp/Application.C
+++ b/cde/programs/dtmail/MotifApp/Application.C
@ -254,7 +254,7 @@ Application::~Application()
    delete []_windows;

 #ifdef CDExc21492
-  #if defined(__hpux) || defined(USL)
+  #if defined(__hpux)
    this->BasicComponent::~BasicComponent();
  #elif  __osf__
    BasicComponent * The_End = this;
--- a/cde/programs/dtmail/dtmail/AttachArea.C
+++ b/cde/programs/dtmail/dtmail/AttachArea.C
@ -47,9 +47,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#if defined(USL)
-#define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK)
-#endif
 #include <stdio.h>
 #include <Dt/Editor.h>
 #include <Xm/ColorObjP.h>
--- a/cde/programs/dtmail/dtmail/AttachCmds.C
+++ b/cde/programs/dtmail/dtmail/AttachCmds.C
@ -47,9 +47,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/stat.h>
-#if defined(USL)
-#define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK)
-#endif
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
--- a/cde/programs/dtmail/dtmail/DmxMessage.C
+++ b/cde/programs/dtmail/dtmail/DmxMessage.C
@ -74,11 +74,7 @@
 // For CHARSET
 #include <LocaleXlate.h>
 #include <locale.h>
-#if !defined(USL)
 #include <strings.h>
-#else 
-#include <EUSCompat.h>
-#endif 

 #include "Application.h"
 #include "DtMail/DtMail.hh"
--- a/cde/programs/dtmail/dtmail/MsgHndArray.hh
+++ b/cde/programs/dtmail/dtmail/MsgHndArray.hh
@ -45,12 +45,6 @@

 #include <stdlib.h>
 #include <string.h>
-#if defined(USL) && (OSMAJORVERSION == 2)
-extern "C" {
-#endif
-#if defined(USL) && (OSMAJORVERSION == 2)
-};
-#endif
 #include <DtMail/DtMail.hh>

 class MsgStruct {
--- a/cde/programs/dtmail/dtmail/RoamApp.C
+++ b/cde/programs/dtmail/dtmail/RoamApp.C
@ -70,9 +70,9 @@

 #include <unistd.h>
 #include <wchar.h>
-#if defined(USL) || defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED)
 #define wcswcs wcsstr
-#include <wctype.h>  // iswspace is defined in this header on USL */
+#include <wctype.h>
 #endif

 #ifdef DTMAIL_TOOLTALK
@ -957,7 +957,7 @@ Usage(char *progname)

 nl_catd DT_catd = (nl_catd) -1;    // catgets file descriptor

-#if defined(reallyoldsun) || defined(USL)
+#if defined(reallyoldsun)
 #define SA_HANDLER_TYPE void (*)(void)
 #else
 #define SA_HANDLER_TYPE void (*)(int)
--- a/cde/programs/dtmail/dtmail/RoamMenuWindow.C
+++ b/cde/programs/dtmail/dtmail/RoamMenuWindow.C
@ -72,9 +72,7 @@
 #include <unistd.h>
 #include <sys/param.h>

-#if !defined(USL)
 #include <strings.h>
-#endif
 #include <errno.h>
 #include <unistd.h>
 #include <sys/utsname.h>
--- a/cde/programs/dtmail/dtmailpr/dmx.hh
+++ b/cde/programs/dtmail/dtmailpr/dmx.hh
@ -96,7 +96,7 @@ enum DmxHeaders
 };

 // This is undoubtedly illegal, unethical, and immoral.  So sue me.
-#if !defined(SunOS) && !defined(USL) && !defined(_AIX)
+#if !defined(SunOS) && !defined(_AIX)
 #undef boolean_t
 typedef enum { B_FALSE, B_TRUE } boolean_t;
 #endif // SunOS
--- a/cde/programs/dtmail/dtmailpr/message.C
+++ b/cde/programs/dtmail/dtmailpr/message.C
@ -51,11 +51,7 @@
 // For CHARSET
 #include <DtHelp/LocaleXlate.h>
 #include <locale.h>
-#if !defined(USL)
 #include <strings.h>
-#else 
-#include <EUSCompat.h>
-#endif 
 #include "utils/str_utils.h"


--- a/cde/programs/dtmail/libDtMail/Common/Buffer.C
+++ b/cde/programs/dtmail/libDtMail/Common/Buffer.C
@ -46,13 +46,6 @@
 #include <string.h>
 #ifdef __osf__
 #include <stdlib.h>
-#else
-#if defined(USL) && (OSMAJORVERSION == 2)
-extern "C" {
-#endif
-#if defined(USL) && (OSMAJORVERSION == 2)
-};
-#endif
 #endif // __osf__
 #include <stdio.h>
 #include <stdlib.h>
--- a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
+++ b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
@ -152,7 +152,7 @@ struct cmd cmdtab[] = {
 #define SYSTEM_MAILRC	"/etc/mail/mail.rc"
 #elif defined(_AIX) || defined(__osf__) || defined(linux)
 #define SYSTEM_MAILRC	"/usr/share/lib/Mail.rc"
-#elif defined(USL) || defined(__hpux)
+#elif defined(__hpux)
 #define SYSTEM_MAILRC	"/usr/share/lib/mailx.rc"
 #elif defined(CSRG_BASED)
 #define SYSTEM_MAILRC	"/etc/mail.rc"
--- a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C
+++ b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C
@ -160,7 +160,7 @@ DtMailServer::set_password(char *password)
 //
 //	len	- Length of message.
 //
-#if defined(reallyoldsun) || defined(USL)
+#if defined(reallyoldsun)
 #define SA_HANDLER_TYPE void (*)(void)
 #else
 #define SA_HANDLER_TYPE void (*)(int)
--- a/cde/programs/dtmail/libDtMail/Common/Process.C
+++ b/cde/programs/dtmail/libDtMail/Common/Process.C
@ -51,7 +51,7 @@
 /*
 ** file included for INFTIM
 */ 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 #include <stropts.h>
 #elif defined(HPUX)
 #include <sys/poll.h>
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@ -86,12 +86,6 @@

 #include <stdlib.h>
 #include <unistd.h>
-#if defined(USL) && (OSMAJORVERSION == 2)
-extern "C" {
-#endif
-#if defined(USL) && (OSMAJORVERSION == 2)
-};
-#endif
 #include <string.h>
 #include <pwd.h>
 #include <sys/socket.h>
--- a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
@ -103,7 +103,7 @@ extern "C" {
 #define MAIL_SPOOL_PATH "/var/mail/%s"
 #endif

-#if defined(sun) || defined(USL)
+#if defined(sun)
 #define	LCL_SIG_HANDLER_SIGNATURE	
 #elif defined(__hpux)
 #define	LCL_SIG_HANDLER_SIGNATURE	__harg
@ -570,7 +570,7 @@ RFCMailBox::alterPageMappingAdvice(MapRegion *map, int advice)
  for (int m = 0; m < me; m++) {
    MapRegion *map_t = _mappings[m];

-#if !defined(USL) && !defined(linux) && !defined(sun)
+#if !defined(linux) && !defined(sun)
    // no madvise on these systems
    if (map_t == map || map == (MapRegion *)-1)
      madvise(map_t->map_region, (size_t) map_t->map_size, advice);
@ -889,7 +889,7 @@ RFCMailBox::open(DtMailEnv & error,
 	  // five characters are "From "
 	  char inbuf[6];

-#if defined(sun) || defined(USL)
+#if defined(sun)
 	  pread(_fd, (void *)inbuf, 5, 0);
 #else
 	  lseek(_fd, (off_t) 0L, SEEK_SET);
@ -2259,7 +2259,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
    //
    unsigned long pagelimit = _mappings[map_slot]->map_size;

-#if !defined(USL) && !defined(linux) && !defined(sun)
+#if !defined(linux) && !defined(sun)
    // no madvise; dont use optimization
    madvise(
 	(char *)_mappings[map_slot]->map_region,
@ -2350,7 +2350,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
    // At this point we most likely will see random behavior. We will
    // tell the kernel to pull in the minimum number of extra pages.
    //
-#if !defined(USL) && !defined(linux) && !defined(sun)
+#if !defined(linux) && !defined(sun)
    // no madvise; dont use optimization
    madvise(
 	(char *)_mappings[map_slot]->map_region,
@ -4539,7 +4539,7 @@ RFCMailBox::startAutoSave(DtMailEnv & error,
 	_session->removeEventRoutine(error, PollEntry, this);
 }

-#if defined(reallyoldsun) || defined(USL)
+#if defined(reallyoldsun)
 #define SA_HANDLER_TYPE void (*)(void)
 #else
 #define SA_HANDLER_TYPE void (*)(int)
--- a/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C
@ -47,9 +47,7 @@
 #include <EUSCompat.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(USL)
 #include <strings.h>
-#endif
 #include <ctype.h>
 #include <stdint.h>

--- a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
@ -741,9 +741,7 @@ RFCTransport::launchSendmail(DtMailEnv & error,
    const char * mailer;
    _session->mailRc(error)->getValue(error, "sendmail", &mailer);
    if (error.isSet()) {
-#if defined(USL)
-        mailer = "/usr/ucblib/sendmail";
-#elif defined(__OpenBSD__)
+#if defined(__OpenBSD__)
 	mailer = "/usr/sbin/sendmail";
 #else
        mailer = "/usr/lib/sendmail";
--- a/cde/programs/dtmail/libDtMail/RFC/SunV3.C
+++ b/cde/programs/dtmail/libDtMail/RFC/SunV3.C
@ -55,7 +55,7 @@
 /*
 ** file included for INFTIM
 */ 
-#if defined(SunOS) || defined (USL)
+#if defined(SunOS)
 #include <stropts.h>
 #elif defined(HPUX)
 #include <sys/poll.h>