mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
remove ultrix support
This commit is contained in:
parent
d8c017caa2
commit
90a2b2848a
56 changed files with 41 additions and 570 deletions
|
@ -18,22 +18,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
|
|||
* 4. Create a .cf file with the name given by MacroFile.
|
||||
*/
|
||||
|
||||
#ifdef ultrix
|
||||
# define MacroIncludeFile <ultrix.cf>
|
||||
# define MacroFile ultrix.cf
|
||||
# ifdef vax
|
||||
# undef vax
|
||||
# define VaxArchitecture
|
||||
# endif
|
||||
# ifdef mips
|
||||
# undef mips
|
||||
# define MipsArchitecture
|
||||
# endif
|
||||
# undef ultrix
|
||||
# define UltrixArchitecture
|
||||
#endif /* ultrix */
|
||||
|
||||
#if defined(vax) && !defined(UltrixArchitecture)
|
||||
#if defined(vax)
|
||||
# define MacroIncludeFile <bsd.cf>
|
||||
# define MacroFile bsd.cf
|
||||
# undef vax
|
||||
|
|
|
@ -81,7 +81,6 @@ sony.cf \
|
|||
sun.cf \
|
||||
svr3.cf \
|
||||
svr4.cf \
|
||||
ultrix.cf \
|
||||
x386.cf \
|
||||
xfree86.cf
|
||||
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
XCOMM platform: $XConsortium: ultrix.cf /main/68 1996/09/28 16:13:46 rws $
|
||||
|
||||
#ifndef OSName
|
||||
# define OSName DefaultOSName
|
||||
#endif
|
||||
#ifndef OSMajorVersion
|
||||
# define OSMajorVersion DefaultOSMajorVersion
|
||||
#endif
|
||||
#ifndef OSMinorVersion
|
||||
# define OSMinorVersion DefaultOSMinorVersion
|
||||
#endif
|
||||
XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
|
||||
|
||||
#define HasNdbm YES
|
||||
#define HasPutenv YES
|
||||
#define HasShm YES
|
||||
#define LintLibFlag -o
|
||||
#define LintOpts -ax
|
||||
|
||||
#if HasDECnet
|
||||
#define ExtraLibraries -ldnet
|
||||
#endif
|
||||
|
||||
#if ThreadedX
|
||||
/* if you want to experiment, turn this on, but no guarantees */
|
||||
#define HasThreadSafeAPI NO
|
||||
#define HasPosixThreads YES
|
||||
#define ThreadPreStdAPIDefines -DXPRE_STANDARD_API
|
||||
#define ExtraLibraries -lpthreads -li
|
||||
#endif
|
||||
|
||||
#ifdef VaxArchitecture
|
||||
#define PexNativeFPFormat PEXDEC_F_Floating
|
||||
#define NativeFPFormat DEC_F_Float
|
||||
#define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */
|
||||
#define BuildServer NO
|
||||
#endif
|
||||
|
||||
#ifdef MipsArchitecture
|
||||
#if OSMajorVersion > 4 || (OSMajorVersion == 4 && OSMinorVersion >= 2)
|
||||
#define XdecServer YES
|
||||
#define ServerOSDefines -DDDXTIME
|
||||
/* Even under ultrix 4.2, the compiler miscompiles some alloca calls */
|
||||
#define AllocateLocalDefines /* -DINCLUDE_ALLOCA_H */
|
||||
#else
|
||||
#define BuildServer NO
|
||||
#define AllocateLocalDefines /**/
|
||||
#endif
|
||||
#if !HasGcc
|
||||
#define NeedFunctionPrototypes YES
|
||||
#define PexCCOptions -Wf,-XNp15000,-XNd15000
|
||||
/*
|
||||
* NormalLibObjCompile - compile fragment for a library object file
|
||||
* do ld -x to remove line number symbols for libraries
|
||||
*/
|
||||
#define NormalLibObjCompile(options) $(RM) $@ $*.os \ @@\
|
||||
&& $(CC) -c options $(CFLAGS) $*.c \ @@\
|
||||
&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \ @@\
|
||||
&& $(MV) $*.os $@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if HasGcc
|
||||
#ifdef VaxArchitecture
|
||||
#define CcCmd gcc -ansi -Dvax -Dultrix -fpcc-struct-return
|
||||
#endif
|
||||
#ifdef MipsArchitecture
|
||||
#define CcCmd gcc -ansi -Dmips -Dultrix -fpcc-struct-return
|
||||
#endif
|
||||
#define ServerCCOptions /* */
|
||||
#define AllocateLocalDefines /* */
|
||||
#endif
|
||||
|
||||
#define ServerExtraDefines AllocateLocalDefines
|
||||
#define HasWChar32 YES
|
||||
|
||||
#define MotifDefines -DNO_REGEX -DNO_REGCOMP -DNO_CONST
|
|
@ -494,7 +494,7 @@ char *cpp_argv[ARGUMENTS] = {
|
|||
# define DEFAULT_OS_MINOR_REV "r %[0-9]"
|
||||
/* No information available to generate default OSTeenyVersion value. */
|
||||
# define DEFAULT_OS_NAME "srvm %[^\n]"
|
||||
#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__linux__) || defined(sony)
|
||||
#elif defined(sun) || defined(__linux__)
|
||||
/* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
|
||||
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
|
||||
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
|
||||
|
@ -601,9 +601,6 @@ struct symtab predefs[] = {
|
|||
#ifdef __mips__
|
||||
{"__mips__", "1"},
|
||||
#endif
|
||||
#ifdef ultrix
|
||||
{"ultrix", "1"},
|
||||
#endif
|
||||
#ifdef stellar
|
||||
{"stellar", "1"},
|
||||
#endif
|
||||
|
|
|
@ -331,10 +331,3 @@ void PrintElemSummary(Element_t *);
|
|||
void PrintElemTree(Element_t *);
|
||||
void PrintStats(Element_t *);
|
||||
void PrintIDList();
|
||||
|
||||
/* ----- other declarations ----- */
|
||||
|
||||
#ifdef ultrix
|
||||
#define strdup(s) strcpy((char *)malloc(strlen(s)+1), s)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -253,38 +253,10 @@ void DtHelpSetCatalogName(
|
|||
if (catFile == NULL)
|
||||
{
|
||||
/* Setup the short and long versions */
|
||||
#ifdef __ultrix
|
||||
CatFileName = strdup("DtHelp.cat");
|
||||
#else
|
||||
CatFileName = strdup("DtHelp");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef __ultrix
|
||||
|
||||
/* If we have a full path, just use it */
|
||||
if (*catFile == '/')
|
||||
CatFileName = strdup(catFile);
|
||||
else
|
||||
{
|
||||
/* We don't have a full path, and the ultirx os needs the
|
||||
* ".cat" extention so let's make sure its there.
|
||||
*/
|
||||
if (strcmp(&catFile[strlen(catFile) -4], ".cat") == 0)
|
||||
CatFileName = strdup(catFile);
|
||||
else
|
||||
{
|
||||
/* Create our CatFileName with the extention */
|
||||
CatFileName = malloc (strlen(catFile) + 5);
|
||||
/* +5, 1 for NULL, 4 for ".cat" */
|
||||
strcpy(CatFileName, catFile);
|
||||
strcat(CatFileName, ".cat");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#else
|
||||
{
|
||||
|
||||
/* If we have a full path, just use it */
|
||||
if (*catFile == '/')
|
||||
|
@ -294,7 +266,7 @@ void DtHelpSetCatalogName(
|
|||
/* hp-ux os does not work with the ".cat" extention, so
|
||||
* if one exists, remove it.
|
||||
*/
|
||||
|
||||
|
||||
if (strcmp(&catFile[strlen(catFile) -4], ".cat") != 0)
|
||||
CatFileName = strdup(catFile);
|
||||
else
|
||||
|
@ -306,7 +278,6 @@ void DtHelpSetCatalogName(
|
|||
CatFileName[len]= '\0';
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
_DtHelpProcessUnlock();
|
||||
}
|
||||
|
@ -340,22 +311,18 @@ char *_DtHelpGetMessage(
|
|||
static nl_catd nlmsg_fd;
|
||||
|
||||
_DtHelpProcessLock();
|
||||
if ( first )
|
||||
if ( first )
|
||||
{
|
||||
|
||||
/* Setup our default message catalog names if none have been set! */
|
||||
if (CatFileName == NULL)
|
||||
{
|
||||
/* Setup the short and long versions */
|
||||
#ifdef __ultrix
|
||||
CatFileName = strdup("DtHelp.cat");
|
||||
#else
|
||||
CatFileName = strdup("DtHelp");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
loc = _DtHelpGetLocale();
|
||||
if (!loc || !(strcmp (loc, "C")))
|
||||
if (!loc || !(strcmp (loc, "C")))
|
||||
/*
|
||||
* If LANG is not set or if LANG=C, then there
|
||||
* is no need to open the message catalog - just
|
||||
|
|
|
@ -112,9 +112,9 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h 4.16 91/09/12";
|
|||
|
||||
#ifdef BOGUS_MB_MAX /* some systems don't properly set MB_[CUR|LEN]_MAX */
|
||||
# undef MB_LEN_MAX
|
||||
# define MB_LEN_MAX 1 /* temp fix for ultrix */
|
||||
# define MB_LEN_MAX 1 /* temp fix */
|
||||
# undef MB_CUR_MAX
|
||||
# define MB_CUR_MAX 1 /* temp fix for ultrix */
|
||||
# define MB_CUR_MAX 1 /* temp fix */
|
||||
#endif /* BOGUS_MB_MAX */
|
||||
|
||||
/**********************************************************************/
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#define NL_SETN_Function 3
|
||||
#define NL_SETN_Prim 4
|
||||
#define NL_SETN_PrimRend 5
|
||||
#define NL_SETN_View 6
|
||||
#define NL_SETN_View 6
|
||||
#define NL_SETN_ViewGlobalDialog 7
|
||||
#define NL_SETN_ViewMenu 8
|
||||
#define NL_SETN_ViewTerminalDialog 9
|
||||
|
@ -54,11 +54,7 @@
|
|||
#ifndef NO_MESSAGE_CATALOG
|
||||
extern char *_DtTermPrimGetMessage( char *filename, int set, int n, char *s );
|
||||
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtterm.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtterm"
|
||||
# endif /* __ultrix */
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
_DtTermPrimGetMessage(_CLIENT_CAT_NAME, set, number, string)
|
||||
#else
|
||||
|
|
|
@ -35,10 +35,7 @@
|
|||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#if defined(ultrix)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
#include <sys/stat.h>
|
||||
#include "prop.h"
|
||||
#include "ttdbck.h"
|
||||
|
||||
|
|
|
@ -37,10 +37,7 @@
|
|||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
#if defined(ultrix)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
#include <sys/stat.h>
|
||||
#include "spec.h"
|
||||
#include "options_tt.h"
|
||||
#include "util/tt_gettext.h"
|
||||
|
|
|
@ -35,13 +35,10 @@
|
|||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#if defined(ultrix)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#if defined(_AIX)
|
||||
#include <time.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
#include <sys/stat.h>
|
||||
#include "spec.h"
|
||||
#include "options_tt.h"
|
||||
#include "ttdbck.h"
|
||||
|
|
|
@ -44,10 +44,6 @@
|
|||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#if defined(ultrix)
|
||||
#include <sys/inode.h>
|
||||
#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include "api/c/tt_c.h"
|
||||
|
|
|
@ -44,10 +44,6 @@
|
|||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#if defined(ultrix)
|
||||
#include <sys/inode.h>
|
||||
#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include "api/c/tt_c.h"
|
||||
|
|
|
@ -60,10 +60,6 @@
|
|||
#define _TT_DBCLIENT_SIDE
|
||||
#include "db/db_server.h"
|
||||
|
||||
#if defined(ultrix)
|
||||
extern "C" void xdrstdio_create(XDR *, FILE *, enum xdr_op);
|
||||
#endif
|
||||
|
||||
typedef void (*cmd_fn)();
|
||||
|
||||
TT_INSERT_COPYRIGHT
|
||||
|
|
|
@ -77,25 +77,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <isam.h>
|
||||
|
||||
#if defined(ultrix)
|
||||
# include <sys/time.h>
|
||||
# include <sys/mount.h>
|
||||
# include <sys/fs_types.h>
|
||||
# define KERNEL
|
||||
# include </usr/sys/h/fs_types.h>
|
||||
# undef KERNEL
|
||||
# define MNTTAB "/etc/fstab"
|
||||
const char *TYPE_NFS = "nfs";
|
||||
const char *TYPE_LOCAL = "ufs";
|
||||
extern "C"
|
||||
{
|
||||
int getmnt(int *,struct fs_data*, int, int, char*);
|
||||
time_t time();
|
||||
}
|
||||
#else
|
||||
# include <time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
extern "C" { int isaddindex(int, struct keydesc*); }
|
||||
extern "C" { int isbuild(const char*, int, struct keydesc*, int); }
|
||||
|
|
|
@ -38,10 +38,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#if defined(ultrix)
|
||||
#include <sys/inode.h>
|
||||
#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
|
||||
#endif
|
||||
#include <dirent.h>
|
||||
#include "tttar_utils.h"
|
||||
#include "tttar_file_utils.h"
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -57,10 +57,6 @@
|
|||
|
||||
#include <sys/time.h>
|
||||
|
||||
#if defined(ultrix)
|
||||
extern "C" unsigned long inet_addr(char *);
|
||||
#endif
|
||||
|
||||
#include <arpa/inet.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -42,9 +42,6 @@
|
|||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <syslog.h>
|
||||
#ifdef __ultrix__
|
||||
#define LOG_USER LOG_INFO
|
||||
#endif
|
||||
/*
|
||||
* _isfatal_error(msg)
|
||||
*
|
||||
|
|
|
@ -948,7 +948,7 @@ signal_new_message(_Tt_message_ptr &m)
|
|||
#if defined(sun) && defined(SVR4)
|
||||
typedef int (*Xdrrec_reader)(...);
|
||||
typedef int (*Xdrrec_writer)(...);
|
||||
#elif defined(sun) & !defined(SVR4) || defined(ultrix)
|
||||
#elif defined(sun) && !defined(SVR4)
|
||||
typedef int (*Xdrrec_reader)();
|
||||
typedef int (*Xdrrec_writer)();
|
||||
#else
|
||||
|
|
|
@ -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)
|
||||
#if 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) {
|
||||
|
@ -377,23 +377,6 @@ check_for_live_session()
|
|||
return(TT_OK);
|
||||
}
|
||||
|
||||
#if defined(ultrix)
|
||||
/* strdup - make duplicate of string s */
|
||||
#include <string.h>
|
||||
#include <malloc.h>
|
||||
|
||||
static char *
|
||||
strdup(char *s)
|
||||
{
|
||||
char *p;
|
||||
|
||||
p = (char *)malloc(strlen(s) + 1); /* + 1 for '\0' character */
|
||||
if (p != NULL)
|
||||
strcpy(p,s);
|
||||
return p;
|
||||
}
|
||||
#endif
|
||||
|
||||
//
|
||||
// Advertises a session procid so that any clients that come up within
|
||||
// the appropiate domain will find the session id.
|
||||
|
|
|
@ -73,10 +73,6 @@
|
|||
#include "util/tt_global_env.h"
|
||||
#include "util/tt_xdr_version.h"
|
||||
|
||||
#if defined(ultrix)
|
||||
extern "C" void xdrstdio_create(XDR *, FILE *, enum xdr_op);
|
||||
#endif
|
||||
|
||||
|
||||
enum _Tt_typedb_flags {
|
||||
_TT_TYPEDB_USER,
|
||||
|
|
|
@ -33,9 +33,6 @@
|
|||
*/
|
||||
#ifndef _MP_TYPEDB_H
|
||||
#define _MP_TYPEDB_H
|
||||
#if defined(ultrix)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include "util/tt_object.h"
|
||||
|
|
|
@ -137,11 +137,7 @@ XtResource resources[] =
|
|||
*/
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtact.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtact"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtact"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -55,11 +55,7 @@ extern char *MSGFILE_MESSAGE ;
|
|||
#define bindtextdomain(f, s)
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtcalc.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtcalc"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtcalc"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -68,29 +68,12 @@
|
|||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
|
||||
/** The following ifdefs need to be straightened out
|
||||
** They are a mess.
|
||||
**/
|
||||
#ifdef sun
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#ifndef SVR4
|
||||
#if defined(sun) && !defined(SVR4)
|
||||
#include <ufs/fs.h>
|
||||
#endif
|
||||
#else
|
||||
#ifdef __ultrix
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <ufs/fs.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#ifdef __hpux
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#endif /* __ultrix */
|
||||
#endif /* sun */
|
||||
|
||||
#include <Xm/Xm.h>
|
||||
|
||||
|
@ -134,15 +117,6 @@ CheckAccess(
|
|||
uid_t save_ruid;
|
||||
gid_t save_rgid;
|
||||
|
||||
#if defined(__ultrix)
|
||||
/*--------------------------------------------------------------------
|
||||
* access code for __ultrix
|
||||
*------------------------------------------------------------------*/
|
||||
|
||||
setreuid(geteuid(),-1);
|
||||
return access (fname, what);
|
||||
|
||||
#else
|
||||
#ifdef BLS
|
||||
/*--------------------------------------------------------------------
|
||||
* access code for BLS
|
||||
|
@ -181,7 +155,6 @@ CheckAccess(
|
|||
|
||||
return access_priv;
|
||||
#endif /* BLS */
|
||||
#endif /* Apollo */
|
||||
}
|
||||
|
||||
|
||||
|
@ -975,8 +948,7 @@ FileManip(
|
|||
if (lstat (to, &s2) >= 0) /* <to> exists */
|
||||
{
|
||||
if ((stat (to, &s3) >= 0) &&
|
||||
#if defined(__ultrix) || defined(__linux__) || \
|
||||
defined(CSRG_BASED)
|
||||
#if defined(__linux__) || defined(CSRG_BASED)
|
||||
(((s3.st_mode & S_IFMT) == S_IFDIR) /* if is a directory */
|
||||
|| ((s3.st_mode & S_IFMT) == S_IFSOCK)) ) /* or a net special */
|
||||
#else
|
||||
|
|
|
@ -1821,7 +1821,7 @@ ExecuteFind(
|
|||
if (access_priv == -1 && geteuid() != root_user)
|
||||
{
|
||||
#else
|
||||
# if defined(__ultrix) || defined(__linux__) || defined(CSRG_BASED)
|
||||
# if defined(__linux__) || defined(CSRG_BASED)
|
||||
rv = setreuid(geteuid(),-1);
|
||||
if (access ((char *) path, R_OK) == -1)
|
||||
{
|
||||
|
|
|
@ -1615,11 +1615,7 @@ extern Pixmap _DtGetPixmap(
|
|||
*/
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtfile.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtfile"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtfile"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -157,11 +157,7 @@ extern int touch(String path);
|
|||
*/
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtcopy.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtcopy"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtcopy"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -215,14 +215,10 @@ GetMessage (
|
|||
|
||||
/* Setup our default message catalog names if none have been set! */
|
||||
/* Setup the short and long versions */
|
||||
#ifdef __ultrix
|
||||
catFileName = "dthelpgen.cat";
|
||||
#else
|
||||
catFileName = "dthelpgen";
|
||||
#endif
|
||||
first = 0;
|
||||
|
||||
if (strcmp (Lang, "C") == 0)
|
||||
if (strcmp (Lang, "C") == 0)
|
||||
/*
|
||||
* If LANG is not set or if LANG=C, then there
|
||||
* is no need to open the message catalog - just
|
||||
|
|
|
@ -261,11 +261,7 @@ char * _DtHPrGetMessage(
|
|||
if (s_CatFileName == NULL)
|
||||
{
|
||||
/* Setup the short and long versions */
|
||||
#ifdef __ultrix
|
||||
s_CatFileName = strdup(HELPPRINT_CAT_WITH_SUFFIX);
|
||||
#else
|
||||
s_CatFileName = strdup(HELPPRINT_CAT);
|
||||
#endif
|
||||
}
|
||||
s_First = 0;
|
||||
|
||||
|
|
|
@ -48,11 +48,7 @@
|
|||
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dticon.cat"
|
||||
# else
|
||||
# define _CLIENT_CAT_NAME "dticon"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dticon"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETSTR(set, number, string) \
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -38,11 +38,7 @@
|
|||
* macro to get message catalog strings
|
||||
*/
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtinfo_start.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtinfo_start"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtinfo_start"
|
||||
|
||||
extern char *_DtGetMessage (char *filename, int set_num, int message_num, char *message);
|
||||
|
||||
|
|
|
@ -489,11 +489,7 @@ static MsgStr allmsgs[] = {
|
|||
{"you have mail in $_", 25, 233},
|
||||
{"zero byte", 25, 234},
|
||||
};
|
||||
#ifdef __ultrix
|
||||
#define _CLIENT_CAT_NAME "dtksh.cat"
|
||||
#else /* __ultrix */
|
||||
#define _CLIENT_CAT_NAME "dtksh"
|
||||
#endif /* __ultrix */
|
||||
|
||||
/*
|
||||
* Without this proto, standard C says that _DtGetMessage() returns
|
||||
|
|
|
@ -54,11 +54,7 @@ char * GetSharedMsg(
|
|||
*/
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtksh.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtksh"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtksh"
|
||||
|
||||
/*
|
||||
* Without this proto, standard C says that _DtGetMessage() returns
|
||||
|
|
|
@ -108,19 +108,7 @@ extern int errno;
|
|||
|
||||
#ifndef DONT_USE_DES
|
||||
# ifndef USE_CRYPT
|
||||
# ifdef AIXV3
|
||||
# define USE_CRYPT
|
||||
# endif
|
||||
# ifdef ultrix
|
||||
# define USE_CRYPT
|
||||
# endif
|
||||
# ifdef hpux
|
||||
# define USE_CRYPT
|
||||
# endif
|
||||
# ifdef macII
|
||||
# define USE_CRYPT
|
||||
# endif
|
||||
# ifdef __FreeBSD__
|
||||
# if defined(AIXV3) || defined(hpux) || defined(__FreeBSD__)
|
||||
# define USE_CRYPT
|
||||
# endif
|
||||
# ifdef __OpenBSD__
|
||||
|
|
|
@ -117,12 +117,8 @@
|
|||
# if !defined(NL_CAT_LOCALE)
|
||||
# define NL_CAT_LOCALE 0
|
||||
# endif
|
||||
# ifdef __ultrix
|
||||
# define _DTPAD_CAT_NAME "dtpad.cat"
|
||||
# else /* __ultrix */
|
||||
static const char catalogName[] = "dtpad";
|
||||
# define _DTPAD_CAT_NAME catalogName
|
||||
# endif /* __ultrix */
|
||||
# define _DTPAD_CAT_NAME catalogName
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -129,11 +129,7 @@
|
|||
#define SM_CM_DEFAULT SM_CM_NONE
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtsession.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtsession"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtsession"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -87,11 +87,7 @@
|
|||
* macro to get message catalog strings
|
||||
*/
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtsession.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtsession"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtsession"
|
||||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
|
||||
|
|
|
@ -511,11 +511,7 @@ extern void GeneralTopicHelpCB(Widget, XtPointer, XtPointer);
|
|||
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _FP_CLIENT_CAT_NAME "fp.cat"
|
||||
# else /* __ultrix */
|
||||
# define _FP_CLIENT_CAT_NAME "fp"
|
||||
# endif /* __ultrix */
|
||||
# define _FP_CLIENT_CAT_NAME "fp"
|
||||
# define FPGETMESSAGE(set, number, string)\
|
||||
_DtGetMessage(_FP_CLIENT_CAT_NAME, set, number, string)
|
||||
#else
|
||||
|
|
|
@ -2208,11 +2208,7 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s);
|
|||
* macro to get message catalog strings
|
||||
*/
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
# ifdef __ultrix
|
||||
# define _CLIENT_CAT_NAME "dtwm.cat"
|
||||
# else /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtwm"
|
||||
# endif /* __ultrix */
|
||||
# define _CLIENT_CAT_NAME "dtwm"
|
||||
# define GETMESSAGE(set, number, string)\
|
||||
_DtGetMessage(_CLIENT_CAT_NAME, set, number, string)
|
||||
#else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue