Remove apollo support
authorchase <chase@localhost.com>
Sun, 24 Jun 2018 19:15:00 +0000 (14:15 -0500)
committerJon Trulson <jon@radscan.com>
Sun, 24 Jun 2018 22:22:37 +0000 (16:22 -0600)
108 files changed:
cde/config/cf/Imake.cf
cde/config/cf/Imakefile
cde/config/cf/apollo.cf [deleted file]
cde/config/imake/imakemdep.h
cde/lib/DtSvc/DtCodelibs/pathcollapse.C
cde/lib/DtSvc/DtCodelibs/shellscan.C
cde/lib/DtSvc/DtEncap/MemoryMgr.c
cde/lib/DtSvc/DtEncap/pty.c
cde/lib/DtSvc/DtEncap/scoop.c
cde/lib/DtSvc/DtEncap/usersig.c
cde/lib/DtSvc/DtUtil1/CmdMain.c
cde/lib/DtSvc/DtUtil1/CmdUtilityP.c
cde/lib/DtSvc/DtUtil2/CmdUtility.c
cde/lib/DtSvc/DtUtil2/DtosP.h
cde/lib/DtSvc/include/bms/sbport.h
cde/lib/DtSvc/include/bms/sbstdinc.h
cde/lib/DtSvc/include/codelibs/mbstring.h
cde/lib/DtSvc/include/codelibs/privbuf.h
cde/lib/DtSvc/include/codelibs/stringx.h
cde/lib/DtWidget/Control.c
cde/lib/DtWidget/Icon.c
cde/programs/dthello/Dthello.src
cde/programs/dthello/dthello.c
cde/programs/dthelp/parser.ccdf/volumegen/Imakefile
cde/programs/dtksh/Imakefile
cde/programs/dtksh/builtins.c
cde/programs/dtksh/dtksh.msg
cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/hist.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/typeset.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/builtins.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/signals.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/data/variables.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/include/builtins.h
cde/programs/dtksh/ksh93/src/cmd/ksh93/include/variables.h
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/apollo.c [deleted file]
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/name.c
cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/path.c
cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c
cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c
cde/programs/dtksh/variables.c
cde/programs/dtlogin/Imakefile
cde/programs/dtlogin/account.c
cde/programs/dtlogin/apollo.c [deleted file]
cde/programs/dtlogin/apollo/des.h [deleted file]
cde/programs/dtlogin/apollo/login.h [deleted file]
cde/programs/dtlogin/apollo/passwd.h [deleted file]
cde/programs/dtlogin/config/Xservers.src
cde/programs/dtlogin/dm.c
cde/programs/dtlogin/dm.h
cde/programs/dtlogin/resource.c
cde/programs/dtlogin/session.c
cde/programs/dtlogin/sysauth.c
cde/programs/dtlogin/vgapollo.c [deleted file]
cde/programs/dtlogin/vgauth.c
cde/programs/dtlogin/vgmain.c
cde/programs/dtsession/SmGlobals.c
cde/programs/dtsession/SmHelp.c
cde/programs/dtsession/SmRestore.c
cde/programs/dtstyle/Backdrop.c
cde/programs/dtstyle/ColorFile.c
cde/programs/dtstyle/ColorMain.c
cde/programs/dtterm/tests/Cborder/Imakefile
cde/programs/dtterm/tests/Cgeomcolor/Imakefile
cde/programs/dtterm/tests/Ciconic/Imakefile
cde/programs/dtterm/tests/Clogging/Imakefile
cde/programs/dtterm/tests/Clogin/Imakefile
cde/programs/dtterm/tests/Csavelines/Imakefile
cde/programs/dtterm/tests/Cscrolltitle/Imakefile
cde/programs/dtterm/tests/Ctm/Imakefile
cde/programs/dtterm/tests/Cvisualbell/Imakefile
cde/programs/dtterm/tests/Rborder/Imakefile
cde/programs/dtterm/tests/Rgeomcolor/Imakefile
cde/programs/dtterm/tests/Riconic/Imakefile
cde/programs/dtterm/tests/Rlogging/Imakefile
cde/programs/dtterm/tests/Rlogin/Imakefile
cde/programs/dtterm/tests/Rpointer/Imakefile
cde/programs/dtterm/tests/Rsavelines/Imakefile
cde/programs/dtterm/tests/Rscrolltitle/Imakefile
cde/programs/dtterm/tests/Rtm/Imakefile
cde/programs/dtterm/tests/Rvisualbell/Imakefile
cde/programs/dtterm/tests/Rwrap/Imakefile
cde/programs/dtterm/tests/charatt/Imakefile
cde/programs/dtterm/tests/curmove/Imakefile
cde/programs/dtterm/tests/edittest/Imakefile
cde/programs/dtterm/tests/erase/Imakefile
cde/programs/dtterm/tests/keypad/Imakefile
cde/programs/dtterm/tests/scroll/Imakefile
cde/programs/dtterm/tests/sgr/Imakefile
cde/programs/dtterm/tests/shared/Imakefile
cde/programs/dtterm/tests/tabctrl/Imakefile
cde/programs/dtterm/tests/util/Imakefile
cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h
cde/programs/dtudcfonted/libfal/include/os.h
cde/programs/dtudcfonted/libfal/include/servermd.h
cde/programs/dtwm/Clock.c
cde/programs/dtwm/Dtwm.defs.src
cde/programs/localized/de_DE.ISO8859-1/msg/dtksh.msg
cde/programs/localized/es_ES.ISO8859-1/msg/dtksh.msg
cde/programs/localized/fr_FR.ISO8859-1/msg/dtksh.msg
cde/programs/localized/it_IT.ISO8859-1/msg/dtksh.msg
cde/programs/localized/ja_JP.dt-eucJP/msg/dtksh.msg
cde/programs/localized/ko_KR.dt-eucKR/msg/dtksh.msg
cde/programs/localized/sv_SE.ISO8859-1/msg/dtksh.msg
cde/programs/localized/zh_CN.dt-eucCN/msg/dtksh.msg
cde/programs/localized/zh_TW.dt-eucTW/msg/dtksh.msg

index 07712dccbc7ddec9a342646f64516cc647646bd5..4aa0814b0e7a7b6707b41c4517cb8a55f01a0722 100644 (file)
@@ -270,13 +270,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # define NCRArchitecture
 #endif /* NCR */
 
-#ifdef apollo
-# define MacroIncludeFile <apollo.cf>
-# define MacroFile apollo.cf
-# undef apollo
-# define ApolloArchitecture
-#endif /* apollo */
-
 #ifdef sony
 # define MacroIncludeFile <sony.cf>
 # define MacroFile sony.cf
index e1c5e3b6771850dda7a94f1ca88438be2738d8d9..8872406fd96f535b1256dd49456493479945d773 100644 (file)
@@ -62,7 +62,6 @@ Mips.cf \
 NetBSD.cf \
 Oki.cf \
 Win32.cf \
-apollo.cf \
 bsd.cf \
 convex.cf \
 cray.cf \
diff --git a/cde/config/cf/apollo.cf b/cde/config/cf/apollo.cf
deleted file mode 100644 (file)
index a802b1a..0000000
+++ /dev/null
@@ -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
index 8d5a3aca02e0da12a248e6cfa171b8948e9d3b03..bad190de04a590623d199d595acf2b65f61bc1ed 100644 (file)
@@ -132,10 +132,6 @@ in this Software without prior written authorization from The Open Group.
 #define imake_ccflags "-fn -tm c1"
 #endif
 
-#ifdef apollo
-#define imake_ccflags "-DX_NOT_POSIX"
-#endif
-
 #ifdef WIN32
 #if _MSC_VER < 1000
 #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 DEFAULT_CC "cl"
 #endif
-#ifdef apollo
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
 #if defined(_IBMR2) && !defined(DEFAULT_CPP)
 #define DEFAULT_CPP "/usr/ccs/lib/cpp"
 #endif
@@ -604,9 +597,6 @@ char *cpp_argv[ARGUMENTS] = {
 #define DEF_STRINGIFY(_x) DEF_EVALUATE(_x)
 
 struct symtab  predefs[] = {
-#ifdef apollo
-       {"apollo", "1"},
-#endif
 #ifdef ibm032
        {"ibm032", "1"},
 #endif
index 6a8856f52f707bfe754619daeb45554a46f6c509..3b1d49fda2b7d9106fb42c5d1c5a84c0e16e6f4e 100644 (file)
@@ -31,9 +31,6 @@
  * (c) Copyright 1996 FUJITSU LIMITED.
  * (c) Copyright 1996 Hitachi.
  */
-#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
-#include "/usr/include/apollo/shlib.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -60,9 +57,6 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
     char **comp = components;
     int length = src == NULL ? 0 : strlen(src);
     int dir_comp;              /* TRUE if last component was . or .. */
-#ifdef apollo
-    int double_slash = 0;
-#endif
     wchar_t __nlh_char[1];
 
     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)
            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;
     dstp = dst;
 
@@ -175,10 +156,5 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
     else if (sep > dst)
        *sep = '\0';            /* remove trailing '/' */
 
-#ifdef apollo
-    if (double_slash)
-       dst--;
-#endif
-
     return dst;
 }
index 3d69ae48e126d5fd0cb010f6ea66fea1bf99aa94..b43678c5a1746c62b68a113595bf3b77f6021196 100644 (file)
  * (c) Copyright 1996 FUJITSU LIMITED.
  * (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 <stdlib.h>
 #include <X11/Xos_r.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>
-#endif /* not apollo */
 
 #include "stringio.h"
 #include "buf.h"
index b5ef0a1473b97f4e4f8db2d2a0acb3e3e7db0b94..7934a000d35ff06a96b7c373ce7769c5a7048987 100644 (file)
  * (c) Copyright 1993, 1994 Novell, Inc.                               *
  */
 
-#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
-#include "/usr/include/apollo/shlib.h"
-#endif
-
 #include <Dt/UserMsg.h>
 
 #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
index a754bdfdb655e2321bb548ef9d00c73a6059a99a..a26d3db0d67bd8215cda233b94c6eab3c8a99d09 100644 (file)
 #include <sys/ptyio.h>
 #endif
 
-#if defined(__apollo) && !defined(ONLCR) 
-# define ONLCR 0               /* This guy (XPG3), not on apollo yet */
-#endif
-
 #ifdef __bsd
 #include <sys/file.h>
 #include <sgtty.h>
index 2e08af09e866876385d60601e23c5479f62eac1a..5af0e9c53548907025c6593659eab4c40833fb67 100644 (file)
  * (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/scoop.h>
 
index a53cc3bc795a6461878380ce037c6b8cb4875c6f..c5e2ab957bf042f5fd78da084ed1a211bce05f42 100644 (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 */    
 
 #   ifdef SIGIO    
-    Xe_addsig((XeString)"SIGIO", SIGIO);               /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGIO", SIGIO);               /*  hpux sun */
 #   else
 #       ifdef SIGPOLL
-           Xe_addsig((XeString)"SIGIO", SIGPOLL);      /*  hpux sun apollo */
+           Xe_addsig((XeString)"SIGIO", SIGPOLL);      /*  hpux sun */
 #       endif
 #    endif
 
 #   ifdef SIGPOLL    
-    Xe_addsig((XeString)"SIGPOLL", SIGPOLL);           /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGPOLL", SIGPOLL);           /*  hpux sun */
 #   else
 #       ifdef SIGIO
-           Xe_addsig((XeString)"SIGPOLL", SIGIO);      /*  hpux sun apollo */
+           Xe_addsig((XeString)"SIGPOLL", SIGIO);      /*  hpux sun */
 #       endif
 #   endif
 
 #   ifdef SIGEMT    
-    Xe_addsig((XeString)"SIGEMT", SIGEMT);             /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGEMT", SIGEMT);             /*  hpux sun */
 #   endif
 
 #   ifdef SIGBUS    
-    Xe_addsig((XeString)"SIGBUS", SIGBUS);             /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGBUS", SIGBUS);             /*  hpux sun */
 #   endif
 
 #   ifdef SIGIOT    
-    Xe_addsig((XeString)"SIGIOT", SIGIOT);             /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGIOT", SIGIOT);             /*  hpux sun */
 #   endif
 
 #   ifdef SIGURG    
-    Xe_addsig((XeString)"SIGURG", SIGURG);             /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGURG", SIGURG);             /*  hpux sun */
 #   endif
 
 #   ifdef SIGSYS    
-    Xe_addsig((XeString)"SIGSYS", SIGSYS);             /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGSYS", SIGSYS);             /*  hpux sun */
 #   endif
 
 #   ifdef SIGTRAP    
-    Xe_addsig((XeString)"SIGTRAP", SIGTRAP);           /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGTRAP", SIGTRAP);           /*  hpux sun */
 #   endif
 
 #   ifdef SIGPROF    
-    Xe_addsig((XeString)"SIGPROF", SIGPROF);           /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGPROF", SIGPROF);           /*  hpux sun */
 #   endif
 
 #   ifdef SIGCLD    
-    Xe_addsig((XeString)"SIGCLD", SIGCLD);             /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGCLD", SIGCLD);             /*  hpux sun */
 #   endif
 
 #   ifdef SIGVTALRM    
-    Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM);       /*  hpux sun apollo */
+    Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM);       /*  hpux sun */
 #   endif
 
 #   ifdef SIGWINCH
@@ -204,60 +204,60 @@ XeString XeSignalToName(int sig)
     /*       code to the stuff in Xe_init_sig_table() above, you see a one   */
     /*       to one correspondance.                                         */
      
-#   ifdef SIGIO                                /*  hpux sun apollo */
+#   ifdef SIGIO                                /*  hpux sun */
                                                /*  (SIGPOLL, SIGTINT are aliases) */
     case SIGIO:                return (XeString)"SIGIO"; 
 #   endif
 
-#   ifdef SIGPOLL                              /*  hpux sun apollo */
+#   ifdef SIGPOLL                              /*  hpux sun */
 /*  ----> Duplicated by SIGIO above
     case SIGPOLL:      return (XeString)"SIGPOLL";     
 */
 #   endif
 
 
-#   ifdef SIGEMT                               /*  hpux sun apollo */
+#   ifdef SIGEMT                               /*  hpux sun */
     case SIGEMT:       return (XeString)"SIGEMT";      
 #   endif
 
-#   ifdef SIGBUS                               /*  hpux sun apollo */
+#   ifdef SIGBUS                               /*  hpux sun */
     case SIGBUS:       return (XeString)"SIGBUS";      
 #   endif
 
-#   ifdef SIGIOT                               /*  hpux sun apollo */
+#   ifdef SIGIOT                               /*  hpux sun */
 /*  ----> Duplicated by SIGABRT above
 
     case SIGIOT:       return (XeString)"SIGIOT";      
 */
 #   endif
 
-#   ifdef SIGURG                               /*  hpux sun apollo */
+#   ifdef SIGURG                               /*  hpux sun */
     case SIGURG:       return (XeString)"SIGURG";      
 #   endif
 
-#   ifdef SIGSYS                               /*  hpux sun apollo */
+#   ifdef SIGSYS                               /*  hpux sun */
     case SIGSYS:       return (XeString)"SIGSYS";      
 #   endif
 
-#   ifdef SIGTRAP                              /*  hpux sun apollo */
+#   ifdef SIGTRAP                              /*  hpux sun */
     case SIGTRAP:      return (XeString)"SIGTRAP";     
 #   endif
 
-#   ifdef SIGPROF                              /*  hpux sun apollo */
+#   ifdef SIGPROF                              /*  hpux sun */
     case SIGPROF:      return (XeString)"SIGPROF";     
 #   endif
 
-#   ifdef SIGCLD                               /*  hpux sun apollo */
+#   ifdef SIGCLD                               /*  hpux sun */
 /*  ----> Duplicated by SIGCHLD above
     case SIGCLD:       return (XeString)"SIGCLD";      
 */
 #   endif
 
-#   ifdef SIGVTALRM                                    /*  hpux sun apollo */
+#   ifdef SIGVTALRM                                    /*  hpux sun */
     case SIGVTALRM:    return (XeString)"SIGVTALRM";   
 #   endif
 
-#   ifdef SIGWINCH                             /*  sun apollo */
+#   ifdef SIGWINCH                             /* sun */
     case SIGWINCH:     return (XeString)"SIGWINCH";    
 #   endif
 
index 5e362e9aab224ba6317b5cdac95b51ebe868b793..2635b961e86e1f1582b85479f8eaf816c1452002 100644 (file)
 #include <Dt/CmdInv.h>
 
 #include <fcntl.h>
-#ifdef __apollo
-#include "/sys5/usr/include/sys/termio.h"
-#else
 #include <termios.h>
-#endif
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
index 9e5f2c8a74aee6b56dfea92598485f3f00fa930a..c35137ac6d6dff68cd23c6176a1c030eac1e45b7 100644 (file)
 
 #include <stdio.h>
 #include <sys/param.h>
-
-#ifdef __apollo
-#include "/sys5/usr/include/unistd.h"
-#else
 #include <unistd.h>
-#endif
 #include <limits.h>
 #include <sys/stat.h>
 
index dce59977947059cf332550c8b652d471dc54e710..a034119d4348949823720eda3b893c22665d2859 100644 (file)
 #include <string.h>
 #include <sys/param.h>
 
-#ifdef __apollo
-#include "/sys5/usr/include/unistd.h"
-#else
 #include <unistd.h>
-#endif
 #include <limits.h>
 #include <sys/stat.h>
 
index 09b526568bf31fe01598b5664e0e041967eb842c..62163b35e91ba0a593db8119236f39e3e25e0b69 100644 (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.
  */
-#  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
  * decide that you don't want to use alloca, you might want to fix it here.
index a9587002ed491da14d4fd86f8ef52b129eeb290d..8f26b028ef4d2e5b8170feb8cf9e57a6cfea60fa 100644 (file)
@@ -46,7 +46,6 @@
 
  __hpux                - Will be set for HP-UX systems
  __sun                 - Will be set for SUN systems
- __apollo              - Will be set for APOLLO (domain) systems
  __aix                  - Will be set for IBM (AIX) systems
 
   __sysv               - Set when using SYSV semantics (e.g. HP, SUN)
  __sparc               - Set for SUN sparc 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
  __recursive_includes  - Set to have .h files #includes prerequisite files
  __char_ptr_yytext      - Set if the lex/yacc variable yytext is defined
 #   define __sun
 #endif
 
-#if defined(apollo) && !defined(__apollo)
-#   define __apollo
-#endif
-
 #if defined(hpux) && !defined(__hpux)
 #   define __hpux
 #endif
 #   define __c_callable         /* Set so VUE can link with libbms. */
 #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
 #       define __sysv
 #endif
 #   define  KEEP_DEADWOOD FALSE                /* all sorts of unknown problems.    */
 #endif
 
-#ifndef __apollo_paths
-#   define __apollo_paths              /* We always want this feature */
-#endif
-
-
 #ifdef __cplusplus
 
 #define UNUSED_PARM(_parm)
 /* ----------------------------------------------------------------- */
 
 #if defined(__need_timeval)            /* Get "struct timeval" */
-#   ifdef __sun
-#      include <sys/time.h>
-#   endif
-#   ifdef __apollo
-#      include <sys/time.h>
-#   endif
-#   ifdef __aix
+#   if defined(__sun) || defined(__aix)
 #      include <sys/time.h>
 #   endif
 #endif /* __need_timeval */
 
 
 #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
 #       include <sys/select.h>
 #   endif
 #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   */
 /* 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 */
index 10c15be2923ed6092468e7913ca34082ca340c6d..17dc5209307ecbe0cb1a7c57794aeab9093f591a 100644 (file)
@@ -58,8 +58,8 @@
 /* Routines not defined in include files (yet).                                */
 /************************************************************************/
 
-/* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */
-#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
+/* BSD has bzero(), bcmp(), and bcopy() defined. */
+#if !defined(__bsd) && !defined(CSRG_BASED)
 
 #if defined(__STDC__)
 #if !defined(__linux__) && !defined(_XFUNCS_H_) && !defined(sun)
index 3c6859534275d28dc3366c3fe0002e560dd7847c..52f77bdd136d61c8359615bee6d1c5e25d7a941f 100644 (file)
 
 #include <stddef.h>
 
-#ifdef apollo
-#define _NEED_WCHAR_T
-#include <sys/stdtypes.h>
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {
index ad88b9c05fe9a1eb2db316253dcc5f023056148e..b692dda572e64893cc88a58c326d3d582b548526 100644 (file)
 #ifndef __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);
 
 #ifdef __PRIVATE_
index e243ddddadd59bdf8b0302ffcccddb09c7be52e3..78a8ddc2b9d9602f0062d8016648fb6233679134 100644 (file)
 #ifndef __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 <string.h>
 #include <codelibs/boolean.h>
@@ -119,11 +112,11 @@ extern size_t     nl_strlen();            /* __OBSOLETE */
 #if defined(__cplusplus)
 }
 
-#if defined(apollo) || defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
+#if defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
 #include <stdlib.h>
 #else
 #include <malloc.h>
-#endif /* apollo */
+#endif /* aix linux CSRG_BASED */
 
 inline char *strnew(size_t len) { return (char*)malloc(len + 1); }
 #if defined(sun) || defined(__sun)
index 2c74b973fcd7e4a72769683105d99885034c76f9..82ad592eeb1926b4e812c4e6cd6a8e25934c5701 100644 (file)
 */
 
 #include <stdio.h>
-#ifdef __apollo
-#include <sys/types.h>           /* needed for sys/stat.h on bsd4.3 */
-#else
 #include <stdlib.h>
-#endif
 #include <sys/stat.h>
 #define X_INCLUDE_STRING_H
 #define X_INCLUDE_TIME_H
index 6623ee79b0bbad500ece96528ba67f2d5691ea2a..9b09a81c93907121875911e85057338c4171931f 100644 (file)
@@ -47,9 +47,6 @@
 */
 
 #include <stdio.h>
-#ifdef __apollo
-#include <sys/types.h>
-#endif
 #include <sys/stat.h>
 #include <X11/Xatom.h>
 #include <Xm/XmP.h>
index 132ab7f4cf16cc6ff5f1e8a40b8945bee9baeb52..64e41ebe46120158c8cb0988ee08a60fad0fda15 100644 (file)
@@ -16,9 +16,4 @@
 !######################################################################
 
 XCOMM include "Dt"
-
-#ifdef __apollo
-Dtcolor*font:          user12x23
-#else
 %|nls-1-#optional_font_spec#|
-#endif
index fd8b329a2b45a7914209552402734526f156c0e6..eec7e5b852f763ffb7dcf73e5dafd51f0c6e5f45 100644 (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 <Xm/Xm.h>
 #include <Dt/GetDispRes.h>
-#ifdef __apollo
-#include </sys5/usr/include/limits.h>
-#else
 #include <limits.h>
-#endif
 #include <locale.h>
 #ifndef NO_MESSAGE_CATALOG
 # include <nl_types.h>
index a0d687a6e6cce4eba41931d811efc3f6a18dfe44..85b42afe07fa9381406545b7ed3d337cb0fc415d 100644 (file)
@@ -3,12 +3,6 @@ PROGRAMS = volumegen
 
        INCLUDES = -I.
 
-#if defined(ApolloArchitecture)
-#if defined(SHLIB)
-   LOCAL_LIBRARIES = -A inlib,$(XLIB)
-#endif
-#endif
-
 #if defined(SunArchitecture)
 SYS_LIBRARIES = -ldl -lgen
 #endif
index fa35fac4a8938577ae0c42c5ab8354c35bee0771..6be8ec40d7f9540f118b93a4bff8ef378394ed3e 100644 (file)
@@ -38,16 +38,7 @@ LOCAL_LDFLAGS = -bE:dtksh.exp
 EXTRA_DEFINES = -DDYNLIB
 #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)
-#endif
 
 #ifdef SunArchitecture
 .NO_PARALLEL:
index bf812e3b03d86b28fb0a76970723e4abdc9ce4d0..b2683d90a67971c1b0e604feaad6c009bd38c70e 100644 (file)
@@ -202,11 +202,6 @@ const struct shtable3 shtab_builtins[] =
        "wait",         NV_BLTIN|BLT_ENV|BLT_EXIT,      bltin(wait),
         "type",         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/chmod",   NV_BLTIN|NV_NOFREE,             bltin(chmod),
        "/bin/dirname", NV_BLTIN|NV_NOFREE,             bltin(dirname),
index dabb722c9ba7d78d94dfe3c16c7b1896023a21fe..88fe732aeea96756331ba472b255af6e3ae0364c 100644 (file)
@@ -431,7 +431,6 @@ $set 25
 125 Resources lost
 126 Reverting to old tty driver...
 127 S [mask]
-128 SIGAPOLLO
 129 Security label changed
 130 Socket interrupt
 131 Sound completed
index e346bc8c031ea56eae61cd28eaa8fd85256e07f5..883237206016b37749c80414bf2188c99da2a43e 100644 (file)
@@ -258,25 +258,7 @@ int        b_hist __PARAM__((int argc,char *argv[], __V_ *extra), (argc, argv, extra))
        arg = edit;
        if(!arg && !(arg=nv_getval(nv_scoped(HISTEDIT))) && !(arg=nv_getval(nv_scoped(FCEDNOD))))
                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 != '-')
        {
                char *com[3];
@@ -288,9 +270,7 @@ int b_hist __PARAM__((int argc,char *argv[], __V_ *extra), (argc, argv, extra))
        fdo = sh_chkopen(fname);
        unlink(fname);
        free((__V_*)fname);
-#ifdef apollo
-       }
-#endif /* apollo */
+
        /* don't history fc itself unless forked */
        error_info.flags |= ERROR_SILENT;
        if(!sh_isstate(SH_FORKED))
index 04a217bc5189d920ef158288294401371b63b1a0..7fad38d8ebe9da620dc514052280608f9f9e27be 100644 (file)
@@ -767,15 +767,7 @@ static int b_unall __PARAM__((int argc, char **argv, register Hashtab_t *troot),
                                        continue;
                                }
                        }
-#ifdef apollo
-                       else
-                       {
-                               short namlen;
-                               name = nv_name(np);
-                               namlen =strlen(name);
-                               ev_$delete_var(name,&namlen);
-                       }
-#endif /* apollo */
+
                        if(sh.subshell)
                                np=sh_assignok(np,0);
                        nv_unset(np);
index 57b7345aef51e7c02d26bcf8734e2436dd3beacb..9b59c15a5275457d30c872ae09d697bd438b79dc 100644 (file)
@@ -183,11 +183,6 @@ const struct shtable3 shtab_builtins[] =
        "wait",         NV_BLTIN|BLT_ENV|BLT_EXIT,      bltin(wait),
        "type",         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/chmod",   NV_BLTIN|NV_NOFREE,             bltin(chmod),
        "/bin/dirname", NV_BLTIN|NV_NOFREE,             bltin(dirname),
index a75014346931b1903c353dce65e0788d1a4c75b1..7c8f47e71b71a33a2d74eae6dce43a5a36dfc263 100644 (file)
@@ -213,11 +213,6 @@ const char e_alphanum[]            = "[_[:alpha:]]*([_[:alnum:]])";
     const char e_vpixdir[]     = "/usr/bin";
 #endif /* SHOPT_VPIX */
 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
     const char e_cantget[]     = "cannot get %s";
     const char e_cantset[]     = "cannot set %s";
index 5680e0cdea77d53b311c40b04eea8382f0beeedc..176a5d91cf0a92ba3f2ac234526cf58c6efd2f98 100644 (file)
@@ -119,9 +119,6 @@ static struct shtable2 _shtab_signals[] =
 #ifdef SIGALRM
        "ALRM",         VAL(SIGALRM,SH_SIGFAULT),       "Alarm call",
 #endif /* SIGALRM */
-#ifdef SIGAPOLLO
-       "APOLLO",       VAL(SIGAPOLLO,0),               "SIGAPOLLO",
-#endif /* SIGAPOLLO */
 #ifdef SIGBUS
        "BUS",          VAL(SIGBUS,SH_SIGDONE),         "Bus error",
 #endif /* SIGBUS */
index a1212e88120a70ea4cb6e7d61fdb12b914eb2f13..1d1447a2265e6534b088668b06e0818c2f9f6b3e 100644 (file)
@@ -168,9 +168,6 @@ const struct shtable2 shtab_variables[] =
 #ifdef SHOPT_MULTIBYTE
        "CSWIDTH",      0,                              (char*)0,
 #endif /* SHOPT_MULTIBYTE */
-#ifdef apollo
-       "SYSTYPE",      0,                              (char*)0,
-#endif /* apollo */
        "",     0,                                      (char*)0
 };
 
index 08fd82830aeb47fd9efa84d75d00c1952a5cf4e1..0c29b67f31346bf77f66512a67e25823ea55a728 100644 (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_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_alrm2[];
 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_versions[];
 #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 */
 extern __MANGLE__ const char sh_optalarm[];
index 26f9ca70398e9f88d9f6f9e229d41b22eacae174..ba45bcec2749b9d9dc7741f29533eeb5da9b7edd 100644 (file)
 #else
 #   define NMULTI       NVPIX
 #endif /* SHOPT_MULTIBYTE */
-#ifdef apollo
-#   define SYSTYPENOD  (sh.bltin_nodes+51+NMULTI)
-#endif /* apollo */
 
 #endif /* SH_VALNOD */
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/apollo.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/apollo.c
deleted file mode 100644 (file)
index c647575..0000000
+++ /dev/null
@@ -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);
-}
index c81320ac77122f1a397807238d2896a7dc943bfc..3966167a31ce22ff876930048a10f7c252962c2e 100644 (file)
@@ -236,15 +236,6 @@ static void put_restricted __PARAM__((register Namval_t* np,const char *val,int
        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
 
 /*
@@ -391,7 +382,6 @@ static MsgStr allmsgs[] = {
        {"Resources lost", 25, 125},
        {"Reverting to old tty driver...", 25, 126},
        {"S [mask]", 25, 127},
-       {"SIGAPOLLO", 25, 128},
        {"Security label changed", 25, 129},
        {"Socket interrupt", 25, 130},
        {"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 LANG_init          = {  &LC_disc};
 #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
     static const Namdisc_t CSWIDTH_disc        = {  0, put_cswidth };
     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(LANGNOD, &LANG_init);
 #endif /* _hdr_locale */
-#ifdef apollo
-       nv_stack(SYSTYPENOD, &SYSTYPE_init);
-#endif /* apollo */
 #ifdef SHOPT_MULTIBYTE
        nv_stack(CSWIDTHNOD, &CSWIDTH_init);
 #endif /* SHOPT_MULTIBYTE */
index 98574c5d1396532809ad63e90d986c9d9cc9a239..e9c4cc7f0f1e2b65b6b988274922eb7a22f683ef 100644 (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 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])
                return(sh.sigmsg[sig]);
 #if defined(SIGRTMIN) && defined(SIGRTMAX)
index 9a22413b759aa813d8ed048075fd2f368b44cc4f..44ed9724d60751e4b8970a3f4d2f6e4820bb7676 100644 (file)
 #include       "FEATURE/locale"
 #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    pushnam __PROTO__((Namval_t*));
 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 */
                        }
                        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
                          * 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;
                if(flags&NV_INTEGER)
                        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)
                {
                        for(;*sp == ' '|| *sp=='\t';sp++);
@@ -734,16 +700,6 @@ void nv_putval __PARAM__((register Namval_t *np, const char *string, int flags),
                if(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
          * 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)
                nv_offattr(np,NV_IMPORT);
 #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
          * libc environ. This is done because routines within
index fe83aed3524e0716126709dfe3b3d2a967db1e59..bd915a35f7f124457984868149c3b87f324ebd8e 100644 (file)
@@ -745,18 +745,9 @@ static char *execs __PARAM__((const char *ap,const char *arg0,register char **ar
 #endif /* SHELLMAGIC */
        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:
                exscript(path,argv);
-#ifndef apollo
+
            case EACCES:
            {
                struct stat statb;
@@ -764,7 +755,7 @@ static char *execs __PARAM__((const char *ap,const char *arg0,register char **ar
                        errno = EISDIR;
            }
                /* FALL THROUGH */
-#endif /* !apollo */
+
 #ifdef ENAMETOOLONG
            case ENAMETOOLONG:
 #endif /* ENAMETOOLONG */
index 3d1d94aa501e01790244d2780a9e0bc9b6d66721..3daa159ceab219652ad034326ae6b9b1123dab01 100644 (file)
@@ -117,9 +117,6 @@ static struct _m_ map[] =
 #ifdef SIGALRM
 "Alarm call",                  "ALRM",         SIGALRM,
 #endif
-#ifdef SIGAPOLLO
-"Apollo",                      "APOLLO",       SIGAPOLLO,
-#endif
 #ifdef SIGBUS
 "Bus error",                   "BUS",          SIGBUS,
 #endif
index 2f7ea5ea311123842999e069eefc38d7a6f80a86..a014fc8916daff3be49eb175f87e893c367857c4 100644 (file)
@@ -112,9 +112,6 @@ static struct _m_ map[] =
 #ifdef SIGALRM
 "Alarm call",                  "ALRM",         SIGALRM,
 #endif
-#ifdef SIGAPOLLO
-"Apollo",                      "APOLLO",       SIGAPOLLO,
-#endif
 #ifdef SIGBUS
 "Bus error",                   "BUS",          SIGBUS,
 #endif
index a2aff74ed1502f6a6d27810802806021685eb4d2..5a0e8b972fd2eeb15cc71c996a1ed4f5a482596a 100644 (file)
@@ -174,9 +174,6 @@ const struct shtable2 shtab_variables[] =
 #ifdef MULTIBYTE
        "CSWIDTH",      0,                              (char*)0,
 #endif /* MULTIBYTE */
-#ifdef apollo
-       "SYSTYPE",      0,                              (char*)0,
-#endif /* apollo */
 EXKSH_EXTRA_VAR
        "",     0,                                      (char*)0
 };
index 4143de6c123a86de043b8146b7eb3189d47095f0..3ff67a063d275079506f71407ed2093f0280f171 100644 (file)
@@ -162,28 +162,28 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
           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 \
                   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 \
                  $(PAM_SRCS) $(SOLARIS_SRCS)
 
           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 \
                   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 \
                  $(PAM_OBJS) $(SOLARIS_OBJS) 
 
           PROG2 = dtgreet
 #ifdef AlphaArchitecture
           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 \
-                  vgversion.o vgapollo.o vglang.o vgsiaform.o
+                  vgversion.o vglang.o vgsiaform.o
 #else
           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 \
-                  vgversion.o vgapollo.o vglang.o
+                  vgversion.o vglang.o
 #endif
 
           PROG3 = dtchooser
index 27f51ca0c2ffcfbf570956def5540797d2f2d390..3ea5c320fe46774c9552a4b583fe15d4dda90849 100644 (file)
  *
  ***************************************************************************/
 
-
-#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/stat.h>
-#endif
 
 #ifdef AIXV3
 #include       <usersec.h>
diff --git a/cde/programs/dtlogin/apollo.c b/cde/programs/dtlogin/apollo.c
deleted file mode 100644 (file)
index be21650..0000000
+++ /dev/null
@@ -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
diff --git a/cde/programs/dtlogin/apollo/des.h b/cde/programs/dtlogin/apollo/des.h
deleted file mode 100644 (file)
index 6a52d01..0000000
+++ /dev/null
@@ -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
diff --git a/cde/programs/dtlogin/apollo/login.h b/cde/programs/dtlogin/apollo/login.h
deleted file mode 100644 (file)
index 068ea56..0000000
+++ /dev/null
@@ -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
-
diff --git a/cde/programs/dtlogin/apollo/passwd.h b/cde/programs/dtlogin/apollo/passwd.h
deleted file mode 100644 (file)
index 635b6f4..0000000
+++ /dev/null
@@ -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
index a7c3b04beeb655e8fa320f969d029488e76ad928..1ef3ef88698cda898e27c835c249e9dff8b8d808 100644 (file)
@@ -91,9 +91,7 @@ XCOMM     interest.
 XCOMM
 XCOMM ##########################################################################
 
-#if defined (__apollo)
-   *    Local local /etc/Xdomain :0
-#elif defined (_AIX) && defined (AIXV4)
+#if defined (_AIX) && defined (AIXV4)
    :0   Local local@console /usr/lpp/X11/defaults/xserverrc -T -force :0
 #elif defined (_AIX)
    :0  Local local@console /usr/bin/X11/X -T -force :0
index 8ce0eafefba15ec5c7b35b35a8aa6bf4e5b96841..b34bdb7406b274dab02fc2eae19174ade0827a5a 100644 (file)
@@ -895,7 +895,6 @@ StartDisplay(
                kill (d->serverPid, d->resetSignal);
        }
 
-#ifndef __apollo
        /*
         *  initialize d->utmpId. Check to see if anyone else is using
         *  the requested ID. Always allow the first request for "dt" to
@@ -932,7 +931,6 @@ StartDisplay(
                return 0;
            }
        }
-#endif
 
        /*
         *  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"
 #elif defined(__linux__)
 #define GETTYPATH "/sbin/getty"
-#elif !defined (__apollo)
+#else
 #define GETTYPATH "/etc/getty"
 #endif
 
index be74fddc5e2f9de184ff02efbb693ae0ebc8c2cb..3e0f24997416641449b42a9d3b18a3108d56e40a 100644 (file)
@@ -582,14 +582,6 @@ extern int  UtmpIdOpen(
                        char *utmpId) ;
 
 
-/*******************************     apollo.c     **************************/
-
-extern int  DoLogin(
-                       char *user, 
-                       char *passwd, 
-                       char *host) ;
-
-
 /*******************************     auth.c       **************************/
 
 extern int  ConvertAddr(
index 6608dba540c99776a690642cb982bc21c5fcc90a..6b63668964951d21dfc4567a16fb965b22e51f53 100644 (file)
@@ -216,11 +216,8 @@ static     char    AppName[16] = DTLOGIN;
 #endif
 
 #ifndef DEF_LANG       /* LANG default settings for various architectures */
-#  ifdef __apollo
-#    define DEF_LANG   "C"
-#  endif
 #  ifdef sun   /* default language under Solaris */
-#    define DEF_LANG    "C" 
+#    define DEF_LANG    "C"
 #  endif
 #endif
 
@@ -614,7 +611,7 @@ LoadDMResources( void )
        keyFile = getFullFileName(keyFile, 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)
         {
         /*
@@ -622,7 +619,6 @@ LoadDMResources( void )
           */
           GetSysParms(&timeZone,0,0);
         }
-#endif
 
 }
 
index e8fe43e9ea43837ff59f5f8fea59f92dea671da9..090e1394ca594566ab2d745e75996430edad9250 100644 (file)
@@ -134,11 +134,6 @@ static int sia_exit_proc_reg = FALSE;
 
 #endif /* SIA */
 
-
-#ifdef __apollo
-  extern char *getenv();
-#endif 
-
 #define GREET_STATE_LOGIN             0
 #define GREET_STATE_AUTHENTICATE      1
 #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");
     } else {
 #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
        if ( IsVerifyName(VN_AFS) ) {
@@ -1525,8 +1496,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
        }
 #endif
 
-#endif /* __apollo */
-
 #ifdef BLS
     }  /* ends the else clause of if ( ISSECURE ) */
 #endif /* BLS */
@@ -1655,7 +1624,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
 
            failsafeArgv[i++] = "-e";
            failsafeArgv[i++] = "/bin/passwd";
-#if defined (__apollo) || defined(__PASSWD_ETC)
+#if defined(__PASSWD_ETC)
            failsafeArgv[i++] = "-n";
 #endif
            failsafeArgv[i++] = getEnv (verify->userEnviron, "USER");
@@ -2077,15 +2046,6 @@ RunGreeter( struct display *d, struct greet_info *greet,
                 env = setEnv(env, "OPENWINHOME", path);
 #endif
 
-#ifdef __apollo
-           /*
-            *  set environment for Domain machines...
-            */
-           env = setEnv(env, "ENVIRONMENT", "bsd");
-           env = setEnv(env, "SYSTYPE", "bsd4.3");
-#endif
-               
-
            Debug ("Greeter environment:\n");
            printEnv(env);
            Debug ("End of Greeter environment:\n");
index 449dcd9a5ff6479844db82a9b23356a7d4095f58..9bad7ec83cbca5a8469e95045d73d9575cdc6d5d 100644 (file)
@@ -64,7 +64,6 @@
  **     Platform identification:
  **
  **    __hpux      HP-UX OS only
- **    __apollo    Domain OS only
  **     sun         SUN OS only
  **     SVR4        SUN OS et al.
  **     _AIX        AIX only
 /*
  * 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
 #endif
 
@@ -704,7 +703,7 @@ CheckPassword( char *name, char     *passwd, struct passwd **ppwd )
 
 #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)
diff --git a/cde/programs/dtlogin/vgapollo.c b/cde/programs/dtlogin/vgapollo.c
deleted file mode 100644 (file)
index 8609db1..0000000
+++ /dev/null
@@ -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
index 5d5c7e79f08ea4ecd4458f3224b2a8cb00a0158a..017185a476568831109a16f1fc7cea5abde0ba79 100644 (file)
@@ -64,7 +64,6 @@
  **     Platform identification:
  **
  **    __hpux      HP-UX OS only
- **    __apollo    Domain OS only
  **     sun         SUN OS only
  **     SVR4        SUN OS et al.
  **     _AIX        AIX only
 /*
  * 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
 #endif
 
@@ -694,7 +690,7 @@ CheckPassword( char *name, char     *passwd, struct passwd **ppwd )
 
 #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)
index ab8889bde48e0b85a1b1d2f9b416404c8526f25e..067c91bca73939e15ec52565ea6090ecdc0a1047 100644 (file)
@@ -1950,11 +1950,6 @@ if ( session_menu != NULL ) {
 
     }
 
-
-     
-
-
-#ifndef __apollo
     /*
      *  [ No Windows ] menu pane...
      */
@@ -1972,7 +1967,6 @@ if ( session_menu != NULL ) {
     if (getenv(LOCATION) == NULL || strcmp(getenv(LOCATION), "local") != 0 )
         XtSetSensitive(options_item[j], False);
     j++;
-#endif
 
 
     /* 
index 7a4f513b6bc6f33844fa98c84b0f79b2453a8652..24ba402faebaf16382bdd1f5944ea827d3e0254d 100644 (file)
@@ -64,9 +64,6 @@
 #include <sys/types.h>
 #include <sys/utsname.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/param.h>
 #include <X11/Intrinsic.h>
index 3a0178682d935f48b1006d4bd508325f62329319..d86590a1bfdd68d726826f07fcd916bbf99999dd 100644 (file)
 #include "SmHelp.h"
 #include "SmGlobals.h"
 
-#ifdef __apollo
-#include <X11/apollosys.h>
-#endif  /* __apollo */
-
-
 /*
  * #define statements
  */
index e505ed60ecf9f83aa4d9032bdfb0789e71f643a0..5b1dfd526da194d63455b800b37ad98627467c26 100644 (file)
@@ -64,9 +64,6 @@
 #endif /* _SUN_OS */
 #include <sys/types.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/wait.h>
 #include <netinet/in.h>
index 2168a13a1d8b5f9df81bf220195035e6d7226a8e..bd738be100be5d2b28fb5792bd311840ebd0fd78 100644 (file)
 #include <sys/types.h>
 #include <errno.h>
 
-#if defined(_AIX) || defined(__apollo)
+#if defined(_AIX)
 #include <sys/dir.h>
 #else
 #include <dirent.h>             /* opendir(), directory(3C) */
 #endif /* _AIX */
 
-#ifdef __apollo
-#include <X11/apollosys.h>      /* needed for S_ISDIR macro */
-#endif
-
-
 #include <locale.h>
 #include <X11/Xlib.h>
 #include <Xm/MwmUtil.h>
index 0fbe61104653953d2f368c394bea42b2a123756d..fe44ca5bca0fe3bfee8cadf3e47610637655c31a 100644 (file)
 
 #ifdef __hpux
 #include <ndir.h>               /*   opendir(), directory(3C) */
-#else
-#if defined(SVR4) || defined(sco) || defined(CSRG_BASED)
+#elif defined(SVR4) || defined(CSRG_BASED)
 #include <dirent.h>             /* opendir(), directory(3C) */
 #else
 #include <sys/dir.h>
-#ifdef __apollo
-#include <X11/apollosys.h>      /* needed for S_ISDIR macro */
-#endif
 #endif
-#endif
-
 
 #include <Xm/Xm.h>
 
index 347e111a6e952ed1e59248f3938c59880af24c7b..3f2957967f17ea6a862df4119d1d0c775dbae45f 100644 (file)
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* include files                         */
 /*+++++++++++++++++++++++++++++++++++++++*/
-#ifdef __apollo
-#include  "/sys5/usr/include/limits.h"
-#else  /* common default */
 #include <limits.h>
-#endif /* __apollo */
 
 #include <locale.h>
 #include <stdlib.h>
index 3060f7b27d5a7baabd51dd999730f09ad4f9385a..170fc2c60ca714bc08569d8809412cc74eb4b895 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index fb9b95f2dedac2666ae00cc7ce30c79d47bf70eb..0cbf6644b32da8c511926d7c6e53fd497fe09416 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index f83df2381ed78d8a92f85badc8dfffdfdfba432d..e2eb0ddfc686e356b0f69d640c4f358703491b6d 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
@@ -36,9 +29,3 @@ saber_src: $(SRCS)
 
 unsaber_src:
         XCOMM unload $(SRCS)
-
-
-
-
-
-
index c048d876c1af8059eeebf7174e17974ba3a51c85..dbb3989aadfad627fe4e158b977349ed1fef1649 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index f139bf71bc48c5bf66a0525b66293498e634a08e..d230775eff071e0bcde99fbc28f005343411a119 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 3b54036feb8daadc3a4a9358ef1b7764ab834be2..819100d265051f56740db673e94567845a0be98c 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index c959ef9f02672408fb13b7d990c5d49ef2cc1ef3..362c208e931646b6a224f152c0d762820fc39a21 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 7169b0343178d9dde5d3d729919e27ee144dd737..7972defa2ad2b0bafd5d0f6f4daca50b3e5b3d2d 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 3e081790af6d4d1a78d4e77831b56901e25fdda4..ef3a1acfd889bad8dd4db4e603fb255cc142d5cf 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index b270b10952df44aae9dfb2a3f2f21ecae45708a4..442b32cb9884e2e6af8d92e63614d2e37a95e6db 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index c418159c89493057cded9c488cdd343ba6be0348..52560568b4a077d0708953dd8c021ae4e9b96dc1 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index fcb1035816215e2c5901fbc4960218a69bd44444..5b827646ba35a02a3204ffc1c68e259f64352658 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 33f41ce19103bdbf2e4e4427d64b1449628c122a..3061ecf67baf4878ca9132df5abc8669cb6daf08 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index f7a559357109d0ab491db17f6c18cd3b2bb4319c..7ef30f4b2b30b4577a2f031ccb96f0ead8d7ae4c 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 8531ed58ac8a629e93d5329fc4d5a1546d906b9e..9a8d2ca7332571846676f3c1704b1b3416818138 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 3244a35b333911898c3b1175162a76a492750032..bce12161cbe9b7ac4148b6e8342254a9633f8149 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 3c807fbf9cfab33fbf170c5b2f771c8f63cadfe9..9e3ce0207fdee909865f8d2f68d70b145a871188 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index a21a88cc70273b27a9060f925cb854063af800ac..2b49185ebb34e44033f147008d37f3c282b601de 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 28cb4354b27766d5a09b34d40190928a2ab74ba2..148813469faa73b7272f32af9f05fa4967a638ed 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index d449ad5ceef027463738e1076f08de8376badbe2..bdb71129670255359d168c18ac3f42698de72865 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 18fcf50f82bd966f244ee575ebaf073194ee462f..aba60711ee9f521df569d6466cdcc89ad112fd10 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 902b6064edfeedf8bf0769db6e5f11b331f6dd9e..38921d759a7c78e312ff3c656b53e3c37d0caf39 100644 (file)
@@ -7,13 +7,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 13d1f46f34fd8857333a36e54908cbe0807ecc59..35a45b854810600625b6eb1b307bff817da370f2 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index a106213ce35c20245b4d39eeb6d88cbce712a612..55f6dab147e1b2eeb3921232525abab5ef2b6afa 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index dd57e8294188312a50dd6020811166f050b35c7b..527b152730c3380a40d6a4d54368986fb5fb79d4 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index d62d8076adc522ccd6b2a9ad4e44af2b43ab91a0..130db85a7b40535af92ef4346a9058dcf357ca10 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index ca4dceac75505de1214491dc4cc4493ade138ac5..9ce86077098aeccdc03ec55fdbf2255ab3b9f4df 100644 (file)
@@ -8,13 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 9c432886b79e69ade7d6571a504f27e83cb3df67..8b25bbf896b1b5f220d364f32df1252caa59cf42 100644 (file)
@@ -8,19 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 #endif
index 689b7762b6d4a63574eb0747acf9c911421611ae..2cc676199f57a3b1c69ac2cd90f0a5cdaa118224 100644 (file)
@@ -8,19 +8,6 @@ SYS_LIBRARIES = -lm
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 6932b5eff8c87e25a3527a5eb7ddee7cea404384..601ff98e731fe4f53344186487be2584331c648c 100644 (file)
@@ -7,19 +7,6 @@ LOCAL_INCLUDES  = -I../shared -I$(TOP)/lib/
 
 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)
 SYS_LIBRARIES = -lm -ldl -lgen -lC
 SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a
index 975c0fbcbd1dc2d07923b574514b9bbd5446f36d..6a3ebfea0d901ca04a8a973c8b150ac926db2e40 100644 (file)
@@ -80,13 +80,6 @@ typedef struct _TempFont {
 #      define DEFAULTSCANUNIT  1               /* default bitmap scan unit */
 #  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)
 
 #      define DEFAULTGLPAD     1               /* default padding for glyphs */
index bf5a7c2e33ffc68685ff8d73c6f8eb82f53503a9..223bf351be9cf39f06bff003d0d365e1d8e0b4e6 100644 (file)
@@ -110,7 +110,7 @@ pragma on(alloca);
 /*
  * 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
  * decide that you don't want to use alloca, you might want to fix 
index a4f83da4d6d923fa47a2e93d0513473e8bc824f3..0d3a2badda95c288b70973818af27dcb5e030186 100644 (file)
@@ -171,15 +171,6 @@ This is unpublished proprietary source code of FUJITSU LIMITED
 
 #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)
 
 #ifdef i386
index 8e58824730a7973554ea5fa318170440c593d6eb..990e4939e30101835517f480dc6f82b3f91a6511 100644 (file)
@@ -64,9 +64,6 @@ SOFTWARE.
 */
 
 #include <stdio.h>
-#ifdef __apollo
-#include <sys/types.h>
-#endif
 #include <sys/stat.h>
 #include <time.h>
 #include <Xm/GadgetP.h>
index 51d9784875197428276ef9ff548e38fbbec559b8..c20e6f0f444f5334a0fca83d9b63815bbefb7689 100644 (file)
@@ -262,15 +262,6 @@ Dtwm*keyBindings:                        DtKeyBindings
 !# Resource for internal dtwm use:
 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  ##########
 !#####  See also the Style Manager - Window Manager Dialogue ########
 
index 38e33dba2addc79a9afa29441950f6cf88191f6c..05283046a3ad499673b82c8ef6df65c8a361d420 100644 (file)
@@ -859,8 +859,6 @@ $set 25        Redefine set#
 
 127 "S [Maske]"
 
-128 "SIGAPOLLO"
-
 129 "Sicherheitsbezeichnung geändert"
 
 130 "Socket-Unterbrechung"
index e2227187f253add18c4fe12cd6e38dcfbc149f89..77a19847d4293fee0143588cab69be43d49dcc53 100644 (file)
@@ -859,8 +859,6 @@ $set 25        Redefine set#
 
 127 "S [máscara]"
 
-128 "SIGAPOLLO"
-
 129 "Cambiado nivel de seguridad"
 
 130 "Interrupción de zócalo"
index e416e012ae5abf257fa01026ac49d4ae56d0755e..a8125d3f405d53b4831282922636c54f27eb4ff6 100644 (file)
@@ -858,8 +858,6 @@ $set 25        Redefine set#
 
 127 "S [masque]"
 
-128 "SIGAPOLLO"
-
 129 "Libellé de sécurité modifié"
 
 130 "Interruption de prise"
index c505dbe1d683dcb7eb917aed5e1aac012b5b2317..522e07bf982f7a1631eaf48e760ed99a82005283 100644 (file)
@@ -431,7 +431,6 @@ $set 25
 125 Risorse perdute
 126 Ritorno al vecchio driver tty...
 127 S [maschera]
-128 SIGAPOLLO
 129 Etichetta di sicurezza modificata
 130 Interrupt del socket 
 131 Suono completato
index ecf610a9563d14a0e9b3dd01dd63c77258a95e9b..70dd35250d5aab0324e2be81a57320e54887fce9 100644 (file)
@@ -433,7 +433,6 @@ $set 25
 125 ¥ê¥½¡¼¥¹¤¬¼º¤ï¤ì¤Þ¤·¤¿¡£
 126 µì tty ¥É¥é¥¤¥Ð¤ËÌᤷ¤Þ¤¹...
 127 S [ ¥Þ¥¹¥¯ ]
-128 SIGAPOLLO
 129 ¥»¥­¥å¥ê¥Æ¥£¡¦¥é¥Ù¥ë¤òÊѹ¹¤·¤Þ¤·¤¿¡£
 130 ¥½¥±¥Ã¥È³ä¤ê¹þ¤ß
 131 ¥µ¥¦¥ó¥É¤¬´°Î»¤·¤Þ¤·¤¿¡£
index 5b956717946bf783fb93b897e978f17d716eec2e..9de548e32b3d1c6ce4bfa14bd79542c242f1901a 100644 (file)
@@ -422,7 +422,6 @@ $set 25
 125 ÀÚ¿øÀÌ ¾ø¾îÁü
 126 ÀÌÀü tty µå¶óÀ̹ö·Î µÇµ¹¸®´Â ÁßÀÔ´Ï´Ù...
 127 S [mask]
-128 SIGAPOLLO
 129 º¸¾È ·¹À̺íÀÌ ¹Ù²î¾ú½À´Ï´Ù.
 130 ¼ÒÄÏ °¡·Îä±â
 131 À½ÇâÀÌ ³¡³µ½À´Ï´Ù.
index 55eaee424a3bd20a66b3c1a250c7bb901c0caf59..01a94b2618f2a13d851484a05743c45b80d7a643 100644 (file)
@@ -430,7 +430,6 @@ $set 25
 125 Resurser saknas
 126 Återgår till gammal tty-drivrutin...
 127 S [mask]
-128 SIGAPOLLO
 129 Säkerhetsnamnet har ändrats
 130 Avbrottssekvens för sockel
 131 Ljudet är färdigt
index 5834e93fe5ebeee3f4bcfd7e2d30a9c689a120c8..621b64fc9f2d0ad332edafa5491aec78e117cdf1 100644 (file)
@@ -431,7 +431,6 @@ $set 25
 125 ×ÊÔ´¶ªÊ§
 126 »Ø¸´µ½¾ÉµÄ tty Çý¶¯³ÌÐò...
 127 S [ÆÁ±Î]
-128 SIGAPOLLO
 129 °²È«ÐÔ±êºÅ¸ü¸Ä
 130 Socket ÖжÏ
 131 ÉùÒôÍê³É
index d356dd2d6d3a34937b436f8ffa2156f75a890870..6cd1cb108c884630a2e6b83935d878bff0171db4 100644 (file)
@@ -142,7 +142,7 @@ $set 11
 3 æñäã '%s' Ñ»à± (Hashing) ÆÂÚõ¡¢Çã widget ùËɱ '%s' Äã
 4 ÆÜßÈËòÅü×äÇØê¢
 5 ÌÔÅïàÒÎÎÙÚÈ硧ÄÖ̦ÜÚÌþÆÜØÄÌîÝÃÌù
-6 widget '%s' ÐúÇ¡ÆÂÚõ\r
+6 widget '%s' ÐúÇ¡ÆÂÚõ
 7 üÏÆüÙ¶í°àÒÕ桨%s
 8 ÅèĶÖÖÍÌÄ÷×ÃàÒÕ桨%s
 9 widget '%s' ÆÜÌùåøÅèĶæñä㡨%s
@@ -431,7 +431,6 @@ $set 25
 125 æñäãòÜÆÂ
 126 Çßߦȩ÷®Îû tty ûÄÙ¯ðÂ...
 127 S [mask]
-128 SIGAPOLLO
 129 ÇøÇÀíºü¾ÄØÊÑüÈ
 130 ßÆսʥöË
 131 ôøÓöÉùÈ©