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

Browse source
This commit is contained in:
chase 2018-06-24 14:15:00 -05:00 • committed by Jon Trulson
parent 01c9b8889b
commit 6bf175ef2d
108 changed files with 59 additions and 2185 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cde/config/cf/Imake.cf
View file

@ -270,13 +270,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define NCRArchitecture # define NCRArchitecture
#endif /* NCR */ #endif /* NCR */
#ifdef apollo
# define MacroIncludeFile <apollo.cf>
# define MacroFile apollo.cf
# undef apollo
# define ApolloArchitecture
#endif /* apollo */
#ifdef sony #ifdef sony
# define MacroIncludeFile <sony.cf> # define MacroIncludeFile <sony.cf>
# define MacroFile sony.cf # define MacroFile sony.cf

1
cde/config/cf/Imakefile
View file

@ -62,7 +62,6 @@ Mips.cf \
NetBSD.cf \ NetBSD.cf \
Oki.cf \ Oki.cf \
Win32.cf \ Win32.cf \
apollo.cf \
bsd.cf \ bsd.cf \
convex.cf \ convex.cf \
cray.cf \ cray.cf \

38
cde/config/cf/apollo.cf
View file

@ -1,38 +0,0 @@
XCOMM platform: $XConsortium: apollo.cf /main/34 1996/09/28 16:09:07 rws $
/*
* Minimally tested, and only in the bsd4.3 environment. X_NOT_POSIX is not
* in Xosdefs.h, because we suspect someone might want to try building with
* POSIX support in the sysv environment (the OS doc seems to imply that
* POSIX is supported in sysv).
*/
#ifndef OSName
#define OSName Domain/OS SR10.3
#endif
XCOMM operating system: OSName
#ifndef OSMajorVersion
#define OSMajorVersion 10
#endif
#ifndef OSMinorVersion
#define OSMinorVersion 3
#endif
#ifndef CCompilerMajorVersion
#define CCompilerMajorVersion 6
#endif
#ifndef CCompilerMinorVersion
#define CCompilerMinorVersion 8
#endif
#define StandardDefines -DX_NOT_POSIX
#define BuildServer NO
#define HasNdbm YES
#define ConnectionFlags -DTCPCONN
#define InstallManPageLong(file,destdir,dest) @@\
install.man:: file.man @@\
MakeDir($(DESTDIR)destdir) @@\
$(NROFF) $(MANMACROS) file.man > file.mantxt @@\
$(INSTALL) -c $(INSTMANFLAGS) file.mantxt $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
$(RM) file.mantxt

10
cde/config/imake/imakemdep.h
View file

@ -132,10 +132,6 @@ in this Software without prior written authorization from The Open Group.
#define imake_ccflags "-fn -tm c1" #define imake_ccflags "-fn -tm c1"
#endif #endif
#ifdef apollo
#define imake_ccflags "-DX_NOT_POSIX"
#endif
#ifdef WIN32 #ifdef WIN32
#if _MSC_VER < 1000 #if _MSC_VER < 1000
#define imake_ccflags "-nologo -batch -D__STDC__" #define imake_ccflags "-nologo -batch -D__STDC__"
@ -233,9 +229,6 @@ in this Software without prior written authorization from The Open Group.
#define USE_CC_E #define USE_CC_E
#define DEFAULT_CC "cl" #define DEFAULT_CC "cl"
#endif #endif
#ifdef apollo
#define DEFAULT_CPP "/usr/lib/cpp"
#endif
#if defined(_IBMR2) && !defined(DEFAULT_CPP) #if defined(_IBMR2) && !defined(DEFAULT_CPP)
#define DEFAULT_CPP "/usr/ccs/lib/cpp" #define DEFAULT_CPP "/usr/ccs/lib/cpp"
#endif #endif
@ -604,9 +597,6 @@ char *cpp_argv[ARGUMENTS] = {
#define DEF_STRINGIFY(_x) DEF_EVALUATE(_x) #define DEF_STRINGIFY(_x) DEF_EVALUATE(_x)
struct symtab predefs[] = { struct symtab predefs[] = {
#ifdef apollo
{"apollo", "1"},
#endif
#ifdef ibm032 #ifdef ibm032
{"ibm032", "1"}, {"ibm032", "1"},
#endif #endif

24
cde/lib/DtSvc/DtCodelibs/pathcollapse.C
View file

@ -31,9 +31,6 @@
* (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 FUJITSU LIMITED.
* (c) Copyright 1996 Hitachi. * (c) Copyright 1996 Hitachi.
*/ */
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -60,9 +57,6 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
char **comp = components; char **comp = components;
int length = src == NULL ? 0 : strlen(src); int length = src == NULL ? 0 : strlen(src);
int dir_comp; /* TRUE if last component was . or .. */ int dir_comp; /* TRUE if last component was . or .. */
#ifdef apollo
int double_slash = 0;
#endif
wchar_t __nlh_char[1]; wchar_t __nlh_char[1];
if (length == 0 || length > MAXPATHLEN) if (length == 0 || length > MAXPATHLEN)
@ -75,19 +69,6 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
if ((dst = (char *)malloc(length + 1)) == NULL) if ((dst = (char *)malloc(length + 1)) == NULL)
return NULL; return NULL;
#ifdef apollo
/*
* On apollo, a leading double-slash must be preserved, so we
* copy the first slash and hide it from the rest of the code.
*/
if (CHARAT(src) == '/' && CHARAT(src + 1) == '/')
{
*dst++ = '/';
src++;
double_slash = 1;
}
#endif
srcp = src; srcp = src;
dstp = dst; dstp = dst;
@ -175,10 +156,5 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
else if (sep > dst) else if (sep > dst)
*sep = '\0'; /* remove trailing '/' */ *sep = '\0'; /* remove trailing '/' */
#ifdef apollo
if (double_slash)
dst--;
#endif
return dst; return dst;
} }

22
cde/lib/DtSvc/DtCodelibs/shellscan.C
View file

@ -31,15 +31,6 @@
* (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 FUJITSU LIMITED.
* (c) Copyright 1996 Hitachi. * (c) Copyright 1996 Hitachi.
*/ */
# if defined(apollo) && !defined(___GID_T)
// This kludge is needed for the include conflicts mentioned below
// Remove when no longer necessary
# define _NEED___PID_T
# endif
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -49,20 +40,7 @@
#include <X11/Xos_r.h> #include <X11/Xos_r.h>
#include <codelibs/nl_hack.h> #include <codelibs/nl_hack.h>
#ifdef apollo
// This kludge because of include conflicts between stdlib.h and unistd.h
// Remove when problem is fixed
# ifdef __cplusplus
extern "C" {
# endif
_DECL_FUNC(__pid_t, getpid, (void))
# ifdef __cplusplus
}
# endif
#else /* not apollo */
# include <unistd.h> # include <unistd.h>
#endif /* not apollo */
#include "stringio.h" #include "stringio.h"
#include "buf.h" #include "buf.h"

4
cde/lib/DtSvc/DtEncap/MemoryMgr.c
View file

@ -32,10 +32,6 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <Dt/UserMsg.h> #include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */ #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */

4
cde/lib/DtSvc/DtEncap/pty.c
View file

@ -61,10 +61,6 @@
#include <sys/ptyio.h> #include <sys/ptyio.h>
#endif #endif
#if defined(__apollo) && !defined(ONLCR)
# define ONLCR 0 /* This guy (XPG3), not on apollo yet */
#endif
#ifdef __bsd #ifdef __bsd
#include <sys/file.h> #include <sys/file.h>
#include <sgtty.h> #include <sgtty.h>

4
cde/lib/DtSvc/DtEncap/scoop.c
View file

@ -32,10 +32,6 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <bms/sbport.h> /* This must be the first file included */ #include <bms/sbport.h> /* This must be the first file included */
#include <bms/scoop.h> #include <bms/scoop.h>

50
cde/lib/DtSvc/DtEncap/usersig.c
View file

@ -90,55 +90,55 @@ static void Xe_init_sig_table(void)
/* Now add signals that may or may not be around on a given platform */ /* Now add signals that may or may not be around on a given platform */
# ifdef SIGIO # ifdef SIGIO
Xe_addsig((XeString)"SIGIO", SIGIO); /* hpux sun apollo */ Xe_addsig((XeString)"SIGIO", SIGIO); /* hpux sun */
# else # else
# ifdef SIGPOLL # ifdef SIGPOLL
Xe_addsig((XeString)"SIGIO", SIGPOLL); /* hpux sun apollo */ Xe_addsig((XeString)"SIGIO", SIGPOLL); /* hpux sun */
# endif # endif
# endif # endif
# ifdef SIGPOLL # ifdef SIGPOLL
Xe_addsig((XeString)"SIGPOLL", SIGPOLL); /* hpux sun apollo */ Xe_addsig((XeString)"SIGPOLL", SIGPOLL); /* hpux sun */
# else # else
# ifdef SIGIO # ifdef SIGIO
Xe_addsig((XeString)"SIGPOLL", SIGIO); /* hpux sun apollo */ Xe_addsig((XeString)"SIGPOLL", SIGIO); /* hpux sun */
# endif # endif
# endif # endif
# ifdef SIGEMT # ifdef SIGEMT
Xe_addsig((XeString)"SIGEMT", SIGEMT); /* hpux sun apollo */ Xe_addsig((XeString)"SIGEMT", SIGEMT); /* hpux sun */
# endif # endif
# ifdef SIGBUS # ifdef SIGBUS
Xe_addsig((XeString)"SIGBUS", SIGBUS); /* hpux sun apollo */ Xe_addsig((XeString)"SIGBUS", SIGBUS); /* hpux sun */
# endif # endif
# ifdef SIGIOT # ifdef SIGIOT
Xe_addsig((XeString)"SIGIOT", SIGIOT); /* hpux sun apollo */ Xe_addsig((XeString)"SIGIOT", SIGIOT); /* hpux sun */
# endif # endif
# ifdef SIGURG # ifdef SIGURG
Xe_addsig((XeString)"SIGURG", SIGURG); /* hpux sun apollo */ Xe_addsig((XeString)"SIGURG", SIGURG); /* hpux sun */
# endif # endif
# ifdef SIGSYS # ifdef SIGSYS
Xe_addsig((XeString)"SIGSYS", SIGSYS); /* hpux sun apollo */ Xe_addsig((XeString)"SIGSYS", SIGSYS); /* hpux sun */
# endif # endif
# ifdef SIGTRAP # ifdef SIGTRAP
Xe_addsig((XeString)"SIGTRAP", SIGTRAP); /* hpux sun apollo */ Xe_addsig((XeString)"SIGTRAP", SIGTRAP); /* hpux sun */
# endif # endif
# ifdef SIGPROF # ifdef SIGPROF
Xe_addsig((XeString)"SIGPROF", SIGPROF); /* hpux sun apollo */ Xe_addsig((XeString)"SIGPROF", SIGPROF); /* hpux sun */
# endif # endif
# ifdef SIGCLD # ifdef SIGCLD
Xe_addsig((XeString)"SIGCLD", SIGCLD); /* hpux sun apollo */ Xe_addsig((XeString)"SIGCLD", SIGCLD); /* hpux sun */
# endif # endif
# ifdef SIGVTALRM # ifdef SIGVTALRM
Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM); /* hpux sun apollo */ Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM); /* hpux sun */
# endif # endif
# ifdef SIGWINCH # ifdef SIGWINCH
@ -204,60 +204,60 @@ XeString XeSignalToName(int sig)
/* code to the stuff in Xe_init_sig_table() above, you see a one */ /* code to the stuff in Xe_init_sig_table() above, you see a one */
/* to one correspondance. */ /* to one correspondance. */
# ifdef SIGIO /* hpux sun apollo */ # ifdef SIGIO /* hpux sun */
/* (SIGPOLL, SIGTINT are aliases) */ /* (SIGPOLL, SIGTINT are aliases) */
case SIGIO: return (XeString)"SIGIO"; case SIGIO: return (XeString)"SIGIO";
# endif # endif
# ifdef SIGPOLL /* hpux sun apollo */ # ifdef SIGPOLL /* hpux sun */
/* ----> Duplicated by SIGIO above /* ----> Duplicated by SIGIO above
case SIGPOLL: return (XeString)"SIGPOLL"; case SIGPOLL: return (XeString)"SIGPOLL";
*/ */
# endif # endif
# ifdef SIGEMT /* hpux sun apollo */ # ifdef SIGEMT /* hpux sun */
case SIGEMT: return (XeString)"SIGEMT"; case SIGEMT: return (XeString)"SIGEMT";
# endif # endif
# ifdef SIGBUS /* hpux sun apollo */ # ifdef SIGBUS /* hpux sun */
case SIGBUS: return (XeString)"SIGBUS"; case SIGBUS: return (XeString)"SIGBUS";
# endif # endif
# ifdef SIGIOT /* hpux sun apollo */ # ifdef SIGIOT /* hpux sun */
/* ----> Duplicated by SIGABRT above /* ----> Duplicated by SIGABRT above
case SIGIOT: return (XeString)"SIGIOT"; case SIGIOT: return (XeString)"SIGIOT";
*/ */
# endif # endif
# ifdef SIGURG /* hpux sun apollo */ # ifdef SIGURG /* hpux sun */
case SIGURG: return (XeString)"SIGURG"; case SIGURG: return (XeString)"SIGURG";
# endif # endif
# ifdef SIGSYS /* hpux sun apollo */ # ifdef SIGSYS /* hpux sun */
case SIGSYS: return (XeString)"SIGSYS"; case SIGSYS: return (XeString)"SIGSYS";
# endif # endif
# ifdef SIGTRAP /* hpux sun apollo */ # ifdef SIGTRAP /* hpux sun */
case SIGTRAP: return (XeString)"SIGTRAP"; case SIGTRAP: return (XeString)"SIGTRAP";
# endif # endif
# ifdef SIGPROF /* hpux sun apollo */ # ifdef SIGPROF /* hpux sun */
case SIGPROF: return (XeString)"SIGPROF"; case SIGPROF: return (XeString)"SIGPROF";
# endif # endif
# ifdef SIGCLD /* hpux sun apollo */ # ifdef SIGCLD /* hpux sun */
/* ----> Duplicated by SIGCHLD above /* ----> Duplicated by SIGCHLD above
case SIGCLD: return (XeString)"SIGCLD"; case SIGCLD: return (XeString)"SIGCLD";
*/ */
# endif # endif
# ifdef SIGVTALRM /* hpux sun apollo */ # ifdef SIGVTALRM /* hpux sun */
case SIGVTALRM: return (XeString)"SIGVTALRM"; case SIGVTALRM: return (XeString)"SIGVTALRM";
# endif # endif
# ifdef SIGWINCH /* sun apollo */ # ifdef SIGWINCH /* sun */
case SIGWINCH: return (XeString)"SIGWINCH"; case SIGWINCH: return (XeString)"SIGWINCH";
# endif # endif

4
cde/lib/DtSvc/DtUtil1/CmdMain.c
View file

@ -40,11 +40,7 @@
#include <Dt/CmdInv.h> #include <Dt/CmdInv.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef __apollo
#include "/sys5/usr/include/sys/termio.h"
#else
#include <termios.h> #include <termios.h>
#endif
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>

5
cde/lib/DtSvc/DtUtil1/CmdUtilityP.c
View file

@ -37,12 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/param.h> #include <sys/param.h>
#ifdef __apollo
#include "/sys5/usr/include/unistd.h"
#else
#include <unistd.h> #include <unistd.h>
#endif
#include <limits.h> #include <limits.h>
#include <sys/stat.h> #include <sys/stat.h>

4
cde/lib/DtSvc/DtUtil2/CmdUtility.c
View file

@ -37,11 +37,7 @@
#include <string.h> #include <string.h>
#include <sys/param.h> #include <sys/param.h>
#ifdef __apollo
#include "/sys5/usr/include/unistd.h"
#else
#include <unistd.h> #include <unistd.h>
#endif
#include <limits.h> #include <limits.h>
#include <sys/stat.h> #include <sys/stat.h>

2
cde/lib/DtSvc/DtUtil2/DtosP.h
View file

@ -160,7 +160,7 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h 4.16 91/09/12";
/* /*
* warning: mips alloca is unsuitable, do not use. * warning: mips alloca is unsuitable, do not use.
*/ */
# if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) # if defined(vax) || defined(sun) || defined(stellar)
/* /*
* Some System V boxes extract alloca.o from /lib/libPW.a; if you * Some System V boxes extract alloca.o from /lib/libPW.a; if you
* decide that you don't want to use alloca, you might want to fix it here. * decide that you don't want to use alloca, you might want to fix it here.

76
cde/lib/DtSvc/include/bms/sbport.h
View file

@ -46,7 +46,6 @@
__hpux - Will be set for HP-UX systems __hpux - Will be set for HP-UX systems
__sun - Will be set for SUN systems __sun - Will be set for SUN systems
__apollo - Will be set for APOLLO (domain) systems
__aix - Will be set for IBM (AIX) systems __aix - Will be set for IBM (AIX) systems
__sysv - Set when using SYSV semantics (e.g. HP, SUN) __sysv - Set when using SYSV semantics (e.g. HP, SUN)
@ -62,13 +61,6 @@
__sparc - Set for SUN sparc machines __sparc - Set for SUN sparc machines
__sun68k - Set for SUN m68k machines __sun68k - Set for SUN m68k machines
__apollo88k - Set for apollo (domain) risc (PRISM) machines
__apollo68k - Set for apollo (domain) m68k machines
__apollo_null - Set to allow null pointer dereferences on domain
__apollo_paths - Set to have "//<host>" converted to "host:"
__identification_strings - Set when RCS header strings are to be in code __identification_strings - Set when RCS header strings are to be in code
__recursive_includes - Set to have .h files #includes prerequisite files __recursive_includes - Set to have .h files #includes prerequisite files
__char_ptr_yytext - Set if the lex/yacc variable yytext is defined __char_ptr_yytext - Set if the lex/yacc variable yytext is defined
@ -96,10 +88,6 @@
# define __sun # define __sun
#endif #endif
#if defined(apollo) && !defined(__apollo)
# define __apollo
#endif
#if defined(hpux) && !defined(__hpux) #if defined(hpux) && !defined(__hpux)
# define __hpux # define __hpux
#endif #endif
@ -135,32 +123,6 @@
# define __c_callable /* Set so VUE can link with libbms. */ # define __c_callable /* Set so VUE can link with libbms. */
#endif #endif
#ifdef __apollo
# ifndef __bsd
# define __sysv /* NOTE: not bsd!!! */
# endif
# ifndef __apollo_paths
# define __apollo_paths
# endif
# ifndef __apollo_null
# define __apollo_null
# endif
# if defined(a88k) && !defined(__apollo88k)
# define __apollo88k
# endif
# if defined(_ISP__A88K) && !defined(__apollo88k)
# define __apollo88k
# endif
# if defined(m68k) && !defined(__apollo68k)
# define __apollo68k
# endif
# if defined(_ISP__M68K) && !defined(__apollo68k)
# define __apollo68k
# endif
# define __hp_color_object
# define __unsigned_char_ptr_yytext
#endif
#ifdef __aix #ifdef __aix
# define __sysv # define __sysv
#endif #endif
@ -173,11 +135,6 @@
# define KEEP_DEADWOOD FALSE /* all sorts of unknown problems. */ # define KEEP_DEADWOOD FALSE /* all sorts of unknown problems. */
#endif #endif
#ifndef __apollo_paths
# define __apollo_paths /* We always want this feature */
#endif
#ifdef __cplusplus #ifdef __cplusplus
#define UNUSED_PARM(_parm) #define UNUSED_PARM(_parm)
@ -207,49 +164,18 @@
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
#if defined(__need_timeval) /* Get "struct timeval" */ #if defined(__need_timeval) /* Get "struct timeval" */
# ifdef __sun # if defined(__sun) || defined(__aix)
# include <sys/time.h>
# endif
# ifdef __apollo
# include <sys/time.h>
# endif
# ifdef __aix
# include <sys/time.h> # include <sys/time.h>
# endif # endif
#endif /* __need_timeval */ #endif /* __need_timeval */
#if defined(__need_fd_set) /* Get "typedef struct fd_set" */ #if defined(__need_fd_set) /* Get "typedef struct fd_set" */
# ifdef __apollo
# define _INCLUDE_BSD_SOURCE
# include "/bsd4.3/usr/include/sys/types.h"
# endif
# ifdef _AIX # ifdef _AIX
# include <sys/select.h> # include <sys/select.h>
# endif # endif
#endif /* __need_fd_st */ #endif /* __need_fd_st */
#if defined(__need_S_IF) /* Get S_IFNWK, S_IFLNK */
# ifdef __apollo
# define _APOLLO_SOURCE
# endif
#endif /* __need_S_IF */
#if defined(__need_all_errors)
# ifdef __apollo
# define _APOLLO_SOURCE
# undef _SYS_STDSYMS_INCLUDED /* So we can include <sys/stdsyms.h> again */
# endif
#endif
#if defined(__need_all_signals) /* Get all SIGxxx values */
# ifdef __apollo
# define _APOLLO_SOURCE
# include "/bsd4.3/usr/include/sys/types.h"
# endif
#endif /* __need_all_signal */
/* We also use the following non XPG3 types. However, they may be */ /* We also use the following non XPG3 types. However, they may be */
/* defined when we relax the XPG3 compliance to get the stuff talked */ /* defined when we relax the XPG3 compliance to get the stuff talked */
/* about above. So, declare them only if we don't already have them */ /* about above. So, declare them only if we don't already have them */

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

@ -58,8 +58,8 @@
/* Routines not defined in include files (yet). */ /* Routines not defined in include files (yet). */
/************************************************************************/ /************************************************************************/
/* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */ /* BSD has bzero(), bcmp(), and bcopy() defined. */
#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED) #if !defined(__bsd) && !defined(CSRG_BASED)
#if defined(__STDC__) #if defined(__STDC__)
#if !defined(__linux__) && !defined(_XFUNCS_H_) && !defined(sun) #if !defined(__linux__) && !defined(_XFUNCS_H_) && !defined(sun)

5
cde/lib/DtSvc/include/codelibs/mbstring.h
View file

@ -34,11 +34,6 @@
#include <stddef.h> #include <stddef.h>
#ifdef apollo
#define _NEED_WCHAR_T
#include <sys/stdtypes.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {

7
cde/lib/DtSvc/include/codelibs/privbuf.h
View file

@ -34,13 +34,6 @@
#ifndef __PRIVBUF_H_ #ifndef __PRIVBUF_H_
#define __PRIVBUF_H_ #define __PRIVBUF_H_
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#ifdef apollo
#include <stdlib.h>
#endif
typedef void (*privbuf_func)(void *v); typedef void (*privbuf_func)(void *v);
#ifdef __PRIVATE_ #ifdef __PRIVATE_

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

@ -32,13 +32,6 @@
#ifndef __STRINGX_H_ #ifndef __STRINGX_H_
#define __STRINGX_H_ #define __STRINGX_H_
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#ifdef apollo
#include <stdlib.h>
#endif
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <codelibs/boolean.h> #include <codelibs/boolean.h>
@ -119,11 +112,11 @@ extern size_t nl_strlen(); /* __OBSOLETE */
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#if defined(apollo) || defined(__aix) || defined(__linux__) || defined(CSRG_BASED) #if defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
#include <stdlib.h> #include <stdlib.h>
#else #else
#include <malloc.h> #include <malloc.h>
#endif /* apollo */ #endif /* aix linux CSRG_BASED */
inline char *strnew(size_t len) { return (char*)malloc(len + 1); } inline char *strnew(size_t len) { return (char*)malloc(len + 1); }
#if defined(sun) || defined(__sun) #if defined(sun) || defined(__sun)

4
cde/lib/DtWidget/Control.c
View file

@ -47,11 +47,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#ifdef __apollo
#include <sys/types.h> /* needed for sys/stat.h on bsd4.3 */
#else
#include <stdlib.h> #include <stdlib.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#define X_INCLUDE_STRING_H #define X_INCLUDE_STRING_H
#define X_INCLUDE_TIME_H #define X_INCLUDE_TIME_H

3
cde/lib/DtWidget/Icon.c
View file

@ -47,9 +47,6 @@
*/ */
#include <stdio.h> #include <stdio.h>
#ifdef __apollo
#include <sys/types.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <Xm/XmP.h> #include <Xm/XmP.h>

5
cde/programs/dthello/Dthello.src
View file

@ -16,9 +16,4 @@
!###################################################################### !######################################################################
XCOMM include "Dt" XCOMM include "Dt"
#ifdef __apollo
Dtcolor*font: user12x23
#else
%|nls-1-#optional_font_spec#| %|nls-1-#optional_font_spec#|
#endif

4
cde/programs/dthello/dthello.c
View file

@ -76,11 +76,7 @@ static char rcsid[] = "$TOG: dthello.c /main/9 1998/04/20 12:52:17 mgreess $";
#include <sys/signal.h> #include <sys/signal.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <Dt/GetDispRes.h> #include <Dt/GetDispRes.h>
#ifdef __apollo
#include </sys5/usr/include/limits.h>
#else
#include <limits.h> #include <limits.h>
#endif
#include <locale.h> #include <locale.h>
#ifndef NO_MESSAGE_CATALOG #ifndef NO_MESSAGE_CATALOG
# include <nl_types.h> # include <nl_types.h>

6
cde/programs/dthelp/parser.ccdf/volumegen/Imakefile
View file

@ -3,12 +3,6 @@ PROGRAMS = volumegen
INCLUDES = -I. INCLUDES = -I.
#if defined(ApolloArchitecture)
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -ldl -lgen SYS_LIBRARIES = -ldl -lgen
#endif #endif

9
cde/programs/dtksh/Imakefile
View file

@ -38,16 +38,7 @@ LOCAL_LDFLAGS = -bE:dtksh.exp
EXTRA_DEFINES = -DDYNLIB EXTRA_DEFINES = -DDYNLIB
#endif #endif
#if defined(HPOSFArchitecture)
#endif
#if defined(ApolloArchitecture)
EXTRA_INCLUDES = -I/bsd4.3/usr/include -I/sys5/usr/include \
-I$(DTHELPSRC) -I$(DTPRINTSRC)
#else
EXTRA_INCLUDES = -I$(DTHELPSRC) -I$(DTPRINTSRC) EXTRA_INCLUDES = -I$(DTHELPSRC) -I$(DTPRINTSRC)
#endif
#ifdef SunArchitecture #ifdef SunArchitecture
.NO_PARALLEL: .NO_PARALLEL:

5
cde/programs/dtksh/builtins.c
View file

@ -202,11 +202,6 @@ const struct shtable3 shtab_builtins[] =
"wait", NV_BLTIN|BLT_ENV|BLT_EXIT, bltin(wait), "wait", NV_BLTIN|BLT_ENV|BLT_EXIT, bltin(wait),
"type", NV_BLTIN|BLT_ENV, bltin(whence), "type", NV_BLTIN|BLT_ENV, bltin(whence),
"whence", NV_BLTIN|BLT_ENV, bltin(whence), "whence", NV_BLTIN|BLT_ENV, bltin(whence),
#ifdef apollo
"inlib", NV_BLTIN|BLT_ENV, bltin(inlib),
"rootnode", NV_BLTIN, bltin(rootnode),
"ver", NV_BLTIN, bltin(ver),
#endif /* apollo */
"/bin/basename",NV_BLTIN|NV_NOFREE, bltin(basename), "/bin/basename",NV_BLTIN|NV_NOFREE, bltin(basename),
"/bin/chmod", NV_BLTIN|NV_NOFREE, bltin(chmod), "/bin/chmod", NV_BLTIN|NV_NOFREE, bltin(chmod),
"/bin/dirname", NV_BLTIN|NV_NOFREE, bltin(dirname), "/bin/dirname", NV_BLTIN|NV_NOFREE, bltin(dirname),

1
cde/programs/dtksh/dtksh.msg
View file

@ -431,7 +431,6 @@ $set 25
125 Resources lost 125 Resources lost
126 Reverting to old tty driver... 126 Reverting to old tty driver...
127 S [mask] 127 S [mask]
128 SIGAPOLLO
129 Security label changed 129 Security label changed
130 Socket interrupt 130 Socket interrupt
131 Sound completed 131 Sound completed

24
cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/hist.c
View file

@ -258,25 +258,7 @@ int b_hist __PARAM__((int argc,char *argv[], __V_ *extra), (argc, argv, extra))
arg = edit; arg = edit;
if(!arg && !(arg=nv_getval(nv_scoped(HISTEDIT))) && !(arg=nv_getval(nv_scoped(FCEDNOD)))) if(!arg && !(arg=nv_getval(nv_scoped(HISTEDIT))) && !(arg=nv_getval(nv_scoped(FCEDNOD))))
arg = (char*)e_defedit; arg = (char*)e_defedit;
#ifdef apollo
/*
* Code to support the FC using the pad editor.
* Exampled of how to use: HISTEDIT=pad
*/
if (strcmp (arg, "pad") == 0)
{
extern __MANGLE__ int pad_create __PROTO__((char*));
sh_close(fdo);
fdo = pad_create(fname);
pad_wait(fdo);
unlink(fname);
strcat(fname, ".bak");
unlink(fname);
lseek(fdo,(off_t)0,SEEK_SET);
}
else
{
#endif /* apollo */
if(*arg != '-') if(*arg != '-')
{ {
char *com[3]; char *com[3];
@ -288,9 +270,7 @@ int b_hist __PARAM__((int argc,char *argv[], __V_ *extra), (argc, argv, extra))
fdo = sh_chkopen(fname); fdo = sh_chkopen(fname);
unlink(fname); unlink(fname);
free((__V_*)fname); free((__V_*)fname);
#ifdef apollo
}
#endif /* apollo */
/* don't history fc itself unless forked */ /* don't history fc itself unless forked */
error_info.flags |= ERROR_SILENT; error_info.flags |= ERROR_SILENT;
if(!sh_isstate(SH_FORKED)) if(!sh_isstate(SH_FORKED))

10
cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/typeset.c
View file

@ -767,15 +767,7 @@ static int b_unall __PARAM__((int argc, char **argv, register Hashtab_t *troot),
continue; continue;
} }
} }
#ifdef apollo
else
{
short namlen;
name = nv_name(np);
namlen =strlen(name);
ev_$delete_var(name,&namlen);
}
#endif /* apollo */
if(sh.subshell) if(sh.subshell)
np=sh_assignok(np,0); np=sh_assignok(np,0);
nv_unset(np); nv_unset(np);

5
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/builtins.c
View file

@ -183,11 +183,6 @@ const struct shtable3 shtab_builtins[] =
"wait", NV_BLTIN|BLT_ENV|BLT_EXIT, bltin(wait), "wait", NV_BLTIN|BLT_ENV|BLT_EXIT, bltin(wait),
"type", NV_BLTIN|BLT_ENV, bltin(whence), "type", NV_BLTIN|BLT_ENV, bltin(whence),
"whence", NV_BLTIN|BLT_ENV, bltin(whence), "whence", NV_BLTIN|BLT_ENV, bltin(whence),
#ifdef apollo
"inlib", NV_BLTIN|BLT_ENV, bltin(inlib),
"rootnode", NV_BLTIN, bltin(rootnode),
"ver", NV_BLTIN, bltin(ver),
#endif /* apollo */
"/bin/basename",NV_BLTIN|NV_NOFREE, bltin(basename), "/bin/basename",NV_BLTIN|NV_NOFREE, bltin(basename),
"/bin/chmod", NV_BLTIN|NV_NOFREE, bltin(chmod), "/bin/chmod", NV_BLTIN|NV_NOFREE, bltin(chmod),
"/bin/dirname", NV_BLTIN|NV_NOFREE, bltin(dirname), "/bin/dirname", NV_BLTIN|NV_NOFREE, bltin(dirname),

5
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c
View file

@ -213,11 +213,6 @@ const char e_alphanum[] = "[_[:alpha:]]*([_[:alnum:]])";
const char e_vpixdir[] = "/usr/bin"; const char e_vpixdir[] = "/usr/bin";
#endif /* SHOPT_VPIX */ #endif /* SHOPT_VPIX */
const char e_devfdNN[] = "/dev/fd/+([0-9])"; const char e_devfdNN[] = "/dev/fd/+([0-9])";
#ifdef apollo
const char e_rootnode[] = "Bad root node specification";
const char e_nover[] = "Version not defined";
const char e_badver[] = "Unrecognized version";
#endif /* apollo */
#ifdef SHOPT_FS_3D #ifdef SHOPT_FS_3D
const char e_cantget[] = "cannot get %s"; const char e_cantget[] = "cannot get %s";
const char e_cantset[] = "cannot set %s"; const char e_cantset[] = "cannot set %s";

3
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/signals.c
View file

@ -119,9 +119,6 @@ static struct shtable2 _shtab_signals[] =
#ifdef SIGALRM #ifdef SIGALRM
"ALRM", VAL(SIGALRM,SH_SIGFAULT), "Alarm call", "ALRM", VAL(SIGALRM,SH_SIGFAULT), "Alarm call",
#endif /* SIGALRM */ #endif /* SIGALRM */
#ifdef SIGAPOLLO
"APOLLO", VAL(SIGAPOLLO,0), "SIGAPOLLO",
#endif /* SIGAPOLLO */
#ifdef SIGBUS #ifdef SIGBUS
"BUS", VAL(SIGBUS,SH_SIGDONE), "Bus error", "BUS", VAL(SIGBUS,SH_SIGDONE), "Bus error",
#endif /* SIGBUS */ #endif /* SIGBUS */

3
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/variables.c
View file

@ -168,9 +168,6 @@ const struct shtable2 shtab_variables[] =
#ifdef SHOPT_MULTIBYTE #ifdef SHOPT_MULTIBYTE
"CSWIDTH", 0, (char*)0, "CSWIDTH", 0, (char*)0,
#endif /* SHOPT_MULTIBYTE */ #endif /* SHOPT_MULTIBYTE */
#ifdef apollo
"SYSTYPE", 0, (char*)0,
#endif /* apollo */
"", 0, (char*)0 "", 0, (char*)0
}; };

13
cde/programs/dtksh/ksh93/src/cmd/ksh93/include/builtins.h
View file

@ -185,13 +185,6 @@ extern __MANGLE__ int b_tty __PROTO__((int, char*[],__V_*));
extern __MANGLE__ int b_uname __PROTO__((int, char*[],__V_*)); extern __MANGLE__ int b_uname __PROTO__((int, char*[],__V_*));
extern __MANGLE__ int b_wc __PROTO__((int, char*[],__V_*)); extern __MANGLE__ int b_wc __PROTO__((int, char*[],__V_*));
/* The following are extensions for apollo computers */
#ifdef apollo
extern __MANGLE__ int b_rootnode __PROTO__((int, char*[],__V_*));
extern __MANGLE__ int b_inlib __PROTO__((int, char*[],__V_*));
extern __MANGLE__ int b_ver __PROTO__((int, char*[],__V_*));
#endif /* apollo */
extern __MANGLE__ const char e_alrm1[]; extern __MANGLE__ const char e_alrm1[];
extern __MANGLE__ const char e_alrm2[]; extern __MANGLE__ const char e_alrm2[];
extern __MANGLE__ const char e_badfun[]; extern __MANGLE__ const char e_badfun[];
@ -228,12 +221,6 @@ extern __MANGLE__ const char e_cneedsarg[];
extern __MANGLE__ const char e_mapping[]; extern __MANGLE__ const char e_mapping[];
extern __MANGLE__ const char e_versions[]; extern __MANGLE__ const char e_versions[];
#endif /* SHOPT_FS_3D */ #endif /* SHOPT_FS_3D */
#ifdef apollo
extern __MANGLE__ const char e_rootnode[];
extern __MANGLE__ const char e_nover[];
extern __MANGLE__ const char e_badver[];
extern __MANGLE__ const char e_badinlib[];
#endif /* apollo */
/* for option parsing */ /* for option parsing */
extern __MANGLE__ const char sh_optalarm[]; extern __MANGLE__ const char sh_optalarm[];

3
cde/programs/dtksh/ksh93/src/cmd/ksh93/include/variables.h
View file

@ -172,8 +172,5 @@
#else #else
# define NMULTI NVPIX # define NMULTI NVPIX
#endif /* SHOPT_MULTIBYTE */ #endif /* SHOPT_MULTIBYTE */
#ifdef apollo
# define SYSTYPENOD (sh.bltin_nodes+51+NMULTI)
#endif /* apollo */
#endif /* SH_VALNOD */ #endif /* SH_VALNOD */

328
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/apollo.c
View file

@ -1,328 +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
*/
/* $XConsortium: apollo.c /main/4 1996/10/04 15:52:17 drk $ */
/***************************************************************
* *
* AT&T - PROPRIETARY *
* *
* THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF *
* AT&T BELL LABORATORIES *
* AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN *
* ACCORDANCE WITH APPLICABLE AGREEMENTS *
* *
* Copyright (c) 1995 AT&T Corp. *
* Unpublished & Not for Publication *
* All Rights Reserved *
* *
* The copyright notice above does not evidence any *
* actual or intended publication of such source code *
* *
* This software was created by the *
* Advanced Software Technology Department *
* AT&T Bell Laboratories *
* *
* For further information contact *
* {research,attmail}!dgk *
* *
***************************************************************/
/* : : generated by proto : : */
#if !defined(__PROTO__)
#if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus)
#if defined(__cplusplus)
#define __MANGLE__ "C"
#else
#define __MANGLE__
#endif
#define __STDARG__
#define __PROTO__(x) x
#define __OTORP__(x)
#define __PARAM__(n,o) n
#if !defined(__STDC__) && !defined(__cplusplus)
#if !defined(c_plusplus)
#define const
#endif
#define signed
#define void int
#define volatile
#define __V_ char
#else
#define __V_ void
#endif
#else
#define __PROTO__(x) ()
#define __OTORP__(x) x
#define __PARAM__(n,o) o
#define __MANGLE__
#define __V_ char
#define const
#define signed
#define void int
#define volatile
#endif
#if defined(__cplusplus) || defined(c_plusplus)
#define __VARARG__ ...
#else
#define __VARARG__
#endif
#if defined(__STDARG__)
#define __VA_START__(p,a) va_start(p,a)
#else
#define __VA_START__(p,a) va_start(p)
#endif
#endif
#include <ast.h>
#include "defs.h"
#include <errno.h>
#ifdef apollo
#include "/sys/ins/base.ins.c"
#include "/sys/ins/pad.ins.c"
#include "/sys/ins/error.ins.c"
#include <sys/param.h> /* for maximum pathname length */
#include <apollo/sys/ubase.h>
#include <apollo/sys/name.h>
#include <apollo/error.h>
int pad_create __PARAM__((char *fname), (fname)) __OTORP__(char *fname;){
short oldfd = 1;
short newfd;
short size = 25;
long st;
pad_$create (*fname, (short)strlen(fname), pad_$edit, oldfd,
pad_$bottom, 0, size, newfd, st);
if (st != 0)
error(ERROR_system(1),e_open,"dm pad");
return(newfd);
}
pad_wait __PARAM__((int fd), (fd)) __OTORP__(int fd;){
long st;
pad_$edit_wait((stream_$id_t)fd, st);
return (st == 0 ? 0 : 1);
}
char *apollo_error __PARAM__((void), ()){
extern __MANGLE__ long unix_proc_$status;
char subsys[80], module[80], code[80];
short slen, mlen, clen;
static char retstr[256];
error_$get_text (unix_proc_$status, subsys, slen,
module, mlen, code, clen);
subsys[slen] = module[mlen] = code[clen] = 0;
if (clen == 0)
sprintf (code, "status 0x%08lx", unix_proc_$status);
if ( mlen )
sprintf(retstr, "%s (%s/%s)", code, subsys, module );
else
sprintf(retstr, "%s (%s)", code, subsys );
return (retstr);
}
/*
* declarations to support the apollo builtin commands
* rootnode, inlib, and ver.
*/
static char last_rootnode[MAXPATHLEN] = "/";
static char do_ver;
static char *preval = NULL, *sysval, *sysid = "SYSTYPE";
/*
* code to support the apollo builtin functions rootnode,
* inlib, and ver.
*/
int b_rootnode __PARAM__((int argn,char *argv[]), (argn, argv)) __OTORP__(int argn;char *argv[];){
if (argn == 1)
{ /* report current setting */
sfprintf(sfstdout,"%s\n",last_rootnode);
return(0);
}
if (!is_valid_rootnode(argv[1]))
sh_cfail(e_rootnode);
if (rootnode(argv[1]) != 0)
{
perror("rootnode: "); /* ? */
sh_cfail(e_rootnode);
}
if (argn == 2)
strcpy(last_rootnode, argv[1]);
else
{
sysval = argv[1];
sh_eval(sh_sfeval(argv),0);
if (rootnode(last_rootnode) != 0)
sh_cfail(e_rootnode);
}
return(0);
}
int b_ver __PARAM__((int argn,char *argv[]), (argn, argv)) __OTORP__(int argn;char *argv[];){
char *oldver;
short i1, i2;
std_$call unsigned char c_$decode_version(__VARARG__);
oldver = SYSTYPENOD->namval.cp;
if (argn == 1 || argn > 2)
{
sysval = NULL;
if (oldver)
preval = sysval = oldver;
}
if (argn == 1)
{
if (!oldver || !sysval)
sh_cfail(e_nover);
else
{
sfprintf(sfstdout,"%s\n",sysval);
}
}
else
{
if (!c_$decode_version (*argv[1], (short) strlen (argv[1]), i1, i2))
sh_cfail(e_badver);
else
{
if (argn == 2)
{
short namlen = strlen(sysid);
short arglen = strlen(argv[1]);
nv_unset(SYSTYPENOD);
nv_putval(SYSTYPENOD, argv[1],NV_RDONLY);
nv_onattr(SYSTYPENOD, NV_EXPORT | NV_NOFREE);
ev_$set_var (sysid, &namlen, argv[1], &arglen);
}
else
{
int fd;
short namlen = strlen(sysid);
short arglen = strlen(argv[1]);
sysval = argv[1];
argv = &argv[2];
sh_eval(sh_sfeval(argv),0);
ev_$set_var(sysid, &namlen, sysval, &arglen);
if((fd=path_open(argv[0],path_get(argv[0]))) < 0)
{
arglen = (short)strlen(preval);
ev_$set_var (sysid, &namlen, preval, &arglen);
error(ERROR_system(1),e_open,argv[0]);
}
close(fd);
sh_eval(sfopen(argv[0],"s"),0);
arglen = (short)strlen(preval);
ev_$set_var (sysid, &namlen, preval, &arglen);
}
}
}
return(sh.exitval);
}
/*
* rootnode.c - a chroot call which doesn't require you to be root...
*/
/*
* Changes:
01/24/88 brian Initial coding
*/
#ifndef NULL
# define NULL ((__V_ *) 0)
#endif
extern __MANGLE__ boolean
unix_fio_$status_to_errno __PROTO__((
status_$t & status,
char * pn,
short & pnlen
));
is_valid_rootnode __PARAM__((const char *path), (path)) __OTORP__(const char *path;){
if (geteuid() == 0)
return 1;
return (path[0] == '/' && path[1] == '/' && path[2] != '\0' &&
strchr(&path[2], '/') == NULL);
}
rootnode __PARAM__((char * path), (path)) __OTORP__(char * path;){
uid_$t dir_uid, rtn_uid;
name_$pname_t new_root_name, rest_path;
name_$name_t leaf;
short rest_len, leaf_len, err;
status_$t status;
strcpy(new_root_name, path);
name_$resolve_afayc(new_root_name, (short)strlen(new_root_name),
&dir_uid, &rtn_uid, rest_path, &rest_len, leaf, &leaf_len, &err, &status);
if (status.all != status_$ok) {
unix_fio_$status_to_errno(status, path, strlen(path));
return (-1);
}
name_$set_diru(rtn_uid, rest_path, (short) rest_len, name_$node_dir_type, &status);
if (status.all != status_$ok) {
unix_fio_$status_to_errno(status, path, strlen(path));
return(-1);
}
return(0);
}
#endif /* apollo */
/*
* Apollo system support library loads into the virtual address space
*/
int b_inlib(argc,argv)
char **argv;
{
register char *a1 = argv[1];
int status;
short len;
std_$call void loader_$inlib(__VARARG__);
if(sh.subshell)
sh_subfork();
if(a1)
{
len = strlen(a1);
loader_$inlib(*a1, len, status);
if(status!=0)
error(3, e_badinlib);
}
return(0);
}

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

@ -236,15 +236,6 @@ static void put_restricted __PARAM__((register Namval_t* np,const char *val,int
nv_putv(np, val, flags, fp); nv_putv(np, val, flags, fp);
} }
#ifdef apollo
/* Trap for SYSTYPE variable */
static void put_systype __PARAM__((Namval_t* np,const char *val,int flags,Namfun_t *fp), (np, val, flags, fp)) __OTORP__(Namval_t* np;const char *val;int flags;Namfun_t *fp;){
sh.lastpath = 0;
nv_scan(sh.track_tree,rehash,NV_TAGGED,NV_TAGGED);
nv_putv(np, val, flags, fp);
}
#endif
#ifdef _hdr_locale #ifdef _hdr_locale
/* /*
@ -391,7 +382,6 @@ static MsgStr allmsgs[] = {
{"Resources lost", 25, 125}, {"Resources lost", 25, 125},
{"Reverting to old tty driver...", 25, 126}, {"Reverting to old tty driver...", 25, 126},
{"S [mask]", 25, 127}, {"S [mask]", 25, 127},
{"SIGAPOLLO", 25, 128},
{"Security label changed", 25, 129}, {"Security label changed", 25, 129},
{"Socket interrupt", 25, 130}, {"Socket interrupt", 25, 130},
{"Sound completed", 25, 131}, {"Sound completed", 25, 131},
@ -1080,10 +1070,6 @@ static Namfun_t L_ARG_init = { &L_ARG_disc};
static Namfun_t LC_ALL_init = { &LC_disc}; static Namfun_t LC_ALL_init = { &LC_disc};
static Namfun_t LANG_init = { &LC_disc}; static Namfun_t LANG_init = { &LC_disc};
#endif /* _hdr_locale */ #endif /* _hdr_locale */
#ifdef apollo
static const Namdisc_t SYSTYPE_disc = { 0, put_systype };
static Namfun_t SYSTYPE_init = { &SYSTYPEdisc};
#endif /* apollo */
#ifdef SHOPT_MULTIBYTE #ifdef SHOPT_MULTIBYTE
static const Namdisc_t CSWIDTH_disc = { 0, put_cswidth }; static const Namdisc_t CSWIDTH_disc = { 0, put_cswidth };
static Namfun_t CSWIDTH_init = { &CSWIDTH_disc}; static Namfun_t CSWIDTH_init = { &CSWIDTH_disc};
@ -1294,9 +1280,6 @@ static void nv_init __PARAM__((void), ()){
nv_stack(LCNUMNOD, &LC_NUM_init); nv_stack(LCNUMNOD, &LC_NUM_init);
nv_stack(LANGNOD, &LANG_init); nv_stack(LANGNOD, &LANG_init);
#endif /* _hdr_locale */ #endif /* _hdr_locale */
#ifdef apollo
nv_stack(SYSTYPENOD, &SYSTYPE_init);
#endif /* apollo */
#ifdef SHOPT_MULTIBYTE #ifdef SHOPT_MULTIBYTE
nv_stack(CSWIDTHNOD, &CSWIDTH_init); nv_stack(CSWIDTHNOD, &CSWIDTH_init);
#endif /* SHOPT_MULTIBYTE */ #endif /* SHOPT_MULTIBYTE */

11
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c
View file

@ -1422,16 +1422,7 @@ static void job_free __PARAM__((register int n), (n)) __OTORP__(register int n;)
static char *job_sigmsg __PARAM__((int sig), (sig)) __OTORP__(int sig;){ static char *job_sigmsg __PARAM__((int sig), (sig)) __OTORP__(int sig;){
static char signo[] = "Signal xxxx"; static char signo[] = "Signal xxxx";
#ifdef apollo
/*
* This code handles the formatting for the apollo specific signal
* SIGAPOLLO.
*/
extern __MANGLE__ char *apollo_error __PROTO__((void));
if ( sig == SIGAPOLLO )
return( apollo_error() );
#endif /* apollo */
if(sig<sh.sigmax && sh.sigmsg[sig]) if(sig<sh.sigmax && sh.sigmsg[sig])
return(sh.sigmsg[sig]); return(sh.sigmsg[sig]);
#if defined(SIGRTMIN) && defined(SIGRTMAX) #if defined(SIGRTMIN) && defined(SIGRTMAX)

64
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/name.c
View file

@ -101,11 +101,6 @@
#include "FEATURE/locale" #include "FEATURE/locale"
#include "national.h" #include "national.h"
#ifdef apollo
extern __MANGLE__ void ev_$delete_var(__VARARG__);
extern __MANGLE__ void ev_$set_var(__VARARG__);
#endif /* apollo */
static void attstore __PROTO__((Namval_t*)); static void attstore __PROTO__((Namval_t*));
static void pushnam __PROTO__((Namval_t*)); static void pushnam __PROTO__((Namval_t*));
static char *staknam __PROTO__((Namval_t*, char*)); static char *staknam __PROTO__((Namval_t*, char*));
@ -523,22 +518,7 @@ Namval_t *nv_open __PARAM__((const char *name,Hashtab_t *root,int flags), (name,
#endif /* SHOPT_BSH */ #endif /* SHOPT_BSH */
} }
nv_onattr(np, flags&NV_ATTRIBUTES); nv_onattr(np, flags&NV_ATTRIBUTES);
#ifdef apollo
/*
* Set environment variable defined in the underlying
* DOMAIN_OS cache. This is done because dsee will only
* process the path if it has changed since the last
* time it looked.
*/
if(nv_isattr(np,NV_EXPORT) && !nv_isattr(np,NV_IMPORT)
&& (flags&NV_ASSIGN) && !(flags&(NV_NOSCOPE|NV_ARRAY)))
{
short namlen,vallen;
namlen =strlen(nv_name(np));
vallen = strlen(cp);
ev_$set_var(nv_name(np),&namlen,cp,&vallen);
}
#endif /* apollo */
/* /*
* Set environment variable defined in the underlying * Set environment variable defined in the underlying
* libc environ. This is done because routines within * libc environ. This is done because routines within
@ -657,21 +637,7 @@ void nv_putval __PARAM__((register Namval_t *np, const char *string, int flags),
const char *tofree=0; const char *tofree=0;
if(flags&NV_INTEGER) if(flags&NV_INTEGER)
sp = sh_etos(*((double*)sp),12); sp = sh_etos(*((double*)sp),12);
#ifdef apollo
if(nv_isattr(np, NV_HOST)==NV_HOST && sp)
{
/*
* return the host file name given the UNIX name
* non-unix hosts that use file name mapping
* should change this
*/
char pathname[1024];
short pathlen;
unix_fio_$get_name(sp,pathname,&pathlen);
pathname[pathlen] = 0;
sp = pathname;
}
#endif /* apollo */
if((nv_isattr(np, NV_RJUST|NV_ZFILL|NV_LJUST)) && sp) if((nv_isattr(np, NV_RJUST|NV_ZFILL|NV_LJUST)) && sp)
{ {
for(;*sp == ' '|| *sp=='\t';sp++); for(;*sp == ' '|| *sp=='\t';sp++);
@ -734,16 +700,6 @@ void nv_putval __PARAM__((register Namval_t *np, const char *string, int flags),
if(tofree) if(tofree)
free((__V_*)tofree); free((__V_*)tofree);
} }
#ifdef apollo
if((flags&NV_RDONLY) && nv_isattr(np,NV_EXPORT))
{
short namlen, vallen;
char *vp = nv_getval(np);
namlen =strlen(nv_name(np));
vallen = strlen(vp);
ev_$set_var(nv_name(np),&namlen,vp,&vallen);
}
#endif /* apollo */
/* /*
* Set environment variable defined in the underlying * Set environment variable defined in the underlying
* libc environ. This is done because routines within * libc environ. This is done because routines within
@ -1200,21 +1156,7 @@ void nv_newattr __PARAM__((register Namval_t *np, unsigned newatts, int size),
if(newatts&NV_EXPORT) if(newatts&NV_EXPORT)
nv_offattr(np,NV_IMPORT); nv_offattr(np,NV_IMPORT);
#endif /* SHOPT_BSH */ #endif /* SHOPT_BSH */
#ifdef apollo
if(((n^newatts)&NV_EXPORT))
/* record changes to the environment */
{
short namlen = strlen(nv_name(np));
if(n&NV_EXPORT)
ev_$delete_var(nv_name(np),&namlen);
else
{
char *vp = nv_getval(np);
short vallen = strlen(vp);
ev_$set_var(nv_name(np),&namlen,vp,&vallen);
}
}
#endif /* apollo */
/* /*
* Set environment variable defined in the underlying * Set environment variable defined in the underlying
* libc environ. This is done because routines within * libc environ. This is done because routines within

13
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/path.c
View file

@ -745,18 +745,9 @@ static char *execs __PARAM__((const char *ap,const char *arg0,register char **ar
#endif /* SHELLMAGIC */ #endif /* SHELLMAGIC */
switch(errno) switch(errno)
{ {
#ifdef apollo
/*
* On apollo's execve will fail with eacces when
* file has execute but not read permissions. So,
* for now we will pretend that EACCES and ENOEXEC
* mean the same thing.
*/
case EACCES:
#endif /* apollo */
case ENOEXEC: case ENOEXEC:
exscript(path,argv); exscript(path,argv);
#ifndef apollo
case EACCES: case EACCES:
{ {
struct stat statb; struct stat statb;
@ -764,7 +755,7 @@ static char *execs __PARAM__((const char *ap,const char *arg0,register char **ar
errno = EISDIR; errno = EISDIR;
} }
/* FALL THROUGH */ /* FALL THROUGH */
#endif /* !apollo */
#ifdef ENAMETOOLONG #ifdef ENAMETOOLONG
case ENAMETOOLONG: case ENAMETOOLONG:
#endif /* ENAMETOOLONG */ #endif /* ENAMETOOLONG */

3
cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c
View file

@ -117,9 +117,6 @@ static struct _m_ map[] =
#ifdef SIGALRM #ifdef SIGALRM
"Alarm call", "ALRM", SIGALRM, "Alarm call", "ALRM", SIGALRM,
#endif #endif
#ifdef SIGAPOLLO
"Apollo", "APOLLO", SIGAPOLLO,
#endif
#ifdef SIGBUS #ifdef SIGBUS
"Bus error", "BUS", SIGBUS, "Bus error", "BUS", SIGBUS,
#endif #endif

3
cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c
View file

@ -112,9 +112,6 @@ static struct _m_ map[] =
#ifdef SIGALRM #ifdef SIGALRM
"Alarm call", "ALRM", SIGALRM, "Alarm call", "ALRM", SIGALRM,
#endif #endif
#ifdef SIGAPOLLO
"Apollo", "APOLLO", SIGAPOLLO,
#endif
#ifdef SIGBUS #ifdef SIGBUS
"Bus error", "BUS", SIGBUS, "Bus error", "BUS", SIGBUS,
#endif #endif

3
cde/programs/dtksh/variables.c
View file

@ -174,9 +174,6 @@ const struct shtable2 shtab_variables[] =
#ifdef MULTIBYTE #ifdef MULTIBYTE
"CSWIDTH", 0, (char*)0, "CSWIDTH", 0, (char*)0,
#endif /* MULTIBYTE */ #endif /* MULTIBYTE */
#ifdef apollo
"SYSTYPE", 0, (char*)0,
#endif /* apollo */
EXKSH_EXTRA_VAR EXKSH_EXTRA_VAR
"", 0, (char*)0 "", 0, (char*)0
}; };

12
cde/programs/dtlogin/Imakefile
View file

@ -162,28 +162,28 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
SRCS1 = access.c account.c auth.c genauth.c daemon.c dm.c \ SRCS1 = access.c account.c auth.c genauth.c daemon.c dm.c \
dpylist.c error.c file.c mitauth.c protodpy.c policy.c \ dpylist.c error.c file.c mitauth.c protodpy.c policy.c \
reset.c resource.c server.c session.c socket.c util.c \ reset.c resource.c server.c session.c socket.c util.c \
verify.c version.c apollo.c sysauth.c fontpath.c $(DESSRCS) \ verify.c version.c sysauth.c fontpath.c $(DESSRCS) \
qualify.c choose.c netaddr.c xdmcp.c \ qualify.c choose.c netaddr.c xdmcp.c \
$(PAM_SRCS) $(SOLARIS_SRCS) $(PAM_SRCS) $(SOLARIS_SRCS)
OBJS1 = access.o account.o auth.o genauth.o daemon.o dm.o \ OBJS1 = access.o account.o auth.o genauth.o daemon.o dm.o \
dpylist.o error.o file.o mitauth.o protodpy.o policy.o \ dpylist.o error.o file.o mitauth.o protodpy.o policy.o \
reset.o resource.o server.o session.o socket.o util.o \ reset.o resource.o server.o session.o socket.o util.o \
verify.o version.o apollo.o sysauth.o fontpath.o $(DESOBJS) \ verify.o version.o sysauth.o fontpath.o $(DESOBJS) \
qualify.o choose.o netaddr.o xdmcp.o \ qualify.o choose.o netaddr.o xdmcp.o \
$(PAM_OBJS) $(SOLARIS_OBJS) $(PAM_OBJS) $(SOLARIS_OBJS)
PROG2 = dtgreet PROG2 = dtgreet
#ifdef AlphaArchitecture #ifdef AlphaArchitecture
SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \ SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \
vgversion.c vgapollo.c vglang.c vgsiaform.c vgversion.c vglang.c vgsiaform.c
OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \ OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \
vgversion.o vgapollo.o vglang.o vgsiaform.o vgversion.o vglang.o vgsiaform.o
#else #else
SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \ SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \
vgversion.c vgapollo.c vglang.c vgversion.c vglang.c
OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \ OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \
vgversion.o vgapollo.o vglang.o vgversion.o vglang.o
#endif #endif
PROG3 = dtchooser PROG3 = dtchooser

6
cde/programs/dtlogin/account.c
View file

@ -43,14 +43,8 @@
* *
***************************************************************************/ ***************************************************************************/
#ifdef __apollo
#include <X11/apollosys.h> /* for pid_t struct in hp-ux sys/types.h */
#include <sys/types.h>
#else
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#endif
#ifdef AIXV3 #ifdef AIXV3
#include <usersec.h> #include <usersec.h>

178
cde/programs/dtlogin/apollo.c
View file

@ -1,178 +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
*/
/* $XConsortium: apollo.c /main/4 1995/10/27 16:11:14 rswiston $ */
/* *
* (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. *
*/
/************************************<+>*************************************
****************************************************************************
**
** File: apollo.c
**
** Project: HP Visual User Environment (DT)
**
** Description: Dtlogin user setup routines for Domain/OS 10.4
**
** These routines set up the user's state before starting
** the DT session.
**
**
** (c) Copyright 1987, 1988, 1989 by Hewlett-Packard Company
**
**
** Conditional compiles:
**
** __apollo Domain OS only
**
****************************************************************************
************************************<+>*************************************/
#include <stdio.h> /* just so file isn't empty */
#ifdef __apollo
/***************************************************************************
*
* Includes & Defines
*
***************************************************************************/
#include <pwd.h>
#include <apollo/base.h>
#include <apollo/error.h>
#include "apollo/passwd.h" /* copy of <apollo/sys/passwd.h> */
#include "apollo/login.h" /* copy of <apollo/sys/login.h> */
#include "dm.h"
#include "vgmsg.h"
#define SCMPN(a, b) strncmp(a, b, sizeof(a))
#define SCPYN(a, b) strncpy(a, b, sizeof(a))
#define eq(a,b) !strcmp(a,b)
#define NMAX strlen(name)
#define HMAX strlen(host)
#define STRING(str) (str), (short) strlen(str)
#define STRNULL(s, l) ((s)[(l)] = '\0')
#define ISTRING(str) (str), (int) strlen(str)
/***************************************************************************
*
* External declarations
*
***************************************************************************/
/***************************************************************************
*
* Procedure declarations
*
***************************************************************************/
/***************************************************************************
*
* Global variables
*
***************************************************************************/
/***************************************************************************
*
* Stub routines
*
***************************************************************************/
/***************************************************************************
*
* DoLogin
*
* set up user environment
***************************************************************************/
int
DoLogin( char *user, char *passwd, char *host )
{
ios_$id_t logid;
login_$opt_set_t opts;
status_$t status;
error_$string_t subsystem, module, error;
short sslen, modlen, errlen;
char buf[BUFSIZ];
Debug("DoLogin(): for %s\n", user);
login_$set_host(host, strlen(host));
opts = login_$no_prompt_name_sm |
login_$no_prompt_pass_sm |
login_$addut_sm |
login_$chown_tty_sm;
Debug("DoLogin(): before calling login_$chk_login()\n");
if ((!login_$chk_login(opts, STRING(user), STRING(passwd),
(login_$open_log_p) NULL, STRING(""),
&logid, &status))
&& (status.all != status_$ok)) {
Debug("DoLogin(): login_$chk_login() failed\n");
error_$get_text(status, subsystem, &sslen, module, &modlen,
error, &errlen);
STRNULL(error, errlen);
STRNULL(module, modlen);
STRNULL(subsystem, sslen);
sprintf(buf,ReadCatalog(MC_LOG_SET,MC_LOG_DOMAIN,MC_DEF_LOG_DOMAIN),
error, subsystem, module);
LogError (buf);
bzero (passwd, strlen(passwd));
return (false);
}
Debug("DoLogin(): login_$chk_login() succeeded\n");
/*
* clear password...
*/
bzero (passwd, strlen(passwd));
return (true);
}
#endif

100
cde/programs/dtlogin/apollo/des.h
View file

@ -1,100 +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
*/
/* $XConsortium: des.h /main/3 1995/10/27 16:19:08 rswiston $ */
/* *
* (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. *
*/
/*
{ DES, USX/LIB/DESLIB, PJL, 04/05/82 }
{ DES routines }
{ CHANGES:
12/21/88 gilbert Modifications for C++.
03/25/88 brian Created ANSI C version
01/13/86 nazgul Created C version
08/25/83 spf Added us_des_ins_pas declaration
}
*/
#ifndef apollo_sys_des_h
#define apollo_sys_des_h
/* Enable function prototypes for ANSI C and C++ */
#if defined(__STDC__) || defined(c_plusplus) || defined(__cplusplus)
# define _PROTOTYPES
#endif
/* Required for C++ V2.0 */
#ifdef __cplusplus
extern "C" {
#endif
#ifdef _PROTOTYPES
#define std_$call extern
#endif
typedef char des_$key[8];
/*
packed record { NOTE THIS WELL!!! }
bits: 0..127; { 56 bits: LEFT ADJUSTED in 8 bytes }
parity: 0..1 { reserved for parity, but ignored }
end;
*/
typedef char des_$text[8]; /* Actually a 64 bit set */
typedef char des_$key_sched[16][8];
std_$call void des_$encrypt(
#ifdef _PROTOTYPES
des_$text & plain, /* input 64 bits to encrypt */
des_$text * cipher, /* ...get back result */
des_$key_sched & key_sched /* made with des_$compute_key_sched */
#endif
);
std_$call void des_$decrypt(
#ifdef _PROTOTYPES
des_$text & cipher, /* input 64 bits to decrypt */
des_$text * plain, /* ...get back result */
des_$key_sched & key_sched /* made with des_$compute_key_sched */
#endif
);
std_$call void des_$compute_key_sched(
#ifdef _PROTOTYPES
des_$key & key, /* eight byte key */
des_$key_sched * key_sched /* output key schedule */
#endif
);
#ifdef __cplusplus
}
#endif
#endif

254
cde/programs/dtlogin/apollo/login.h
View file

@ -1,254 +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
*/
/* $XConsortium: login.h /main/3 1995/10/27 16:19:16 rswiston $ */
/* *
* (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. *
*/
/* LOGIN.INS.C, /us/ins, rod, 12/09/88 */
/* changes:
12/21/88 gilbert Modifications for C++.
12/09/88 betsy add login_$logins_disabled
04/19/88 betsy cast values for login_$opt_set_t ( to be consistent )
03/30/88 betsy add login_$set_host
03/21/88 betsy add options login_$addut & login_$chown_tty
01/04/88 brian Fixed param decl of login_$chk_login
12/31/87 brian Converted to ANSII from /us/ins/login.ins.c/6
*/
#define login_$mod 2
#define login_$err_shut 0x07020001 /*user wants to caller to shut down*/
#define login_$err_exit 0x07020002 /*user wants to caller to exit*/
#define login_$no_room 0x07020003 /*no room for rep at open */
#define login_$bad_passwd 0x07020004 /*passwd check failed */
#define login_$inv_acct 0x07020005 /* account expired */
#define login_$logins_disabled 0x07020006 /* logins disabled */
#define login_$log_stream_index 4 /* 4th stream in streams array is the open log */
typedef void *login_$ptr;
typedef short enum { login_$read, login_$update } login_$mode_t;
typedef short enum {
login_$log_events, /* log all events */
login_$log_inv_only, /* log only unsuccessful attempts to log in */
login_$no_passwd, /* don't require password (!) */
login_$no_setsid, /* implies no_setpm, but allows set of wd/nd */
login_$no_setpm, /* not done unless setsid successfully done */
login_$no_setwd, /* not done if setsid attempted and failed */
login_$fail_ret, /* return if failure logged */
login_$no_prompt_name, /* no prompt for name */
login_$no_prompt_pass, /* no prompt for password */
login_$preserve_sub, /* preserve subsystem */
login_$leave_log_open, /* leave log file open on return */
login_$addut, /* add utmp/wtmp/lastlog entry */
login_$chown_tty, /* chown the login device */
login_$extra14, /* pad to 32-bit set */
login_$extra15,
login_$extra16,
login_$extra17 /* just over the border */
} login_$opt_t;
typedef long login_$opt_set_t;
#define login_$log_events_sm ((login_$opt_set_t) (1 << (int) login_$log_events))
#define login_$log_inv_only_sm ((login_$opt_set_t) (1 << (int) login_$log_inv_only))
#define login_$no_passwd_sm ((login_$opt_set_t) (1 << (int) login_$no_passwd))
#define login_$no_setsid_sm ((login_$opt_set_t) (1 << (int) login_$no_setsid))
#define login_$no_setpm_sm ((login_$opt_set_t) (1 << (int) login_$no_setpm))
#define login_$no_setwd_sm ((login_$opt_set_t) (1 << (int) login_$no_setwd))
#define login_$fail_ret_sm ((login_$opt_set_t) (1 << (int) login_$fail_ret))
#define login_$no_prompt_name_sm ((login_$opt_set_t) (1 << (int) login_$no_prompt_name))
#define login_$no_prompt_pass_sm ((login_$opt_set_t) (1 << (int) login_$no_prompt_pass))
#define login_$preserve_sub_sm ((login_$opt_set_t) (1 << (int) login_$preserve_sub))
#define login_$leave_log_open_sm ((login_$opt_set_t) (1 << (int) login_$leave_log_open))
#define login_$addut_sm ((login_$opt_set_t) (1 << (int) login_$addut))
#define login_$chown_tty_sm ((login_$opt_set_t) (1 << (int) login_$chown_tty))
typedef char login_$string_t[256];
typedef ios_$id_t login_$streams_t[4];
typedef char (*login_$open_log_p)(
char * log_file,
short & log_flen,
stream_$id_t * logstr
);
typedef struct {
int (*help)(stream_$id_t & stream);
login_$open_log_p open_log;
/* A note to you: aug-87
These next two routines are here only for callers that cannot provide streams
for their i/o (i.e. the dm. It was just too hard, esp since he is 'going away'.)
To have them used, pass the number -2 as your first stream in login_$streams_t.
A bit of a hack, true, but as long as we all understand each other, it will work.
Login_$login promises NOT to ref these routines if you pass real streams. (Note
that the fillbuf stuff is gone (since changing home dir is no longer supported.)
*/
short (*pread)(
stream_$id_t & stream,
char * inbuf,
short & inlen,
char * pstr,
short & plen,
boolean & echo,
char * fillbuf, /* pre-fill buffer with string */
short & fillbuflen
);
int (*pwrite)(
stream_$id_t & stream,
char * pstr,
short & plen
);
} login_$proc_rec_t;
/* Required for C++ V2.0 */
#ifdef __cplusplus
extern "C" {
#endif
/* FULL_LOGIN --- performs the login function with prompting, implementing system policy,
setting wd, nd, pm_$sid_text, pm_$home_txt and default shell (unless
already set), prints /etc/dmmsg if exists. Supports 'shut, 'exit' and
'help' and all options EXCEPT login_$no_setsid. Takes optional strings
for pre-read user name [passwd]. */
extern boolean
login_$full_login(
login_$opt_set_t & opts,
login_$streams_t * streams, /* in, out, err, log_stream */
char * login_name, /* login string - iff login_$no_prompt_name */
short & login_nlen,
char * pass, /* passwd string - iff login_$no_prompt_pass */
short & passlen,
login_$proc_rec_t & ioprocs, /* procedure vectors */
char * log_file, /* used iff login_$log_events/inv in opts */
short & log_flen,
status_$t * status
);
/* CHK_LOGIN --- performs the login function based on the strings passed in with no
prompting. DOES NOT fully implement system policy. i.e. does nothing
if passwd needs to be changed, but returns bad status if expired or
invalid accounts. Gives no error msgs. */
extern boolean
login_$chk_login (
login_$opt_set_t & opts,
char * login_name, /* login string - iff login_$no_prompt_name */
short & login_nlen,
char * pass, /* passwd string - iff login_$no_prompt_pass */
short & passlen,
login_$open_log_p & open_log, /* used iff login_$log_events/inv in opts */
char * log_file, /* used iff login_$log_events/inv in opts */
short & log_flen, /* used iff login_$log_events/inv in opts */
ios_$id_t * log_stream, /* stream for open log file iff login_$leave_log_open */
status_$t * status
);
/*-----------------------------------------------------------------------------
LOGIN_$SET_HOST - sets the host name to be used in the addut on a subsequent
login_$full_login or login_$chk_login call */
extern void
login_$set_host(
char * host_name, /* max len is 64 */
int & host_len
);
/* O P E N --- prepare to do login type stuff */
extern void
login_$open(
login_$mode_t & lmode,
login_$ptr * lptr,
status_$t * st
);
/* S E T _ P P O -- set the PPO to operate on
if ppo length is zero, use currently logged in user's PPO
if set_ppo not call before chpass, ckpass or chhdir called, one
will automatically be done (for current user)
*/
extern void
login_$set_ppo(
login_$ptr & lptr,
char * ppo,
short & plen,
status_$t * st
);
/* C K P A S S -- check password
checks the supplied password against that of the set PPO
*/
extern void
login_$ckpass(
login_$ptr & lptr,
char * pass,
short & plen,
status_$t * st
);
/* C H P A S S --- change password in the registry */
extern void
login_$chpass(
login_$ptr & lptr,
char * pass,
short & plen,
status_$t * st
);
/* C H H D I R --- change home directory in the registry */
extern void
login_$chhdir(
login_$ptr & lptr,
char * hdir,
short & hlen,
status_$t * st
);
/* E R R _ C O N T E X T --- file name that had problems */
extern void
login_$err_context(
login_$ptr & lptr,
status_$t * errst,
char * badf,
short * blen,
status_$t * st
);
/* C L O S E --- release all acquired resources */
/* NOTE --- call even if open FAILS! */
extern void
login_$close(
login_$ptr & lptr,
status_$t * st
);
#ifdef __cplusplus
}
#endif

106
cde/programs/dtlogin/apollo/passwd.h
View file

@ -1,106 +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
*/
/* $XConsortium: passwd.h /main/3 1995/10/27 16:19:23 rswiston $ */
/* *
* (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. *
*/
/* passwd.h us/unix/include/apollo/sys, brian
Password definitions
--------------------------------------------------------------------------
| THE FOLLOWING PROGRAMS ARE THE SOLE PROPERTY OF APOLLO COMPUTER INC. |
| AND CONTAIN ITS PROPRIETARY AND CONFIDENTIAL INFORMATION. |
--------------------------------------------------------------------------
Changes:
12/27/88 gilbert Modifications for C++.
03/25/88 brian ANSI version (from .ins.c)
11/05/87 betsy need to include des.ins.c
08/31/87 betsy add support for unix encryption, remove passwd_$create
for sr10 registry
07/07/87 pato drop the (wrong) explicit values for passwd_$encrypt_t
04/02/86 lwa Change enum to short enum.
01/13/86 nazgul Created C version
04/05/82 PJL changes for DES encryption
*/
#ifndef apollo_sys_passwd_ins_c
#define apollo_sys_passwd_ins_c
/* Enable function prototypes for ANSI C and C++ */
#if defined(__STDC__) || defined(c_plusplus) || defined(__cplusplus)
# define _PROTOTYPES
#endif
/* Required for C++ V2.0 */
#ifdef __cplusplus
extern "C" {
#endif
#ifdef _PROTOTYPES
#define std_$call extern
#endif
#include "apollo/des.h" /* copy from <apollo/sys/des.h> */
#define passwd_$mod 3
#define passwd_$maxlen 8
typedef short enum { passwd_$none, passwd_$des,
passwd_$unix, passwd_$unix_bits } passwd_$encrypt_t;
typedef struct {
passwd_$encrypt_t ptype;
union {
char plain[8]; /* passwd_$none */
struct { /* passwd_$des, passwd_$unix_bits */
short rand;
des_$text bits;
} des;
struct { /* passwd_$unix */
char salt[2];
char cipher[12];
} unix_encrypted;
} pw_union;
} passwd_$rec_t;
typedef char passwd_$str_t[passwd_$maxlen];
std_$call boolean passwd_$check(
#ifdef _PROTOTYPES
passwd_$str_t & pass_str,
short & pass_len,
passwd_$rec_t & enc_passwd,
status_$t * status
#endif
);
#ifdef __cplusplus
}
#endif
#endif

4
cde/programs/dtlogin/config/Xservers.src
View file

@ -91,9 +91,7 @@ XCOMM interest.
XCOMM XCOMM
XCOMM ########################################################################## XCOMM ##########################################################################
#if defined (__apollo) #if defined (_AIX) && defined (AIXV4)
* Local local /etc/Xdomain :0
#elif defined (_AIX) && defined (AIXV4)
:0 Local local@console /usr/lpp/X11/defaults/xserverrc -T -force :0 :0 Local local@console /usr/lpp/X11/defaults/xserverrc -T -force :0
#elif defined (_AIX) #elif defined (_AIX)
:0 Local local@console /usr/bin/X11/X -T -force :0 :0 Local local@console /usr/bin/X11/X -T -force :0

4
cde/programs/dtlogin/dm.c
View file

@ -895,7 +895,6 @@ StartDisplay(
kill (d->serverPid, d->resetSignal); kill (d->serverPid, d->resetSignal);
} }
#ifndef __apollo
/* /*
* initialize d->utmpId. Check to see if anyone else is using * initialize d->utmpId. Check to see if anyone else is using
* the requested ID. Always allow the first request for "dt" to * the requested ID. Always allow the first request for "dt" to
@ -932,7 +931,6 @@ StartDisplay(
return 0; return 0;
} }
} }
#endif
/* /*
* set d->gettyLine to "console" for display ":0" if it is not * set d->gettyLine to "console" for display ":0" if it is not
@ -1484,7 +1482,7 @@ SetTitle( char *name, char *ptr )
#define GETTYPATH "/usr/libexec/getty" #define GETTYPATH "/usr/libexec/getty"
#elif defined(__linux__) #elif defined(__linux__)
#define GETTYPATH "/sbin/getty" #define GETTYPATH "/sbin/getty"
#elif !defined (__apollo) #else
#define GETTYPATH "/etc/getty" #define GETTYPATH "/etc/getty"
#endif #endif

8
cde/programs/dtlogin/dm.h
View file

@ -582,14 +582,6 @@ extern int UtmpIdOpen(
char *utmpId) ; char *utmpId) ;
/******************************* apollo.c **************************/
extern int DoLogin(
char *user,
char *passwd,
char *host) ;
/******************************* auth.c **************************/ /******************************* auth.c **************************/
extern int ConvertAddr( extern int ConvertAddr(

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

@ -216,11 +216,8 @@ static char AppName[16] = DTLOGIN;
#endif #endif
#ifndef DEF_LANG /* LANG default settings for various architectures */ #ifndef DEF_LANG /* LANG default settings for various architectures */
# ifdef __apollo
# define DEF_LANG "C"
# endif
# ifdef sun /* default language under Solaris */ # ifdef sun /* default language under Solaris */
# define DEF_LANG "C" # define DEF_LANG "C"
# endif # endif
#endif #endif
@ -614,7 +611,7 @@ LoadDMResources( void )
keyFile = getFullFileName(keyFile, 0, NULL); keyFile = getFullFileName(keyFile, 0, NULL);
accessFile = getFullFileName(accessFile, 0, NULL); accessFile = getFullFileName(accessFile, 0, NULL);
#ifndef __apollo /* set a TZ default for all OS except Domain */ /* set a TZ default */
if (timeZone == NULL || strlen(timeZone) == 0) if (timeZone == NULL || strlen(timeZone) == 0)
{ {
/* /*
@ -622,7 +619,6 @@ LoadDMResources( void )
*/ */
GetSysParms(&timeZone,0,0); GetSysParms(&timeZone,0,0);
} }
#endif
} }

42
cde/programs/dtlogin/session.c
View file

@ -134,11 +134,6 @@ static int sia_exit_proc_reg = FALSE;
#endif /* SIA */ #endif /* SIA */
#ifdef __apollo
extern char *getenv();
#endif
#define GREET_STATE_LOGIN 0 #define GREET_STATE_LOGIN 0
#define GREET_STATE_AUTHENTICATE 1 #define GREET_STATE_AUTHENTICATE 1
#define GREET_STATE_EXIT 2 #define GREET_STATE_EXIT 2
@ -1418,30 +1413,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
Debug("BLS - Session setup complete.\n"); Debug("BLS - Session setup complete.\n");
} else { } else {
#endif /* BLS */ #endif /* BLS */
#ifdef __apollo
/*
* This should never fail since everything has been verified already.
* If it does it must mean registry strangeness, so exit, and try
* again...
*/
if (!DoLogin (user, greet.password, d->name)) exit (1);
/*
* extract the SYSTYPE and ISP environment values and set into user's
* environment. This is necessary since we do an execve below...
*/
verify->userEnviron = setEnv(verify->userEnviron, "SYSTYPE",
getenv("SYSTYPE"));
verify->userEnviron = setEnv(verify->userEnviron, "ISP",
getenv("ISP"));
#else /* ! __apollo */
# ifdef __AFS # ifdef __AFS
if ( IsVerifyName(VN_AFS) ) { if ( IsVerifyName(VN_AFS) ) {
@ -1525,8 +1496,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
} }
#endif #endif
#endif /* __apollo */
#ifdef BLS #ifdef BLS
} /* ends the else clause of if ( ISSECURE ) */ } /* ends the else clause of if ( ISSECURE ) */
#endif /* BLS */ #endif /* BLS */
@ -1655,7 +1624,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
failsafeArgv[i++] = "-e"; failsafeArgv[i++] = "-e";
failsafeArgv[i++] = "/bin/passwd"; failsafeArgv[i++] = "/bin/passwd";
#if defined (__apollo) || defined(__PASSWD_ETC) #if defined(__PASSWD_ETC)
failsafeArgv[i++] = "-n"; failsafeArgv[i++] = "-n";
#endif #endif
failsafeArgv[i++] = getEnv (verify->userEnviron, "USER"); failsafeArgv[i++] = getEnv (verify->userEnviron, "USER");
@ -2077,15 +2046,6 @@ RunGreeter( struct display *d, struct greet_info *greet,
env = setEnv(env, "OPENWINHOME", path); env = setEnv(env, "OPENWINHOME", path);
#endif #endif
#ifdef __apollo
/*
* set environment for Domain machines...
*/
env = setEnv(env, "ENVIRONMENT", "bsd");
env = setEnv(env, "SYSTYPE", "bsd4.3");
#endif
Debug ("Greeter environment:\n"); Debug ("Greeter environment:\n");
printEnv(env); printEnv(env);
Debug ("End of Greeter environment:\n"); Debug ("End of Greeter environment:\n");

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

@ -64,7 +64,6 @@
** Platform identification: ** Platform identification:
** **
** __hpux HP-UX OS only ** __hpux HP-UX OS only
** __apollo Domain OS only
** sun SUN OS only ** sun SUN OS only
** SVR4 SUN OS et al. ** SVR4 SUN OS et al.
** _AIX AIX only ** _AIX AIX only
@ -115,7 +114,7 @@
/* /*
* Define as generic those without platform specific code. * Define as generic those without platform specific code.
*/ */
#if !(defined(__hpux) || defined(__apollo) || defined(_AIX) || defined(sun)) #if !(defined(__hpux) || defined(_AIX) || defined(sun))
#define generic #define generic
#endif #endif
@ -704,7 +703,7 @@ CheckPassword( char *name, char *passwd, struct passwd **ppwd )
#ifdef __PASSWD_ETC #ifdef __PASSWD_ETC
/* /*
* If regular passwd check fails, try old-style Apollo SR * If regular passwd check fails, try old-style SR
*/ */
if (rgy_$is_des(passwd, strlen(passwd), p->pw_passwd) == TRUE) if (rgy_$is_des(passwd, strlen(passwd), p->pw_passwd) == TRUE)

368
cde/programs/dtlogin/vgapollo.c
View file

@ -1,368 +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
*/
/* $XConsortium: vgapollo.c /main/4 1995/10/27 16:17:06 rswiston $ */
/* *
* (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. *
*/
/************************************<+>*************************************
****************************************************************************
**
** File: vgapollo.c
**
** Project: HP Visual User Environment (DT)
**
** Description: Dtgreet user authentication routines for Domain/OS 10.4
**
** These routines validate the user; checking name, password,
** home directory, password aging, etc.
**
**
** (c) Copyright 1987, 1988, 1989 by Hewlett-Packard Company
**
**
** Conditional compiles:
**
** __apollo Domain OS only
**
****************************************************************************
************************************<+>*************************************/
#include <stdio.h> /* placed here so file isn't empty */
#include "vgmsg.h"
#ifdef __apollo
/***************************************************************************
*
* Includes & Defines
*
***************************************************************************/
#include <pwd.h>
#include <apollo/base.h>
#include <apollo/error.h>
#include "apollo/passwd.h" /* copy of <apollo/sys/passwd.h> */
#include "apollo/login.h" /* copy of <apollo/sys/login.h> */
#include "apollo/rgy_base.h"
#include "vg.h"
#define SCMPN(a, b) strncmp(a, b, sizeof(a))
#define SCPYN(a, b) strncpy(a, b, sizeof(a))
#define eq(a,b) !strcmp(a,b)
#define NMAX strlen(name)
#define HMAX strlen(host)
#define STRING(str) (str), (short) strlen(str)
#define STRNULL(s, l) ((s)[(l)] = '\0')
#define ISTRING(str) (str), (int) strlen(str)
/***************************************************************************
*
* External declarations
*
***************************************************************************/
/***************************************************************************
*
* Procedure declarations
*
***************************************************************************/
static boolean CheckLogin( char *user, char *passwd, char *host,
status_$t *status)
static boolean CheckPassword( char *user, char *passwd) ;
static int PasswordAged( register struct passwd *pw) ;
/***************************************************************************
*
* Global variables
*
***************************************************************************/
rgy_$policy_t policy;
rgy_$acct_user_t user_part;
rgy_$acct_admin_t admin_part;
extern struct passwd * getpwnam_full();
/***************************************************************************
*
* Stub routines
*
***************************************************************************/
/***************************************************************************
*
* CheckLogin
*
* check validity of user name, password and other login parameters
*
***************************************************************************/
static boolean
CheckLogin( char *user, char *passwd, char *host, status_$t *status)
{
ios_$id_t logid;
login_$opt_set_t opts;
login_$set_host(host, strlen(host));
opts = login_$no_setsid_sm |
login_$no_setwd_sm |
login_$no_prompt_pass;
if ( !login_$chk_login(opts,
STRING(user),
STRING(passwd),
(login_$open_log_p) NULL,
STRING(""),
&logid,
status)) {
return(false);
} else
return(true);
}
/***************************************************************************
*
* CheckPassword
*
* check validity of just user name and password
***************************************************************************/
static boolean
CheckPassword( char *user, char *passwd )
{
login_$ptr lptr;
status_$t status;
login_$open((login_$mode_t) 0, &lptr, &status);
if (status.all == status_$ok)
login_$set_ppo(lptr, STRING(user), &status);
if (status.all == status_$ok)
login_$ckpass(lptr, STRING(passwd), &status);
return (status.all == status_$ok);
}
/***************************************************************************
*
* PasswordAged
*
* see if password has aged
***************************************************************************/
static int
PasswordAged( register struct passwd *pw )
{
boolean lrgy;
/* Account validity checks: If we were able to connect to the network
* registry, then we've acquired account and policy data and can perform
* account/password checking
*/
lrgy = rgy_$using_local_registry();
if ( !lrgy ) {
/* Check for password expiration or invalidity */
if (rgy_$is_passwd_expired(&user_part, &policy ) == true ||
rgy_$is_passwd_invalid(&user_part) == true) {
return TRUE;
}
}
return FALSE;
}
/***************************************************************************
*
* Verify
*
* verify the user
*
* return codes indicate authentication results.
***************************************************************************/
#define MAXATTEMPTS 5
extern Widget focusWidget; /* login or password text field */
struct passwd nouser = {"", "nope"}; /* invalid user password struct */
int
Verify( char *name, char *passwd )
{
static int login_attempts = 0; /* # failed authentications */
struct passwd *p; /* password structure */
char *host; /* host that login is coming in from */
status_$t status; /* status code returned by CheckLogin */
int n;
host = dpyinfo.name;
/*
* look up entry from registry...
*
* need getpwnam_full to get policy data for passwd expiration
* or invalidity...
*/
p = getpwnam_full(name, &user_part, &admin_part, &policy);
/* p = getpwnam(name);*/
if (!p || strlen(name) == 0 || p->pw_name == NULL )
p = &nouser;
/*
* validate user/password...
*/
if (!CheckLogin(name, passwd, host, &status)) {
/*
* if verification failed, but was just a name check, prompt for
* password...
*/
if ( focusWidget != passwd_text )
return (VF_INVALID);
/*
* if maximum number of attempts exceeded, log failure...
*/
if ((++login_attempts % MAXATTEMPTS) == 0 ) {
#ifdef peter
syslog(LOG_CRIT,
"REPEATED LOGIN FAILURES ON %s FROM %.*s, %.*s",
"??", HMAX, host, NMAX, name);
#endif
}
/*
* check status codes from verification...
*/
switch (status.all) {
case login_$logins_disabled: /* logins are disabled */
if (p->pw_uid != 0)
return(VF_NO_LOGIN);
else
if (!CheckPassword(name,passwd))
return(VF_INVALID);
break;
case login_$inv_acct: /* invalid account */
if ( PasswordAged(p) )
return(VF_PASSWD_AGED);
else
return(VF_INVALID);
break;
default: /* other failed verification */
return(VF_INVALID);
break;
}
}
/*
* verify home directory exists...
*/
if (chdir(p->pw_dir) < 0) {
if (chdir("/") < 0)
return(VF_HOME);
else
LogError(ReadCatalog(
MC_LOG_SET,MC_LOG_NO_HMDIR,MC_DEF_LOG_NO_HMDIR),
p->pw_dir, name);
}
/*
* validate uid and gid...
*/
if ((p->pw_gid < 0) ||
(setgid(p->pw_gid) == -1)) {
return(VF_BAD_GID);
}
if ((p->pw_uid < 0) ||
(seteuid(p->pw_uid) == -1)) {
return(VF_BAD_UID);
}
/*
* verify ok...
*/
return(VF_OK);
}
#endif

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

@ -64,7 +64,6 @@
** Platform identification: ** Platform identification:
** **
** __hpux HP-UX OS only ** __hpux HP-UX OS only
** __apollo Domain OS only
** sun SUN OS only ** sun SUN OS only
** SVR4 SUN OS et al. ** SVR4 SUN OS et al.
** _AIX AIX only ** _AIX AIX only
@ -98,10 +97,7 @@
/* /*
* Define as generic those without platform specific code. * Define as generic those without platform specific code.
*/ */
#if !(defined(__hpux) || \ #if !(defined(__hpux) || defined(_AIX) || defined(sun))
defined(__apollo) || \
defined(_AIX) || \
defined(sun))
#define generic #define generic
#endif #endif
@ -694,7 +690,7 @@ CheckPassword( char *name, char *passwd, struct passwd **ppwd )
#ifdef __PASSWD_ETC #ifdef __PASSWD_ETC
/* /*
* If regular passwd check fails, try old-style Apollo SR * If regular passwd check fails, try old-style SR
*/ */
if (rgy_$is_des(passwd, strlen(passwd), p->pw_passwd) == TRUE) if (rgy_$is_des(passwd, strlen(passwd), p->pw_passwd) == TRUE)

6
cde/programs/dtlogin/vgmain.c
View file

@ -1950,11 +1950,6 @@ if ( session_menu != NULL ) {
} }
#ifndef __apollo
/* /*
* [ No Windows ] menu pane... * [ No Windows ] menu pane...
*/ */
@ -1972,7 +1967,6 @@ if ( session_menu != NULL ) {
if (getenv(LOCATION) == NULL || strcmp(getenv(LOCATION), "local") != 0 ) if (getenv(LOCATION) == NULL || strcmp(getenv(LOCATION), "local") != 0 )
XtSetSensitive(options_item[j], False); XtSetSensitive(options_item[j], False);
j++; j++;
#endif
/* /*

3
cde/programs/dtsession/SmGlobals.c
View file

@ -64,9 +64,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <unistd.h> #include <unistd.h>
#ifdef __apollo
#include <X11/apollosys.h> /* for pid_t, in hp-ux sys/types.h */
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>

5
cde/programs/dtsession/SmHelp.c
View file

@ -67,11 +67,6 @@
#include "SmHelp.h" #include "SmHelp.h"
#include "SmGlobals.h" #include "SmGlobals.h"
#ifdef __apollo
#include <X11/apollosys.h>
#endif /* __apollo */
/* /*
* #define statements * #define statements
*/ */

3
cde/programs/dtsession/SmRestore.c
View file

@ -64,9 +64,6 @@
#endif /* _SUN_OS */ #endif /* _SUN_OS */
#include <sys/types.h> #include <sys/types.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __apollo
#include <X11/apollosys.h> /* for pid_t struct in hp-ux sys/types.h */
#endif
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <netinet/in.h> #include <netinet/in.h>

7
cde/programs/dtstyle/Backdrop.c
View file

@ -47,17 +47,12 @@
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <errno.h>
#if defined(_AIX) || defined(__apollo) #if defined(_AIX)
#include <sys/dir.h> #include <sys/dir.h>
#else #else
#include <dirent.h> /* opendir(), directory(3C) */ #include <dirent.h> /* opendir(), directory(3C) */
#endif /* _AIX */ #endif /* _AIX */
#ifdef __apollo
#include <X11/apollosys.h> /* needed for S_ISDIR macro */
#endif
#include <locale.h> #include <locale.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>

8
cde/programs/dtstyle/ColorFile.c
View file

@ -49,17 +49,11 @@
#ifdef __hpux #ifdef __hpux
#include <ndir.h> /* opendir(), directory(3C) */ #include <ndir.h> /* opendir(), directory(3C) */
#else #elif defined(SVR4) || defined(CSRG_BASED)
#if defined(SVR4) || defined(sco) || defined(CSRG_BASED)
#include <dirent.h> /* opendir(), directory(3C) */ #include <dirent.h> /* opendir(), directory(3C) */
#else #else
#include <sys/dir.h> #include <sys/dir.h>
#ifdef __apollo
#include <X11/apollosys.h> /* needed for S_ISDIR macro */
#endif #endif
#endif
#endif
#include <Xm/Xm.h> #include <Xm/Xm.h>

4
cde/programs/dtstyle/ColorMain.c
View file

@ -40,11 +40,7 @@
/*+++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++*/
/* include files */ /* include files */
/*+++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++*/
#ifdef __apollo
#include "/sys5/usr/include/limits.h"
#else /* common default */
#include <limits.h> #include <limits.h>
#endif /* __apollo */
#include <locale.h> #include <locale.h>
#include <stdlib.h> #include <stdlib.h>

7
cde/programs/dtterm/tests/Cborder/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Cgeomcolor/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

13
cde/programs/dtterm/tests/Ciconic/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
@ -36,9 +29,3 @@ saber_src: $(SRCS)
unsaber_src: unsaber_src:
XCOMM unload $(SRCS) XCOMM unload $(SRCS)

7
cde/programs/dtterm/tests/Clogging/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Clogin/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Csavelines/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Cscrolltitle/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Ctm/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Cvisualbell/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rborder/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rgeomcolor/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Riconic/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rlogging/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rlogin/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rpointer/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rsavelines/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rscrolltitle/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rtm/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rvisualbell/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/Rwrap/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/charatt/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/curmove/Imakefile
View file

@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/edittest/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/erase/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/keypad/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/scroll/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtterm/tests/sgr/Imakefile
View file

@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

13
cde/programs/dtterm/tests/shared/Imakefile
View file

@ -8,19 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
XCOMMifdef HPArchitecture
EXTRA_DEFINES = -DLOG -DSYNLIB
#endif
#if defined(HPOSFArchitecture)
#endif
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
#endif #endif

13
cde/programs/dtterm/tests/tabctrl/Imakefile
View file

@ -8,19 +8,6 @@ SYS_LIBRARIES = -lm
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#ifdef HPArchitecture
EXTRA_DEFINES = -DLOG -DSYNLIB
#endif
#if defined(HPOSFArchitecture)
#endif
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

13
cde/programs/dtterm/tests/util/Imakefile
View file

@ -7,19 +7,6 @@ LOCAL_INCLUDES = -I../shared -I$(TOP)/lib/
EXTRA_DEFINES = -DLOG -DSYNLIB EXTRA_DEFINES = -DLOG -DSYNLIB
#ifdef HPArchitecture
EXTRA_DEFINES = -DLOG -DSYNLIB
#endif
#if defined(HPOSFArchitecture)
#endif
#if defined(ApolloArchitecture)
EXTRA_DEFINES = -Dapollo -D_CMDINV
#if defined(SHLIB)
LOCAL_LIBRARIES = -A inlib,$(XLIB)
#endif
#endif
#if defined(SunArchitecture) #if defined(SunArchitecture)
SYS_LIBRARIES = -lm -ldl -lgen -lC SYS_LIBRARIES = -lm -ldl -lgen -lC
SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a

7
cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h
View file

@ -80,13 +80,6 @@ typedef struct _TempFont {
# define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */
# endif # endif
#elif defined(apollo)
# define DEFAULTGLPAD 2 /* default padding for glyphs */
# define DEFAULTBITORDER MSBFirst /* default bitmap bit order */
# define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */
# define DEFAULTSCANUNIT 1 /* default bitmap scan unit */
#elif defined(ibm032) #elif defined(ibm032)
# define DEFAULTGLPAD 1 /* default padding for glyphs */ # define DEFAULTGLPAD 1 /* default padding for glyphs */

2
cde/programs/dtudcfonted/libfal/include/os.h
View file

@ -110,7 +110,7 @@ pragma on(alloca);
/* /*
* warning: mips alloca is unsuitable in the server, do not use. * warning: mips alloca is unsuitable in the server, do not use.
*/ */
#if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) #if defined(vax) || defined(sun) || defined(stellar)
/* /*
* Some System V boxes extract alloca.o from /lib/libPW.a; if you * Some System V boxes extract alloca.o from /lib/libPW.a; if you
* decide that you don't want to use alloca, you might want to fix * decide that you don't want to use alloca, you might want to fix

9
cde/programs/dtudcfonted/libfal/include/servermd.h
View file

@ -171,15 +171,6 @@ This is unpublished proprietary source code of FUJITSU LIMITED
#endif /* sun */ #endif /* sun */
#ifdef apollo
#define IMAGE_BYTE_ORDER MSBFirst /* Values for the Apollo only*/
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 2
#define GETLEFTBITS_ALIGNMENT 4
#endif /* apollo */
#if defined(ibm032) || defined (ibm) #if defined(ibm032) || defined (ibm)
#ifdef i386 #ifdef i386

3
cde/programs/dtwm/Clock.c
View file

@ -64,9 +64,6 @@ SOFTWARE.
*/ */
#include <stdio.h> #include <stdio.h>
#ifdef __apollo
#include <sys/types.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
#include <Xm/GadgetP.h> #include <Xm/GadgetP.h>

9
cde/programs/dtwm/Dtwm.defs.src
View file

@ -262,15 +262,6 @@ Dtwm*keyBindings: DtKeyBindings
!# Resource for internal dtwm use: !# Resource for internal dtwm use:
Dtwm*useAsyncGeometry: True Dtwm*useAsyncGeometry: True
#ifdef __apollo
!# Don't post the confirm dialog on a "kill" signal
!# Avoids possible hung node when interacting with the dialog box on the
!# shared mode server.
Dtwm*showFeedback: behavior move placement quit resize restart
#endif
!############### Other Popular Dtwm Resource Settings ########## !############### Other Popular Dtwm Resource Settings ##########
!##### See also the Style Manager - Window Manager Dialogue ######## !##### See also the Style Manager - Window Manager Dialogue ########

2
cde/programs/localized/de_DE.ISO8859-1/msg/dtksh.msg
View file

@ -859,8 +859,6 @@ $set 25 Redefine set#
127 "S [Maske]" 127 "S [Maske]"
128 "SIGAPOLLO"
129 "Sicherheitsbezeichnung geändert" 129 "Sicherheitsbezeichnung geändert"
130 "Socket-Unterbrechung" 130 "Socket-Unterbrechung"

Some files were not shown because too many files have changed in this diff Show more