external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

remove OSF1 support

Browse source
This commit is contained in:
chase 2018-05-24 14:50:03 -05:00 • committed by Jon Trulson
parent 3c1736f077
commit 164e695cd0
325 changed files with 290 additions and 9980 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cde/programs/dtmail/MotifApp/Application.C
View file

@ -256,9 +256,6 @@ Application::~Application()
#ifdef CDExc21492
#if defined(__hpux)
this->BasicComponent::~BasicComponent();
#elif __osf__
BasicComponent * The_End = this;
The_End->BasicComponent::~BasicComponent();
#else
BasicComponent::~BasicComponent();
#endif

7
cde/programs/dtmail/dtmail/AttachArea.C
View file

@ -675,14 +675,7 @@ AttachArea::addAttachment(
(page_size - (s.st_size % page_size)));
char * map;
#if defined(__osf__)
// This version of mmap does NOT allow requested length to be
// greater than the file size ... in contradiction to the
// documentation (don't round up).
map = (char *) mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
#else
map = (char *) mmap(0, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
#endif
if (map == (char *)-1) {
// We could not map it for some reason. Let's just read it into

7
cde/programs/dtmail/dtmail/ComposeCmds.C
View file

@ -793,14 +793,7 @@ TemplateCmd::doit()
int free_buf = 0;
mbuf.size = buf.st_size;
#ifdef __osf__
// This version of mmap does NOT allow requested length to be
// greater than the file size ... in contradiction to the
// documentation (don't round up).
mbuf.buffer = mmap(0, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
#else
mbuf.buffer = mmap(0, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
#endif
if (mbuf.buffer == (char *)-1) {
free_buf = 1;
mbuf.buffer = new char[mbuf.size];

4
cde/programs/dtmail/dtmail/RoamCmds.C
View file

@ -3944,11 +3944,7 @@ VacationCmd::parseVacationMessage()
int free_buf = 0;
mbuf.size = buf.st_size;
#ifdef __osf__
mbuf.buffer = (char *)mmap(0, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
#else
mbuf.buffer = mmap(0, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
#endif
if (mbuf.buffer == (char *)-1) {
free_buf = 1;
mbuf.buffer = new char[mbuf.size];

12
cde/programs/dtmail/dtmail/SendMsgDialog.C
View file

@ -2372,18 +2372,6 @@ SendMsgDialog::construct_text_popup(void)
_textPopupMenuList->add( _edit_cut );
_textPopupMenuList->add( _edit_copy );
_textPopupMenuList->add( _edit_paste );
#ifdef __osf__
// Work in progress from Mike. This adds the Paste Special to the
// third mouse button in the compose area of a compose window.
// Begin Paste Special submenu
CmdList * subcmdList1 = new CmdList ( "Paste Special", GETMSG(DT_catd, 1, 135 , "Paste Special") );
subcmdList1->add(_edit_paste_special[0]);
subcmdList1->add(_edit_paste_special[1]);
// End Paste Special submenu
_textPopupMenuList->add( subcmdList1 ); // Add Paste Special submenu
// (Either way) _textPopupMenuList->add( separator );
_textPopupMenuList->add( _edit_clear );
#endif
_textPopupMenuList->add( _edit_delete );
_textPopupMenuList->add( _edit_select_all );

8
cde/programs/dtmail/dtmail/XmTextEditor.C
View file

@ -647,15 +647,7 @@ XmTextEditor::loadFile(const char * path, const int pos)
(page_size - (info.st_size % page_size)));
char * map;
#if defined(__osf__)
// Need the (char *) for compile to work in ALL cases ... for the
// POSIX "mmap" is (void *). Also, this version of mmap does NOT
// allow requested length to be greater than the file size ...
// in contradiction to the documentation (don't round up).
map = (char *) mmap(0, info.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
#else
map = (char *) mmap(0, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
#endif
if (map == (char *)-1) {
// We could not map it for some reason. Let's just read it into

5
cde/programs/dtmail/include/DtMail/DtMail.hh
View file

@ -73,11 +73,6 @@ typedef void SubProcessFinishedProc (int pid, int status, void *data);
/* and will be removed in a */
/* later release */
#ifdef __osf__
struct hash;
struct var;
#endif
// enums cannot be declared inside of classes because the enum scope rules
// changed from V2 to V3 compilers causing incompatibilities
//

3
cde/programs/dtmail/libDtMail/Common/Buffer.C
View file

@ -44,9 +44,6 @@
#include <DtMail/Buffer.hh>
#include <string.h>
#ifdef __osf__
#include <stdlib.h>
#endif // __osf__
#include <stdio.h>
#include <stdlib.h>
#include <DtMail/Threads.hh>

7
cde/programs/dtmail/libDtMail/Common/DtMailRc.C
View file

@ -69,12 +69,7 @@ struct cmd {
};
struct var *DtMail::MailRc::variables[HSHSIZE]; /* Pointer to active var list */
#ifdef __osf__
typedef DtMail::MailRc::globals DtMailRc_globals;
DtMailRc_globals DtMail::MailRc::glob;
#else
struct DtMail::MailRc::globals DtMail::MailRc::glob;
#endif
char *DtMail::MailRc::nullfield;
Boolean DtMail::MailRc::clearAliases;
@ -150,7 +145,7 @@ struct cmd cmdtab[] = {
#if defined(sun)
#define SYSTEM_MAILRC "/etc/mail/mail.rc"
#elif defined(_AIX) || defined(__osf__) || defined(linux)
#elif defined(_AIX) || defined(linux)
#define SYSTEM_MAILRC "/usr/share/lib/Mail.rc"
#elif defined(__hpux)
#define SYSTEM_MAILRC "/usr/share/lib/mailx.rc"

10
cde/programs/dtmail/libDtMail/Common/IO.C
View file

@ -97,10 +97,6 @@ extern "C" { int lockf(int, int, off_t); }
#endif
#endif /* _AIX */
#ifdef __osf__
extern "C" { int statvfs(const char *, struct statvfs *); }
#endif /* __osf__ */
#include <DtMail/DtMail.hh>
#include <DtMail/DtMailError.hh>
#include <DtMail/IO.hh>
@ -623,11 +619,7 @@ SafeStrftime(char * buf, size_t buf_size,
void *SockOpen(char *host, int clientPort, char **errorstring)
{
int sockfd;
#if defined(__osf__)
in_addr_t inaddr;
#else
unsigned long inaddr;
#endif
struct sockaddr_in ad;
struct hostent *hp;
DtMailEnv error;
@ -820,9 +812,7 @@ GetPasswordEntry(passwd & result)
passwordEntry.pw_name = strdup(passwordEntry.pw_name);
passwordEntry.pw_passwd = strdup(passwordEntry.pw_passwd);
#if !defined(_AIX) && !defined(linux) && !defined(CSRG_BASED)
#ifndef __osf__
passwordEntry.pw_age = strdup(passwordEntry.pw_age);
#endif
passwordEntry.pw_comment = strdup(passwordEntry.pw_comment);
#endif
passwordEntry.pw_gecos = strdup(passwordEntry.pw_gecos);

46
cde/programs/dtmail/libDtMail/Common/Session.C
View file

@ -41,49 +41,6 @@
*+ENOTICE
*/
#if defined (__osf__)
// Workaround for CDExc19308
//
// This ifdef was added as a workaround for the
// bug in the OSF1 V3.2 148 /usr/include/sys/localedef.h
// header file, and should be removed as soon as the bug is
// fixed.
#include <iconv.h>
#include <locale.h>
#include <time.h>
#include <DtHelp/LocaleXlate.h>
#include <errno.h>
#include <stdlib.h>
#include <limits.h>
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <pwd.h>
#include <sys/socket.h>
#include <ctype.h>
#include <DtMail/DtMail.hh>
#include <EUSDebug.hh>
#include "DynamicLib.hh"
#include <DtMail/Threads.hh>
#include <DtMail/ImplDriver.hh>
#include "ImplConfigTable.hh"
#include "SigChldImpl.hh"
#include <DtMail/IO.hh>
#include <DtMail/Common.h>
#ifndef True
#define True 1
#endif
#ifndef False
#define False 0
#endif
#else
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@ -140,8 +97,7 @@ extern "C" {
}
#endif
// End of For CHARSET
#endif // ! defined(__osf__)
//End of CHARSET
DtVirtArray<SigChldInfo *> *DtMailSigChldList;
void * _DtMutex;

36
cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
View file

@ -44,41 +44,6 @@
#ifndef I_HAVE_NO_IDENT
#endif
#if defined (__osf__) && OSMAJORVERSION < 4
#include <iconv.h>
// Workaround for CDExc19308
//
// This ifdef was added as a workaround for the
// bug in the OSF1 V3.2 148 /usr/include/sys/localedef.h
// header file, and should be removed as soon as the bug is
// fixed.
#include <locale.h>
#include <time.h>
#include <DtHelp/LocaleXlate.h>
#include <errno.h>
#include <stdlib.h>
#include <limits.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <Dt/Dts.h>
#include <DtMail/DtMail.hh>
#include "RFCImpl.hh"
#include <DtMail/Threads.hh>
#ifndef True
#define True 1
#endif
#ifndef False
#define False 0
#endif
#else
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -129,7 +94,6 @@ extern "C" {
#endif
// End of For CHARSET
#endif // defined (__osf__) && OSMAJORVERSION < 4
RFCBodyPart::RFCBodyPart(DtMailEnv & error,
DtMail::Message * parent,

42
cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
View file

@ -69,16 +69,6 @@
#include <sys/wait.h>
#include <Dt/DtPStrings.h>
#ifdef __osf__
#ifndef sysinfo
#ifdef __cplusplus
extern "C" {
int sysinfo(int, char *, long);
}
#endif // __cplusplus
#endif // sysinfo
#endif // __osf__
#include <assert.h>
#if defined(NEED_MMAP_WRAPPER)
@ -666,7 +656,7 @@ RFCMailBox::append(DtMailEnv &error, char *buf, int len)
path, errno, error.errnoMessage(errno));
break;
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
case ENOTDIR:
#else
case ENOLINK:
@ -1884,23 +1874,10 @@ RFCMailBox::mapFile(DtMailEnv & error,
if ( (_use_dot_lock == DTM_TRUE)
&& (_mail_box_writable == DTM_TRUE)
#if defined(__osf__)
&& (_long_lock_active == DTM_TRUE)
#endif
) {
#if defined(__osf__) && OSMAJORVERSION < 4
// This version of mmap does NOT allow requested length to be
// greater than the file size ... in contradiction to the
// documentation (don't round up).
map->map_region = (char *) mmap(
0, (statbuf.st_size - map->offset),
PROT_READ, flags, _fd, (off_t) map->offset);
#else
map->map_region = (char *)mmap(
0, (unsigned int) map->map_size,
PROT_READ, flags, _fd, (off_t) map->offset);
#endif
// ERROR/CONSISTENCY CHECKING: if the region was not mapped,
// or the first or last byte of the region is a null, then
@ -3009,7 +2986,7 @@ RFCMailBox::createTemporaryMailboxFile(DtMailEnv & error, char *tmp_name)
error.setError(DTME_CannotCreateTemporaryMailboxFile_NoSuchFile);
break;
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
case ENOTDIR:
#else
case ENOLINK:
@ -3334,7 +3311,7 @@ RFCMailBox::writeMailBox(DtMailEnv &error, DtMailBoolean hide_access)
DTME_CannotWriteToTemporaryMailboxFile_ProcessLimitsExceeded);
break;
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
case ENOTDIR:
#else
case ENOLINK:
@ -3694,7 +3671,7 @@ RFCMailBox::generateUniqueLockId(void)
char theId[128];
char hwserialbuf[64];
#if !defined(__aix) && !defined(__hpux) && !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED)
#if !defined(__aix) && !defined(__hpux) && !defined(linux) && !defined(CSRG_BASED)
if (sysinfo(SI_HW_SERIAL, (char *)hwserialbuf, sizeof(hwserialbuf)-1) == -1)
#endif
strcpy(hwserialbuf, "dtmail");
@ -3830,7 +3807,7 @@ RFCMailBox::linkLockFile(DtMailEnv & error, char *tempLockFileName)
error.setError(DTME_CannotCreateMailboxLockFile_NoSuchFile);
break;
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
case ENOTDIR:
#else
case ENOLINK:
@ -4198,7 +4175,7 @@ RFCMailBox::dotDtmailLock(DtMailEnv & error)
case ENOENT:
error.setError(DTME_CannotCreateMailboxLockFile_NoSuchFile);
break;
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
case ENOTDIR:
#else
case ENOLINK:
@ -4409,14 +4386,7 @@ RFCMailBox::mapNewRegion(DtMailEnv & error, int fd, unsigned long size)
map->file_size = size;
long page_size = memoryPageSize();
#if defined(__osf__) && OSMAJORVERSION < 4
// Problem with mapping. You can not round up to the nearest
// memory block size when mapping a file. You need the exact
// file size of less. - ff
map->map_size = map->file_size;
#else
map->map_size = map->file_size + (page_size - (map->file_size % page_size)) + page_size;
#endif
int flags = MAP_PRIVATE;

2
cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
View file

@ -975,7 +975,7 @@ RFCTransport::signalRegister(void)
if (initialized) return;
initialized = 1;
#if defined(hpux) || defined(_aix) || defined(__osf__) || defined(linux) || \
#if defined(hpux) || defined(_aix) || defined(linux) || \
(defined(sun) && OSMAJORVERSION>=5 && OSMINORVERSION>4) || defined(CSRG_BASED)
// SunOS 5.5 and above defined prototype for signal handler
act.sa_handler = (void (*)(int))&RFCTransport::childHandler;