debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove ultrix support

Browse Source
This commit is contained in:
chase
2018-09-30 12:28:53 -05:00
committed by Jon Trulson
parent d8c017caa2
commit 90a2b2848a
56 changed files with 41 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cde/lib/tt/lib/api/c/api_xdr.h
View File

@@ -41,11 +41,6 @@
#include <rpc/xdr.h>
#include <util/tt_rpc_xdr.h>
#if defined(ultrix)
#include <rpc/xdr.h>
#define bool_t int
#endif
bool_t _tt_xdr_cstring_list(XDR *xdrs, char ***ar);
#endif /* _API_XDR_H */

11
cde/lib/tt/lib/mp/mp_desktop.h
View File

@@ -38,17 +38,6 @@
#include <mp/mp_global.h>
#include <util/tt_object.h>
#if defined(ultrix)
extern "C"
{ extern struct XSizeHints;
extern struct XStandardColormap;
extern struct XTextProperty;
extern struct XWMHints;
extern struct XClassHint;
};
#endif
enum _Tt_dt_type {
_TT_DESKTOP_X11,
_TT_DESKTOP_LAST

2
cde/lib/tt/lib/mp/mp_rpc.h
View File

@@ -45,7 +45,7 @@
# undef __SVR4_I386_ABI_L1__
#endif
#if defined(ultrix) || defined(_AIX)
#if defined(_AIX)
extern "C" {
void svcerr_auth (SVCXPRT *, enum auth_stat);
SVCXPRT *svcfd_create(int,int,int);

12
cde/lib/tt/lib/mp/mp_rpc_client.C
View File

@@ -31,7 +31,7 @@
*
* Copyright (c) 1990 by Sun Microsystems, Inc.
*/
#include <sys/time.h> // ultrix
#include <sys/time.h>
#include <stdio.h>
#include <signal.h>
#include <errno.h>
@@ -50,16 +50,6 @@
#include "util/tt_host.h"
#include "util/tt_port.h"
#if defined(ultrix)
extern "C"
{ extern struct XSizeHints;
extern struct XStandardColormap;
extern struct XTextProperty;
extern struct XWMHints;
extern struct XClassHint;
};
#endif
#if defined(_AIX)
/* AIX's FD_ZERO macro uses bzero() without declaring it. */
#include <strings.h>

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)
#if 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) {

4
cde/lib/tt/lib/mp/mp_stream_socket.C
View File

@@ -57,10 +57,6 @@
#include <sys/time.h>
#if defined(ultrix)
extern "C" unsigned long inet_addr(char *);
#endif
#include <arpa/inet.h>
/*

144
cde/lib/tt/lib/realpath.ultrix.c
View File

@@ -1,144 +0,0 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
/*%% (c) Copyright 1993, 1994 Hewlett-Packard Company */
/*%% (c) Copyright 1993, 1994 International Business Machines Corp. */
/*%% (c) Copyright 1993, 1994 Sun Microsystems, Inc. */
/*%% (c) Copyright 1993, 1994 Novell, Inc. */
/*%% $XConsortium: realpath.ultrix.c /main/3 1995/10/23 09:50:04 rswiston $ */
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
#include <strings.h>
char *
realpath(pathname, finalpath)
char *pathname;
char *finalpath;
{
struct stat sbuf;
char curpath[MAXPATHLEN],
workpath[MAXPATHLEN],
linkpath[MAXPATHLEN],
namebuf[MAXPATHLEN],
*where,
*ptr,
*last;
int len;
strcpy(curpath, pathname);
if (*pathname != '/') {
#if defined(__STDC__) && defined(hp)
if (!getcwd(workpath)) {
#else
if (!getwd(workpath)) {
#endif
strcpy(finalpath, ".");
return(NULL);
}
} else *workpath = NULL;
/* curpath is the path we're still resolving */
/* linkpath is the path a symbolic link points to */
/* workpath is the path we've resolved */
loop:
where = curpath;
while (*where != NULL) {
if (!strcmp(where, ".")) {
where++;
continue;
}
/* deal with "./" */
if (!strncmp(where, "./", 2)) {
where += 2;
continue;
}
/* deal with "../" */
if (!strncmp(where, "../", 3)) {
where += 3;
ptr = last = workpath;
while (*ptr) {
if (*ptr == '/') last = ptr;
ptr++;
}
*last = NULL;
continue;
}
ptr = strchr(where, '/');
if (!ptr)
ptr = where + strlen(where) - 1;
else
*ptr = NULL;
strcpy(namebuf, workpath);
for (last = namebuf; *last; last++) continue;
/* tack on a trailing, or leading, `/` */
if (last == namebuf || *--last != '/') {
strcat(namebuf, "/");
}
strcat(namebuf, where);
where = ++ptr;
if (lstat(namebuf, &sbuf) == -1) {
strcpy(finalpath, namebuf);
return(NULL);
}
if ((sbuf.st_mode & S_IFLNK) == S_IFLNK) {
len = readlink(namebuf, linkpath, MAXPATHLEN);
if (len == 0) {
strcpy(finalpath, namebuf);
return(NULL);
}
*(linkpath + len) = NULL; /* readlink doesn't null-terminate result */
if (*linkpath == '/') *workpath = NULL;
if (*where) {
strcat(linkpath, "/");
strcat(linkpath, where);
}
strcpy(curpath, linkpath);
goto loop;
}
if ((sbuf.st_mode & S_IFDIR) == S_IFDIR) {
strcpy(workpath, namebuf);
continue;
}
if (*where) {
strcpy(finalpath, namebuf);
return(NULL); /* path/notadir/morepath */
} else
strcpy(workpath, namebuf);
}
strcpy(finalpath, workpath);
return(finalpath);
}

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

@@ -355,17 +355,6 @@
# undef OPT_CLASSING_ENGINE
# define OPT_TAR_HAS_EXCLUDE_OPTION
#elif defined(ultrix)
# undef 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_TAR_HAS_EXCLUDE_OPTION
#elif defined(__hpux) || defined(hpux)
# undef OPT_UNIX_SOCKET_RPC

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

@@ -33,9 +33,6 @@
*/
#include "util/tt_int_rec.h"
#include "util/tt_iostream.h"
#if defined(ultrix)
#include <rpc/types.h>
#endif
_Tt_int_rec::
_Tt_int_rec()

3
cde/lib/tt/lib/util/tt_int_rec.h
View File

@@ -35,9 +35,6 @@
#define TT_INT_REC_H
#include <util/tt_object.h>
#include <util/tt_list.h>
#if defined(ultrix)
#include <rpc/types.h>
#endif
/*
* _Tt_int_rec is essentially just a wrapper around an integer so we can

4
cde/lib/tt/lib/util/tt_new.h
View File

@@ -41,10 +41,6 @@
#include <sys/types.h>
#endif /* __STDC__ */
#include <stdlib.h>
#if defined(ultrix)
#include <rpc/types.h>
#define bool_t int
#endif
#if defined(sun)
# define MALLOCTYPE char
#else

4
cde/lib/tt/lib/util/tt_new_ptr.h
View File

@@ -42,10 +42,6 @@
#include "util/tt_generic.h"
#include "util/tt_new.h"
#if defined(ultrix)
#include <rpc/types.h>
#endif
class _Tt_object;
class _Tt_new_ptr : public _Tt_allocated {
protected:

3
cde/lib/tt/lib/util/tt_object.h
View File

@@ -34,9 +34,6 @@
#ifndef _TT_OBJECT_H
#define _TT_OBJECT_H
#include "util/tt_ptr.h"
#if defined(ultrix)
#include <rpc/types.h>
#endif
declare_ptr_to(_Tt_object)

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

@@ -41,10 +41,6 @@
# undef remove
#endif
#if defined(ultrix)
#include <rpc/types.h>
#endif
class _Tt_object_list_element;
class _Tt_object_list_ptr;
class _Tt_object_list: public _Tt_object {

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

@@ -49,9 +49,6 @@
#include <string.h>
#include <memory.h>
#if defined(ultrix)
#include <rpc/types.h>
#endif
#include <stdlib.h>
#include <ctype.h>
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)

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

@@ -59,9 +59,6 @@ extern "C" {
#include "util/tt_list.h"
#include "util/tt_object.h"
#include <memory.h>
#if defined(ultrix)
#define bool_t int
#endif
const int _Tt_string_unlimited = -1;
const int _Tt_string_user_width = -2;

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

@@ -32,10 +32,6 @@
* Copyright (c) 1990 by Sun Microsystems, Inc.
*/
#include <stdint.h>
#if defined(ultrix)
#include <rpc/types.h>
#define bool_t int
#endif
#include <rpc/rpc.h>
#include <util/tt_xdr_utils.h>
#include <memory.h>
@@ -81,9 +77,7 @@ tt_x_putbytes(XDR *xp, caddr_t, int len)
return TRUE;
}
#if defined(ultrix)
static int*
#elif defined(CSRG_BASED) || defined(__linux__)
#if defined(CSRG_BASED) || defined(__linux__)
static int32_t*
#else
static long *
@@ -104,9 +98,8 @@ 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)
return (int *) xp->x_private;
#elif defined(CSRG_BASED) || defined(__linux__)
#if defined(CSRG_BASED) || defined(__linux__)
return (int32_t *) xp->x_private;
#else
return (long *) xp->x_private;