debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

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

@@ -35,7 +35,7 @@
#include "tt_options.h"
#include <errno.h>
#include <string.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(sun)

4
cde/lib/tt/bin/shell/rcopier.C
View File

@@ -34,11 +34,7 @@
#include "tt_options.h"
#include <string.h>
#ifdef __osf__
#include <unistd.h>
#else
#include <osfcn.h>
#endif
#if defined(OPT_BUG_SUNOS_4)
# include <stdlib.h>
#endif

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

@@ -35,7 +35,7 @@
#include "tt_options.h"
#include <errno.h>
#include <string.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(sun)

6
cde/lib/tt/bin/ttdbserverd/db_server_svc.C
View File

@@ -214,7 +214,7 @@ main(int argc, char** argv, char **envp)
void install_signal_handler();
SVCXPRT *transp;
struct sockaddr_in saddr;
#if defined(DEC) || defined(HPUX)
#if defined(HPUX)
int asize = sizeof(saddr);
#else
# if defined(linux) || defined(CSRG_BASED) || defined(sun)
@@ -484,11 +484,11 @@ main(int argc, char** argv, char **envp)
if (!_tt_debug_mode) {
if (0!=fork()) exit(0);
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
setsid();
#else
setpgrp();
#endif // __osf__
#endif //CSRG_BASED
close(0); close(1); close(2);

2
cde/lib/tt/bin/tttar/tttar.C
View File

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

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

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

4
cde/lib/tt/bin/tttar/tttar_spec.C
View File

@@ -32,11 +32,11 @@
*
*/
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h>
#else
#include <osfcn.h>
#endif /* __osf__ */
#endif
#include "api/c/tt_c.h"
#include "util/tt_iostream.h"
#include "tttar_utils.h"

13
cde/lib/tt/lib/api/c/api_filemap.C
View File

@@ -242,19 +242,6 @@ printf("DEBUG _tt_host_netfile_file: resolving locally.\n");
return _tt_netfile_file(netfilename);
}
#ifdef __osf__
// hostname and localhost were not the same, so make one more check
// of the environment variable created by /usr/dt/bin/Xsession. If
// we have started the system without a network configured, this will
// be true during an initial system installation.
if (getenv("DTNONETWORK")) {
// strdup already done in _tt_netfile_file()
return _tt_file_netfile(netfilename);
}
#endif /* __osf__ */
_Tt_string path(netfilename);
_Tt_string file;

24
cde/lib/tt/lib/db/db_server_xdr.C
View File

@@ -380,17 +380,6 @@ xdr_Tt_oidaccess_args(XDR *xdrs, _Tt_oidaccess_args *objp)
bool_t
xdr_Tt_oidaccess_results(XDR *xdrs, _Tt_oidaccess_results *objp)
{
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->uid)) {
return (FALSE);
}
if (!xdr_u_int(xdrs, (u_int *)&objp->group)) {
return (FALSE);
}
if (!xdr_u_int(xdrs, (u_int *)&objp->mode)) {
return (FALSE);
}
#else
if (!xdr_long(xdrs, (long *)&objp->uid)) {
return (FALSE);
}
@@ -400,7 +389,6 @@ xdr_Tt_oidaccess_results(XDR *xdrs, _Tt_oidaccess_results *objp)
if (!xdr_short(xdrs, (short *)&objp->mode)) {
return (FALSE);
}
#endif
if (!xdr_int(xdrs, &objp->result)) {
return (FALSE);
}
@@ -515,25 +503,13 @@ xdr_tt_property(XDR *xdrs, _tt_property *objp)
bool_t
xdr_tt_access(XDR *xdrs, _tt_access *objp)
{
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->user)) {
#else
if (!xdr_long(xdrs, (long *)&objp->user)) {
#endif /* __osf__ */
return (FALSE);
}
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->group)) {
#else
if (!xdr_long(xdrs, (long *)&objp->group)) {
#endif /* __osf__ */
return (FALSE);
}
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->mode)) {
#else
if (!xdr_u_long(xdrs, (unsigned long *)&objp->mode)) {
#endif /* __osf__ */
return (FALSE);
}
return (TRUE);

2
cde/lib/tt/lib/db/tt_db_file.h
View File

@@ -40,7 +40,7 @@
#include "db/tt_db_hostname_global_map_ref.h"
#include "db/tt_db_access_utils.h"
#include "db/tt_db_property_utils.h"
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX) || defined(__osf__)
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX)
# undef copy
#endif

7
cde/lib/tt/lib/db/tt_db_key.h
View File

@@ -46,16 +46,9 @@
struct _Tt_key_data {
unsigned short version;
unsigned short padding;
#ifdef __osf__
/* These fields need to be: <host id:4> <time sec:4> <counter:4> */
unsigned int hostid;
unsigned int time_sec;
unsigned int counter;
#else
unsigned long hostid;
unsigned long time_sec;
unsigned long counter;
#endif /* __osf__ */
};
const int TT_DB_KEY_LENGTH = sizeof(_Tt_key_data);

6
cde/lib/tt/lib/libtt.elist
View File

@@ -667,11 +667,7 @@ privateC++ _Tt_trace::operator<<(int) const
privateC++ _Tt_trace::print(void (*)(const _Tt_ostream&,const _Tt_object*),const _Tt_object*) const
privateC++ _Tt_xdr_size_stream::_Tt_xdr_size_stream(void)
privateC++ _Tt_xdr_size_stream::operator XDR*(void)
#ifdef __osf__
privateC++ _tt_base64_encode(unsigned int)
#else /* __osf__ */
privateC++ _tt_base64_encode(unsigned long)
#endif /* __osf__ */
privateC++ _tt_catgets(int,int,const char*)
privateC++ _tt_db_create_objid(const _Tt_db_key_ptr&,const _Tt_string&,const _Tt_string&,const _Tt_string&)
privateC++ _tt_dir_entries(const _Tt_string&,int)
@@ -2561,7 +2557,7 @@ internal __page_size_K
internal _mutex_global_np
#endif
#if defined(_AIX) || defined(__osf__)
#if defined(_AIX)
/* Symbols from realpath.c */
internal _tt_internal_realpath
#endif

2
cde/lib/tt/lib/mp/mp_session.C
View File

@@ -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) || defined(__osf__)
#if defined(ultrix) || 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) {

28
cde/lib/tt/lib/tt_options.h
View File

@@ -408,34 +408,6 @@
# undef OPT_TAR_HAS_EXCLUDE_OPTION
# define OPT_BUG_RPCINTR
#elif defined(__osf__)
# define 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_BSD_SIGNAL
# define OPT_POSIX_SIGNAL
# undef OPT_BSD_WAIT
# undef OPT_PATCH
# undef OPT_I18N
# define OPT_CATGETS
# undef OPT_GETDTABLESIZE
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
# define OPT_DEFINE_SIG_PF
# undef OPT_TAR_HAS_EXCLUDE_OPTION
# undef OPT_HAS_REALPATH
# if defined(OSMAJORVERSION) && (OSMAJORVERSION >= 4)
# define OPT_XDR_LONG_TYPE int
# endif
#elif defined(linux)
# undef OPT_UNIX_SOCKET_RPC

28
cde/lib/tt/lib/util/tt_base64.C
View File

@@ -75,19 +75,6 @@ static const char base64_values[256] = {
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64};
#ifdef __osf__
/*
* _tt_base64_encode(i) -- convert number to base-64 character string
*
* Purpose: Convert an int value (typically a time) to a "base-64"
* representation. Return a _Tt_string containing
* the representation, not including any leading zeroes.
*/
_Tt_string
_tt_base64_encode(unsigned int i)
{
int maxlen = (sizeof(int)*8+5)/6;
#else /* __osf__ */
/*
* _tt_base64_encode(i) -- convert number to base-64 character string
*
@@ -99,7 +86,6 @@ _Tt_string
_tt_base64_encode(unsigned long i)
{
int maxlen = (sizeof(long)*8+5)/6;
#endif /* __osf__ */
_Tt_string retval(maxlen);
int c = maxlen-1;
@@ -116,19 +102,6 @@ _tt_base64_encode(unsigned long i)
return retval;
}
#ifdef __osf__
/*
* _tt_base64_decode(i) -- convert base-64 character string to number
*
* Purpose: Convert a string in a "base-64"
* representation to an unsigned int.
*/
unsigned int
_tt_base64_decode(const char *s)
{
int c,v;
unsigned int r;
#else /* __osf__ */
/*
* _tt_base64_decode(i) -- convert base-64 character string to number
*
@@ -140,7 +113,6 @@ _tt_base64_decode(const char *s)
{
int c,v;
unsigned long r;
#endif /* __osf__ */
r = 0;
while (c = *s++) {

5
cde/lib/tt/lib/util/tt_base64.h
View File

@@ -40,13 +40,8 @@
#include "util/tt_string.h"
#ifdef __osf__
unsigned int _tt_base64_decode(const char *s);
_Tt_string _tt_base64_encode(unsigned int n);
#else /* __osf__ */
unsigned long _tt_base64_decode(const char *s);
_Tt_string _tt_base64_encode(unsigned long n);
#endif /* __osf__ */
#endif /* _TT_BASE64_H */

2
cde/lib/tt/lib/util/tt_entry_pt.C
View File

@@ -449,7 +449,7 @@ _Tt_string _tt_entrypt_to_string(_Tt_entry_pt fun)
return "tt_feature_enabled";
case TT_FEATURE_REQUIRED :
return "tt_feature_required";
#if defined(__osf__) || defined(linux)
#if defined(linux)
case TT_API_CALL_LAST: return (char *) NULL;
#elif defined(OPT_CONST_CORRECT)
case TT_API_CALL_LAST: return (const char *) NULL;

18
cde/lib/tt/lib/util/tt_file_system.C
View File

@@ -83,15 +83,13 @@
# define ttFsName(e) vmt2dataptr(e,VMT_OBJECT)
# define ttMountPt(e) vmt2dataptr(e,VMT_STUB)
# define ttCloseMntTbl(f) free(tmpbuf)
#elif defined(__osf__) || defined(CSRG_BASED)
#elif defined(CSRG_BASED)
# include <sys/types.h>
# include <sys/mount.h>
#if defined(HAS_STATVFS)
extern "C" int getfsstat(struct statvfs *, long, int);
#elif defined(__osf__)
extern "C" int getfsstat(struct statfs *, long, int);
# endif
# define MNTTYPE_NFS "nfs"
@@ -104,15 +102,7 @@
# define TtMntEntry struct statfs *
# endif
# ifdef __osf__
# define ttFsType(e) \
(((e)->f_type == MOUNT_UFS) ? "ufs" \
: (((e)->f_type == MOUNT_NFS3) ? "nfs" \
: (((e)->f_type == MOUNT_NFS) ? "nfs" \
: (((e)->f_type == MOUNT_CDFS) ? "cdfs" \
: (((e)->f_type == MOUNT_PROCFS) ? "procfs" \
: "unknown")))))
# elif defined(CSRG_BASED)
# if defined(CSRG_BASED)
# define ttFsType(e) (e->f_fstypename)
# endif
# define ttFsName(e) ((char *)((e)->f_mntfromname))
@@ -510,7 +500,7 @@ updateFileSystemEntries ()
}
entry = &buf[i];
#elif defined(__osf__) || defined(CSRG_BASED)
#elif defined(CSRG_BASED)
int numfs,i;
struct statfs *buf;
long bufsize;
@@ -549,7 +539,7 @@ updateFileSystemEntries ()
#else
while (entry = getmntent(mount_table))
#endif
#if !defined(__osf__) && !defined(CSRG_BASED)
#if !defined(CSRG_BASED)
{
#endif
fse = createFileSystemEntry( entry );

10
cde/lib/tt/lib/util/tt_host.C
View File

@@ -45,13 +45,9 @@ extern "C" in_addr_t inet_addr(const char *);
#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
#ifdef __osf__
#include <unistd.h>
#else
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h>
#endif
#endif /* __osf */
#define X_INCLUDE_NETDB_H
#define XOS_USE_XT_LOCKING
@@ -162,14 +158,8 @@ init_byaddr(_Tt_string addr)
int _Tt_host::
init_bystringaddr(_Tt_string addr)
{
#ifdef __osf__
unsigned int *ip_address;
unsigned int ip_address_buf;
#else
unsigned long *ip_address;
unsigned long ip_address_buf;
#endif
struct hostent *addr_ret;
_Xgethostbynameparams addr_buf;

5
cde/lib/tt/lib/util/tt_iostream.C
View File

@@ -225,9 +225,8 @@ _Tt_ostream::operator <<(
return *this;
}
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
/* This operator is being added to take care of uid_t and gid_t
* for osf */
#if defined(linux) || defined(CSRG_BASED)
// This operator is being added to take care of uid_t and gid_t
const _Tt_ostream &
_Tt_ostream::operator <<(
unsigned int n

2
cde/lib/tt/lib/util/tt_iostream.h
View File

@@ -86,7 +86,7 @@ class _Tt_ostream : public virtual _Tt_allocated {
const _Tt_ostream &operator <<(
int n
) const;
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
const _Tt_ostream &operator <<(
unsigned int n
) const;

4
cde/lib/tt/lib/util/tt_log.C
View File

@@ -34,13 +34,9 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef __osf__
#include <unistd.h>
#else
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h>
#endif
#endif /* __osf__ */
#define X_INCLUDE_TIME_H
#define XOS_USE_XT_LOCKING

2
cde/lib/tt/lib/util/tt_object_list.h
View File

@@ -37,7 +37,7 @@
#include <rpc/rpc.h>
#include <util/tt_ptr.h>
#include <util/tt_object.h>
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX) || defined(__osf__)
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX)
# undef remove
#endif

15
cde/lib/tt/lib/util/tt_port.C
View File

@@ -122,15 +122,6 @@ _tt_gethostname()
}
#endif /* OPT_GETHOSTNAME */
#ifdef __osf__
// An environment variable will be created by /usr/dt/bin/Xsession if
// we have started the system without a network configured. This will
// be true during an initial system installation.
if (getenv("DTNONETWORK"))
result = default_hostname;
#endif
return result;
}
@@ -209,11 +200,11 @@ _tt_gethostid(void)
sscanf(serial_num, "%12lx", &_hostid);
}
}
#elif defined(hpux) || defined(_AIX) || defined(__osf__)
#elif defined(hpux) || defined(_AIX)
struct utsname uts_name;
uname(&uts_name);
# if defined(_AIX) || defined(__osf__)
# if defined(_AIX)
_hostid = atol(uts_name.machine);
# else
_hostid = atol(uts_name.idnumber);
@@ -374,7 +365,7 @@ _tt_vsyslog(
return;
}
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) || defined(__osf__)
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX)
char buf[5000];
vsprintf( buf, _format, args );
syslog( priority, buf );

2
cde/lib/tt/lib/util/tt_string.h
View File

@@ -53,8 +53,6 @@ extern "C" {
#include <wctype.h>
#elif defined(OPT_BUG_AIX)
#include <string.h>
#elif defined(__osf__)
#include <wchar.h>
#endif
#include <rpc/rpc.h>

3
cde/lib/tt/lib/util/tt_tracefile_parse.C
View File

@@ -41,8 +41,7 @@
#include "util/tt_trace_parser.h"
#include "util/tt_entry_pt_names.h"
#if defined (_AIX) || defined(hpux) || defined(__osf__) || defined(linux) || \
defined(CSRG_BASED)
#if defined (_AIX) || defined(hpux) || defined(linux) || defined(CSRG_BASED)
#include <fcntl.h>
#endif

4
cde/lib/tt/lib/util/tt_xdr_utils.C
View File

@@ -81,7 +81,7 @@ tt_x_putbytes(XDR *xp, caddr_t, int len)
return TRUE;
}
#if defined(ultrix) || defined(__osf__)
#if defined(ultrix)
static int*
#elif defined(CSRG_BASED)
static int32_t*
@@ -104,7 +104,7 @@ 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) || defined(__osf__)
#if defined(ultrix)
return (int *) xp->x_private;
#elif defined(CSRG_BASED)
return (int32_t *) xp->x_private;

2
cde/lib/tt/slib/mp_s_session.C
View File

@@ -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) || defined(__osf__)
#if defined(ultrix) || 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) {