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

initial illumos port

Browse source
This commit is contained in:
Peter Tribble 2014-03-21 16:37:00 -07:00 • committed by Jon Trulson
parent 3c14b8b5ce
commit 468d576030
48 changed files with 117 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cde/config/cf/site.def
View file

@ -14,6 +14,8 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
#ifdef BeforeVendorCF #ifdef BeforeVendorCF
# define LocalThreadsDefines
# include <host.def> # include <host.def>
/* CDE uses a .C suffix for C++ source, not the default .cxx */ /* CDE uses a .C suffix for C++ source, not the default .cxx */
@ -71,6 +73,8 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
# define X11ProjectRoot /usr # define X11ProjectRoot /usr
# elif defined(FreeBSDArchitecture) # elif defined(FreeBSDArchitecture)
# define X11ProjectRoot /usr/local # define X11ProjectRoot /usr/local
# elif defined(SunArchitecture)
# define X11ProjectRoot /usr
# elif defined(OpenBSDArchitecture) # elif defined(OpenBSDArchitecture)
# define X11ProjectRoot /usr/X11R6 # define X11ProjectRoot /usr/X11R6
# elif defined(NetBSDArchitecture) # elif defined(NetBSDArchitecture)

13
cde/config/cf/sun.cf
View file

@ -178,7 +178,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
# define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS # define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
# endif # endif
# endif # endif
# if OSMinorVersion > 3 # if OSMinorVersion > 10
# define InstallCmd /usr/bin/ginstall
# elif OSMinorVersion > 3
# define InstallCmd /usr/ucb/install # define InstallCmd /usr/ucb/install
# endif # endif
# ifdef i386Architecture # ifdef i386Architecture
@ -333,10 +335,17 @@ man_keywords:: @@\
#if !defined(UsePamLibrary) #if !defined(UsePamLibrary)
# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4)) # if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4))
# define UsePamLibrary YES # define UsePamLibrary NO
# endif # endif
#endif #endif
#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
#define SharedLibXau YES
#define SharedXauRev 6
#define SharedLibXdmcp YES
#define SharedXdmcpRev 6
#endif
#define MotifDefines \ #define MotifDefines \
-DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
#define PamUnixDefines -DPAM_NIS #define PamUnixDefines -DPAM_NIS

2
cde/config/cf/sunLib.tmpl
View file

@ -77,7 +77,7 @@ ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
UNSHARED_CXXLIB = -static -lC UNSHARED_CXXLIB = -static -lC
# elif HasSunCplusplus # elif HasSunCplusplus
# if CplusplusCompilerMajorVersion > 3 # if CplusplusCompilerMajorVersion > 3
UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic UNSHARED_CXXLIB = -lC
# else # else
UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
# endif # endif

2
cde/lib/DtHelp/Layout.c
View file

@ -332,7 +332,7 @@ static const _DtCvSegmentI BlankTableCell =
_DtCvCONTAINER, /* type */ _DtCvCONTAINER, /* type */
-1, /* link_idx */ -1, /* link_idx */
{ /* container info */ { /* container info */
{ NULL }, /* id */ NULL, /* id */
NULL, /* justify_char */ NULL, /* justify_char */
_DtCvDYNAMIC, /* type */ _DtCvDYNAMIC, /* type */
_DtCvBORDER_NONE, /* border */ _DtCvBORDER_NONE, /* border */

2
cde/lib/DtSvc/DtUtil2/SunDtHelp.c
View file

@ -77,7 +77,7 @@ int SUNWDtHelpdlopen()
_DtSvcProcessLock(); _DtSvcProcessLock();
pmySUNWProcList = (SUNWHelpProcList *)malloc(sizeof(SUNWHelpProcList)); pmySUNWProcList = (SUNWHelpProcList *)malloc(sizeof(SUNWHelpProcList));
libDtHelpHandle = dlopen("libDtHelp.so.1", RTLD_LAZY | RTLD_GLOBAL); libDtHelpHandle = dlopen("libDtHelp.so.2.1", RTLD_LAZY | RTLD_GLOBAL);
if (libDtHelpHandle == NULL) { if (libDtHelpHandle == NULL) {
char *my_err_msg; char *my_err_msg;

2
cde/lib/DtSvc/Imakefile
View file

@ -30,7 +30,7 @@ INCLUDES = -I.
#ifdef SharedDtSvcReqs #ifdef SharedDtSvcReqs
#ifdef SunArchitecture #ifdef SunArchitecture
REQUIREDLIBS = SharedDtSvcReqs -L/opt/SUNWspro/SC4.0/lib -Bstatic -lC REQUIREDLIBS = SharedDtSvcReqs -lC -lCrun
SHLIBLDFLAGS = -G SHLIBLDFLAGS = -G
#else #else
REQUIREDLIBS = SharedDtSvcReqs REQUIREDLIBS = SharedDtSvcReqs

2
cde/lib/DtSvc/include/bms/sbstdinc.h
View file

@ -62,7 +62,7 @@
#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED) #if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
#if defined(__STDC__) #if defined(__STDC__)
#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_) #if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_) && !defined(sun)
extern void bcopy(char *b1, char *b2, int length); extern void bcopy(char *b1, char *b2, int length);
extern int bcmp(char *b1, char *b2, int length); extern int bcmp(char *b1, char *b2, int length);
extern void bzero(char *b, int length); extern void bzero(char *b, int length);

4
cde/lib/DtSvc/include/codelibs/stringx.h
View file

@ -75,7 +75,7 @@ extern "C"
#ifdef __cplusplus #ifdef __cplusplus
char *strtokx(char *&ptr, const char *sep); char *strtokx(char *&ptr, const char *sep);
# if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED) # if !defined(__osf__) && !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
char **strsep(const char *str, const char *sep, char **strsep(const char *str, const char *sep,
boolean whsp = TRUE, int *num = NULL); boolean whsp = TRUE, int *num = NULL);
# if !defined(__osf__) # if !defined(__osf__)
@ -85,7 +85,7 @@ extern "C"
#else /* __STDC__ */ #else /* __STDC__ */
char *strtokx(char **ptr, const char *sep); char *strtokx(char **ptr, const char *sep);
# if !defined(linux) && !defined(CSRG_BASED) # if !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
char **strsep(const char *str, const char *sep, char **strsep(const char *str, const char *sep,
boolean whsp, int *num); boolean whsp, int *num);
#endif #endif

2
cde/lib/tt/bin/shell/mover.C
View file

@ -38,7 +38,7 @@
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#include <unistd.h> #include <unistd.h>
#else #else
#if !defined(USL) && !defined(__uxp__) #if !defined(USL) && !defined(__uxp__) && !defined(sun)
#include <osfcn.h> #include <osfcn.h>
#endif #endif
#endif #endif

2
cde/lib/tt/bin/shell/remover.C
View file

@ -38,7 +38,7 @@
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#include <unistd.h> #include <unistd.h>
#else #else
#if !defined(USL) && !defined(__uxp__) #if !defined(USL) && !defined(__uxp__) && !defined(sun)
#include <osfcn.h> #include <osfcn.h>
#endif #endif
#endif #endif

2
cde/lib/tt/bin/ttauth/ttauth.h
View file

@ -58,7 +58,7 @@ typedef int Bool;
extern char *ProgramName; extern char *ProgramName;
#if !defined(linux) && !defined(CSRG_BASED) #if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
extern char *malloc(), *realloc(); extern char *malloc(), *realloc();
#endif #endif
int process_command(), auth_initialize(), auth_finalize(); int process_command(), auth_initialize(), auth_finalize();

3
cde/lib/tt/bin/ttdbserverd/db_server_globals.h
View file

@ -38,6 +38,9 @@
#define _DB_SERVER_GLOBALS_H #define _DB_SERVER_GLOBALS_H
#include <limits.h> #include <limits.h>
#if !defined(NGROUPS)
#define NGROUPS NGROUPS_MAX
#endif
#if defined(OPT_GARBAGE_THREADS) #if defined(OPT_GARBAGE_THREADS)
#include <synch.h> #include <synch.h>

4
cde/lib/tt/bin/tttar/tttar.C
View file

@ -37,10 +37,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #if defined(__osf__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
#include <unistd.h> #include <unistd.h>
#else #else
#if !defined(USL) && !defined(__uxp__) #if !defined(USL) && !defined(__uxp__) && !defined(sun)
#include <osfcn.h> #include <osfcn.h>
#endif #endif
#endif #endif

2
cde/lib/tt/bin/tttar/tttar_api.C
View file

@ -33,7 +33,7 @@
*/ */
#include <errno.h> #include <errno.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h> #include <unistd.h>
#else #else
#ifndef USL #ifndef USL

2
cde/lib/tt/bin/tttar/tttar_spec.C
View file

@ -32,7 +32,7 @@
* *
*/ */
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h> #include <unistd.h>
#else #else
#if defined (USL) || defined(__uxp__) #if defined (USL) || defined(__uxp__)

2
cde/lib/tt/lib/Imakefile
View file

@ -45,7 +45,7 @@ INCLUDES = -I.
#ifdef SharedTtReqs #ifdef SharedTtReqs
#ifdef SunArchitecture #ifdef SunArchitecture
REQUIREDLIBS = SharedTtReqs -L/opt/SUNWspro/SC4.0/lib -Bstatic -lC REQUIREDLIBS = SharedTtReqs -lC -lCrun
SHLIBLDFLAGS = -G SHLIBLDFLAGS = -G
#else #else
REQUIREDLIBS = SharedTtReqs REQUIREDLIBS = SharedTtReqs

2
cde/lib/tt/lib/mp/mp_message.C
View file

@ -1284,7 +1284,7 @@ print(const _Tt_ostream &os) const
os << "otype:\t\t" << _otype << "\n"; os << "otype:\t\t" << _otype << "\n";
} }
if (! _sender.is_null()) { if (! _sender.is_null()) {
os << "sender:\t\t[" << _uid << "/" << _gid << "] "; os << "sender:\t\t[" << (unsigned long)_uid << "/" << (unsigned long)_gid << "] ";
_sender->print( os ); _sender->print( os );
} }
if (_sender_ptype.len() > 0) { if (_sender_ptype.len() > 0) {

2
cde/lib/tt/lib/util/tt_host.C
View file

@ -48,7 +48,7 @@ extern "C" in_addr_t inet_addr(const char *);
#ifdef __osf__ #ifdef __osf__
#include <unistd.h> #include <unistd.h>
#else #else
#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) #if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h> #include <osfcn.h>
#endif #endif
#endif /* __osf */ #endif /* __osf */

2
cde/lib/tt/lib/util/tt_log.C
View file

@ -37,7 +37,7 @@
#ifdef __osf__ #ifdef __osf__
#include <unistd.h> #include <unistd.h>
#else #else
#if !defined (USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) #if !defined (USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h> #include <osfcn.h>
#endif #endif
#endif /* __osf__ */ #endif /* __osf__ */

2
cde/lib/tt/lib/util/tt_xdr_utils.h
View file

@ -55,7 +55,7 @@ class _Tt_xdr_size_stream : public _Tt_allocated {
#ifdef __DECCXX #ifdef __DECCXX
XDR::xdr_ops ops; XDR::xdr_ops ops;
#else #else
struct XDR::xdr_ops ops; struct xdr_ops ops;
#endif #endif
}; };

2
cde/programs/dtappbuilder/src/libAButil/util.c
View file

@ -223,7 +223,7 @@ util_vfork()
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4) #if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
extern int putenv(const char *string); extern int putenv(const char *string);
#elif !(defined(__osf__) || defined(__aix) || defined(__NetBSD__)) #elif !(defined(__osf__) || defined(__aix) || defined(__NetBSD__))
extern int putenv(char *string); extern int putenv(char *string);

2
cde/programs/dtcalc/calctool.c
View file

@ -46,7 +46,7 @@
#include "calctool.h" #include "calctool.h"
#include "ds_common.h" #include "ds_common.h"
#ifdef sun #ifdef legacysun
/* Copied from math.h */ /* Copied from math.h */
struct exception { struct exception {

2
cde/programs/dtcreate/Imakefile
View file

@ -42,7 +42,7 @@ SYS_LIBRARIES = -lm -liconv
#endif #endif
#if defined (SunArchitecture) #if defined (SunArchitecture)
SYS_LIBRARIES = -lm -ldl -L/opt/SUNWspro/SC2.0.1 -lC SYS_LIBRARIES = -lm -ldl -lC
#endif /* SunArchitecture */ #endif /* SunArchitecture */
#if defined (USLArchitecture) #if defined (USLArchitecture)

2
cde/programs/dtdocbook/tcl/Imakefile
View file

@ -30,7 +30,7 @@ TCL_LIBRARY = $(prefix)/tcl$(VERSION)
#if defined(SunArchitecture) #if defined(SunArchitecture)
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \ EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H \ -DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
-DTCL_GOT_TIMEZONE -DTCL_GOT_TIMEZONE
#elif defined(IBMArchitecture) #elif defined(IBMArchitecture)

2
cde/programs/dtinfo/tools/misc/msgsets.C
View file

@ -42,7 +42,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <stdlib.h> #include <stdlib.h>
#if !defined(__DECCXX) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED) #if !defined(__DECCXX) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h> #include <osfcn.h>
#else #else
#include <unistd.h> #include <unistd.h>

12
cde/programs/dtlogin/Imakefile
View file

@ -59,7 +59,14 @@ SOLARIS_OBJS =
#endif #endif
#if defined(SunArchitecture) && !UsePamLibrary #if defined(SunArchitecture) && !UsePamLibrary
/* Unsure when libauth went away */
# if (OSMajorVersion == 5) && (OSMinorVersion < 5)
PAM_LIB = -lauth PAM_LIB = -lauth
# else
PAM_SRCS = pam_svc.c
PAM_OBJS = pam_svc.o
PAM_LIB = -lpam
# endif
#endif #endif
XDMDIR = $(CDE_LOGFILES_TOP) XDMDIR = $(CDE_LOGFILES_TOP)
@ -99,13 +106,12 @@ SYS_LIBRARIES = -lsec
* on Solaris 2.4 and run on Solaris 2.5. In Solaris 2.4 some of * on Solaris 2.4 and run on Solaris 2.5. In Solaris 2.4 some of
* libcmd.a functions are also in libauth.so. But on Solaris 2.5 * libcmd.a functions are also in libauth.so. But on Solaris 2.5
* these Sun private functions have been removed from libauth.so. */ * these Sun private functions have been removed from libauth.so. */
SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lC -lbsm -lcmd -lauth $(PAM_LIB) SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lC -lbsm -lcmd $(PAM_LIB)
EXTRA_DEFINES = -DPAM
# if UsePamLibrary # if UsePamLibrary
EXTRA_DEFINES = -DPAM EXTRA_DEFINES = -DPAM
# else
EXTRA_DEFINES = -DSUNAUTH
# endif # endif
#endif #endif

8
cde/programs/dtlogin/pam_svc.c
View file

@ -150,7 +150,7 @@ PamAuthenticate ( char* prog_name,
return(PAM_AUTH_ERR); return(PAM_AUTH_ERR);
} }
#ifdef sun #ifdef legacysun
/* Solaris BSM Audit trail */ /* Solaris BSM Audit trail */
audit_login_save_host(display_name); audit_login_save_host(display_name);
@ -167,7 +167,7 @@ PamAuthenticate ( char* prog_name,
status = pam_authenticate( pamh, 0 ); status = pam_authenticate( pamh, 0 );
pam_auth_trys++; pam_auth_trys++;
#ifdef sun #ifdef legacysun
pwd = getpwnam(user); pwd = getpwnam(user);
audit_login_save_pw(pwd); audit_login_save_pw(pwd);
@ -262,7 +262,7 @@ PamAccounting( char* prog_name,
Debug("PamAccounting: USER_PROCESS open_session error=%d\n", Debug("PamAccounting: USER_PROCESS open_session error=%d\n",
status); status);
} }
#ifdef sun #ifdef legacysun
if (status == PAM_SUCCESS) audit_login_success(); if (status == PAM_SUCCESS) audit_login_success();
#endif #endif
session_type = SOLARIS_LOGIN; session_type = SOLARIS_LOGIN;
@ -450,7 +450,7 @@ login_conv(int num_msg, struct pam_message **msg,
if (saved_user_passwd != NULL) { if (saved_user_passwd != NULL) {
r->resp = (char *) malloc(strlen(saved_user_passwd)+1); r->resp = (char *) malloc(strlen(saved_user_passwd)+1);
if (r->resp == NULL) { if (r->resp == NULL) {
__pam_free_resp(num_msg, *response); /* __pam_free_resp(num_msg, *response); */
*response = NULL; *response = NULL;
return (PAM_CONV_ERR); return (PAM_CONV_ERR);
} }

2
cde/programs/dtlogin/sysauth.c
View file

@ -1430,7 +1430,7 @@ Authenticate( struct display *d, char *name, char *passwd, char **msg )
case PAM_SUCCESS: case PAM_SUCCESS:
return(VF_OK); return(VF_OK);
case PAM_AUTHTOKEN_REQD: case PAM_NEW_AUTHTOK_REQD:
return(VF_PASSWD_AGED); return(VF_PASSWD_AGED);
default: default:

2
cde/programs/dtmail/MotifApp/SelectFileCmd.C
View file

@ -88,7 +88,7 @@ extern XtPointer _XmStringUngenerate (
} }
extern int forceUpdate( Widget ); extern void forceUpdate( Widget );
SelectFileCmd::SelectFileCmd (const char * name, SelectFileCmd::SelectFileCmd (const char * name,
const char * label, const char * label,

10
cde/programs/dtmail/dtmail/DmxUtils.C
View file

@ -201,16 +201,16 @@ dispname(const char *hdr)
if (hdr == 0) if (hdr == 0)
return 0; return 0;
if (((cp = strchr(hdr, '<')) != 0) && (cp > hdr)) { if (((cp = const_cast <char *> (strchr(hdr, '<'))) != 0) && (cp > hdr)) {
*cp = 0; *cp = 0;
if ((*hdr == '"') && ((cp = strrchr(++hdr, '"')) != 0)) if ((*hdr == '"') && ((cp = const_cast <char *> (strrchr(++hdr, '"'))) != 0))
*cp = 0; *cp = 0;
return (char *)hdr; return (char *)hdr;
} else if ((cp = strchr(hdr, '(')) != 0) { } else if ((cp = const_cast <char *> (strchr(hdr, '('))) != 0) {
hdr = ++cp; hdr = ++cp;
if ((cp = strchr(hdr, '+')) != 0) if ((cp = const_cast <char *> (strchr(hdr, '+'))) != 0)
*cp = 0; *cp = 0;
if ((cp = strrchr(hdr, ')')) != 0) if ((cp = const_cast <char *> (strrchr(hdr, ')'))) != 0)
*cp = 0; *cp = 0;
return (char *)hdr; return (char *)hdr;
} }

2
cde/programs/dtmail/dtmail/FindDialog.C
View file

@ -728,7 +728,7 @@ FindDialog::compareMessage(DtMailMessageHandle handle)
return(found); return(found);
} }
#if !defined(CSRG_BASED) && !defined(linux) #if !defined(CSRG_BASED) && !defined(linux) && !defined(sun)
// //
// See if string 'toFind' is anyware in string 'str'. // See if string 'toFind' is anyware in string 'str'.
// A case-insensitive version of strstr(). // A case-insensitive version of strstr().

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

@ -957,6 +957,12 @@ Usage(char *progname)
nl_catd DT_catd = (nl_catd) -1; // catgets file descriptor nl_catd DT_catd = (nl_catd) -1; // catgets file descriptor
#if defined(reallyoldsun) || defined(USL)
#define SA_HANDLER_TYPE void (*)(void)
#else
#define SA_HANDLER_TYPE void (*)(int)
#endif
void RoamApp::initialize(int *argcp, char **argv) void RoamApp::initialize(int *argcp, char **argv)
{ {
char **av = argv; char **av = argv;
@ -991,11 +997,7 @@ void RoamApp::initialize(int *argcp, char **argv)
action = &action_buf; action = &action_buf;
memset((void*) action, 0, sizeof(struct sigaction)); memset((void*) action, 0, sizeof(struct sigaction));
#ifdef USL action->sa_handler = (SA_HANDLER_TYPE) panicQuitSignalHandler;
action->sa_handler = (void (*)())panicQuitSignalHandler;
#else
action->sa_handler = panicQuitSignalHandler;
#endif
action->sa_flags = 0; action->sa_flags = 0;
sigaction(SIGHUP, action, NULL); sigaction(SIGHUP, action, NULL);
sigaction(SIGINT, action, NULL); sigaction(SIGINT, action, NULL);

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

@ -143,7 +143,7 @@ extern XtPointer _XmStringUngenerate (
#include <sys/file.h> #include <sys/file.h>
extern int forceUpdate( Widget ); extern void forceUpdate( Widget );
RoamCmd::RoamCmd RoamCmd::RoamCmd
(char *name, char *label, int active, RoamMenuWindow *window) (char *name, char *label, int active, RoamMenuWindow *window)

2
cde/programs/dtmail/dtmail/RoamInterruptibleCmd.C
View file

@ -48,7 +48,7 @@
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <Xm/MessageB.h> #include <Xm/MessageB.h>
#include <assert.h> #include <assert.h>
extern int forceUpdate( Widget ); extern void forceUpdate( Widget );
RoamInterruptibleCmd::RoamInterruptibleCmd ( char *name, RoamInterruptibleCmd::RoamInterruptibleCmd ( char *name,

10
cde/programs/dtmail/dtmailpr/utils.C
View file

@ -190,16 +190,16 @@ dispname(const char *hdr)
if (hdr == 0) if (hdr == 0)
return 0; return 0;
if (((cp = strchr(hdr, '<')) != 0) && (cp > hdr)) { if (((cp = const_cast <char *> (strchr(hdr, '<'))) != 0) && (cp > hdr)) {
*cp = 0; *cp = 0;
if ((*hdr == '"') && ((cp = strrchr(++hdr, '"')) != 0)) if ((*hdr == '"') && ((cp = const_cast <char *> (strrchr(++hdr, '"'))) != 0))
*cp = 0; *cp = 0;
return (char *)hdr; return (char *)hdr;
} else if ((cp = strchr(hdr, '(')) != 0) { } else if ((cp = const_cast <char *> (strchr(hdr, '('))) != 0) {
hdr = ++cp; hdr = ++cp;
if ((cp = strchr(hdr, '+')) != 0) if ((cp = const_cast <char *> (strchr(hdr, '+'))) != 0)
*cp = 0; *cp = 0;
if ((cp = strrchr(hdr, ')')) != 0) if ((cp = const_cast <char *> (strrchr(hdr, ')'))) != 0)
*cp = 0; *cp = 0;
return (char *)hdr; return (char *)hdr;
} }

2
cde/programs/dtmail/include/DtMail/Buffer.hh
View file

@ -103,7 +103,7 @@ class BufferMemory : public Buffer {
virtual int getSize(void); // get total size of the buffer virtual int getSize(void); // get total size of the buffer
private: private:
#if !defined(linux) && !defined(CSRG_BASED) #if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
class Chunk; class Chunk;
#endif #endif

4
cde/programs/dtmail/libDtMail/Common/DtMailServer.C
View file

@ -160,7 +160,7 @@ DtMailServer::set_password(char *password)
// //
// len - Length of message. // len - Length of message.
// //
#if defined(sun) || defined(USL) #if defined(reallyoldsun) || defined(USL)
#define SA_HANDLER_TYPE void (*)(void) #define SA_HANDLER_TYPE void (*)(void)
#else #else
#define SA_HANDLER_TYPE void (*)(int) #define SA_HANDLER_TYPE void (*)(int)
@ -231,7 +231,7 @@ DtMailServer::ptrans_retrieve_readandappend(
// Determine if we are done with this message. // Determine if we are done with this message.
if (proto_is_delimited()) if (proto_is_delimited())
{ {
char *s = strrchr((const char *) _msgbuf, (int) '.'); char *s = const_cast<char *> (strrchr((const char *) _msgbuf, (int) '.'));
if (s && if (s &&
(s == _msgbuf || *(s-1) == '\n') && (s == _msgbuf || *(s-1) == '\n') &&

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

@ -783,7 +783,7 @@ DtMail::Session::getRelativePath(DtMailEnv & error, const char * path)
free(old_exp); free(old_exp);
// Check to see if the path starts with the folder path. // Check to see if the path starts with the folder path.
char * matched_path = strstr(path, exp_name); char * matched_path = const_cast<char *>(strstr(path, exp_name));
if (matched_path == path) { if (matched_path == path) {
// Yes it does, make it a relative path to the folder dir. // Yes it does, make it a relative path to the folder dir.
int folder_path_length = strlen(exp_name); int folder_path_length = strlen(exp_name);

4
cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
View file

@ -938,9 +938,9 @@ MIMEBodyPart::csFromContentType(DtMailValueSeq &value)
} }
} }
// Get charset value // Get charset value
val_ptr = strstr(val, "charset="); val_ptr = const_cast <char *> (strstr(val, "charset="));
if ( val_ptr == NULL ) { if ( val_ptr == NULL ) {
val_ptr = strstr(val, "CHARSET="); val_ptr = const_cast <char *> (strstr(val, "CHARSET="));
} }
if ( val_ptr == NULL ) { if ( val_ptr == NULL ) {
return NULL; return NULL;

4
cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
View file

@ -122,7 +122,7 @@ getNamedValueString(const char *string, const char *name)
results = strdup(&string[offset + nameLen + 1]); results = strdup(&string[offset + nameLen + 1]);
if (*results == '"') { if (*results == '"') {
results++; results++;
stringEnd = strchr(results, '"'); stringEnd = const_cast <char *> (strchr(results, '"'));
if (stringEnd != NULL) { if (stringEnd != NULL) {
*stringEnd = '\0'; *stringEnd = '\0';
} }
@ -420,7 +420,7 @@ RFCMailBox::_assemblePartial(DtMailEnv & error,
// //
embHeader1StLen = (int) length; embHeader1StLen = (int) length;
embHeader1St = (const char *)contents; embHeader1St = (const char *)contents;
endHeader = strstr((const char *)contents, "\n\n"); endHeader = const_cast <char *> (strstr((const char *)contents, "\n\n"));
if (endHeader != NULL) { if (endHeader != NULL) {
RFCEnvelope embEnv(error, RFCEnvelope embEnv(error,

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

@ -4542,6 +4542,12 @@ RFCMailBox::startAutoSave(DtMailEnv & error,
_session->removeEventRoutine(error, PollEntry, this); _session->removeEventRoutine(error, PollEntry, this);
} }
#if defined(reallyoldsun) || defined(USL)
#define SA_HANDLER_TYPE void (*)(void)
#else
#define SA_HANDLER_TYPE void (*)(int)
#endif
void void
RFCMailBox::dumpMaps(const char *str) RFCMailBox::dumpMaps(const char *str)
{ {
@ -4573,11 +4579,7 @@ RFCMailBox::dumpMaps(const char *str)
*/ */
(void) sigemptyset(&sig_act.sa_mask); (void) sigemptyset(&sig_act.sa_mask);
sig_act.sa_flags = 0; sig_act.sa_flags = 0;
#if defined(USL) sig_act.sa_handler = (SA_HANDLER_TYPE) SigBusHandler;
sig_act.sa_handler = (void(*)())SigBusHandler;
#else
sig_act.sa_handler = SigBusHandler;
#endif /* USL */
sigaction(SIGBUS, &sig_act, &old_sig_act); sigaction(SIGBUS, &sig_act, &old_sig_act);
sigbus_env_valid = 1; sigbus_env_valid = 1;
if (setjmp(sigbus_env) == 0) { if (setjmp(sigbus_env) == 0) {

2
cde/programs/dtpdm/Imakefile
View file

@ -26,7 +26,7 @@ SYS_LIBRARIES = -lmsaa -liconv
#endif #endif
#if defined (SunArchitecture) #if defined (SunArchitecture)
SYS_LIBRARIES = -lintl -L/opt/SUNWspro/SC2.0.1 -lm -lgen -ldl -lC SYS_LIBRARIES = -lintl -lm -lgen -ldl -lC
#endif #endif
PROGRAMS = dtpdm PROGRAMS = dtpdm

10
cde/programs/dtprintinfo/libUI/BaseUI.h
View file

@ -40,6 +40,16 @@
#define boolean boolean_t #define boolean boolean_t
#define true B_TRUE #define true B_TRUE
#define false B_FALSE #define false B_FALSE
#elif defined(sun)
#include <sys/types.h>
#define boolean boolean_t
#if defined(__XOPEN_OR_POSIX)
#define true _B_TRUE
#define false _B_FALSE
#else
#define true B_TRUE
#define false B_FALSE
#endif
#elif defined(linux) #elif defined(linux)
#define false 0 #define false 0
#define true 1 #define true 1

10
cde/programs/dtprintinfo/objects/BaseObj.h
View file

@ -41,6 +41,16 @@
#define boolean boolean_t #define boolean boolean_t
#define true B_TRUE #define true B_TRUE
#define false B_FALSE #define false B_FALSE
#elif defined(sun)
#include <sys/types.h>
#define boolean boolean_t
#if defined(__XOPEN_OR_POSIX)
#define true _B_TRUE
#define false _B_FALSE
#else
#define true B_TRUE
#define false B_FALSE
#endif
#elif defined(linux) #elif defined(linux)
#define false 0 #define false 0
#define true 1 #define true 1

2
cde/programs/dtscreen/dtscreen.h
View file

@ -111,7 +111,7 @@ struct passwd {
#include <shadow.h> #include <shadow.h>
#define getpwnam getspnam #define getpwnam getspnam
#endif #endif
#if !(defined(_AIX) || defined(hpux)) #if !(defined(_AIX) || defined(hpux) || defined(sun))
# define srandom srand # define srandom srand
# define random rand # define random rand
# define MAXRAND (32767.0) # define MAXRAND (32767.0)

2
cde/programs/dtscreen/usleep.c
View file

@ -41,7 +41,7 @@
#include "dtscreen.h" #include "dtscreen.h"
#if !defined(_AIX) && !defined(hpV4) && !defined(linux) && !defined(CSRG_BASED) #if !defined(_AIX) && !defined(hpV4) && !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
int int
usleep(unsigned long usec) usleep(unsigned long usec)
{ {

2
cde/programs/dtscreen/worm.c
View file

@ -88,7 +88,7 @@ typedef struct {
int size[MAXCOLORS]; int size[MAXCOLORS];
} wormstruct; } wormstruct;
#if !defined(CSRG_BASED) #if !defined(CSRG_BASED) && !defined(sun)
int int
round(x) round(x)
float x; float x;

2
cde/programs/dtterm/util/logger.c
View file

@ -72,7 +72,7 @@ main(int argc, char **argv)
} }
/* init data... */ /* init data... */
#if defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED) #if defined(USL) || defined(__uxp__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
(void) memset((void *) &myaddr_in, (int) '\0', sizeof(myaddr_in)); (void) memset((void *) &myaddr_in, (int) '\0', sizeof(myaddr_in));
#else #else
(void) memset(myaddr_in, '\0', sizeof(myaddr_in)); (void) memset(myaddr_in, '\0', sizeof(myaddr_in));