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 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

6
cde/programs/dtaction/Main.c
View file

@ -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))

6
cde/programs/dtcalc/calctool.h
View file

@ -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))

36
cde/programs/dtfile/FileManip.c
View file

@ -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

2
cde/programs/dtfile/Find.c
View file

@ -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)
{

6
cde/programs/dtfile/Main.h
View file

@ -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))

6
cde/programs/dtfile/dtcopy/dtcopy.h
View file

@ -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))

6
cde/programs/dthelp/dthelpgen/helpgen.c
View file

@ -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

4
cde/programs/dthelp/dthelpprint/PrintUtil.c
View file

@ -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;

6
cde/programs/dticon/main.h
View file

@ -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))

6
cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.h
View file

@ -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);

4
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
View file

@ -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

6
cde/programs/dtksh/msgs.h
View file

@ -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

14
cde/programs/dtlogin/genauth.c
View file

@ -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__

6
cde/programs/dtpad/main.c
View file

@ -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

6
cde/programs/dtsession/Sm.h
View file

@ -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))

6
cde/programs/dtsession/Srv.h
View file

@ -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))

6
cde/programs/dtwm/DataBaseLoad.h
View file

@ -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

6
cde/programs/dtwm/WmGlobal.h
View file

@ -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