From edf43195481a1629fa871ce17baf3d64e568181c Mon Sep 17 00:00:00 2001 From: Chase Date: Fri, 22 Jul 2022 21:42:06 -0500 Subject: [PATCH] Discontinue HPUX support --- cde/.gitignore | 2 - cde/configure.ac | 5 - cde/examples/dtaction/Makefile.hp | 45 - cde/examples/dtcalendar/Makefile.hp | 45 - cde/examples/dtdnd/Makefile.hp | 45 - cde/examples/dtdts/Makefile.hp | 45 - cde/examples/dtscreen/Makefile.hp | 45 - cde/examples/dtsession/Makefile.hp | 45 - cde/examples/dtterm/Makefile.hp | 45 - cde/examples/dtwidget/Makefile.hp | 53 - cde/examples/dtwsm/Makefile.hp | 53 - cde/examples/template/Makefile.hp | 107 -- cde/examples/tt/Makefile.hp | 45 - cde/include/Dt/SearchP.h | 7 - cde/include/Dt/TermPrimP.h | 9 +- cde/include/Dt/XlationSvc.h | 2 - cde/include/Dt/vista.h | 3 - cde/include/EUSCompat.h | 43 +- cde/include/SPC/spc-proto.h | 1 - cde/include/bms/sbport.h | 18 +- cde/lib/DtHelp/HP-UX.lcx | 606 ----------- cde/lib/DtHelp/HyperText.c | 8 - cde/lib/DtHelp/Print.c | 4 - cde/lib/DtHelp/StringFuncs.c | 10 - cde/lib/DtHelp/il/ilversion.c | 23 - cde/lib/DtHelp/libDtHelp.elist | 24 +- cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C | 2 +- cde/lib/DtMmdb/StyleSheet/Debug.h | 2 +- cde/lib/DtMmdb/StyleSheet/SSTemplates.C | 2 +- cde/lib/DtMmdb/dti_excs/Destructable_il.hh | 2 +- cde/lib/DtMmdb/dti_excs/Exception.hh | 8 - cde/lib/DtMmdb/dti_excs/Exceptions.hh | 7 +- cde/lib/DtMmdb/dti_excs/terminate.C | 7 - cde/lib/DtMmdb/misc/unique_id.c | 17 +- cde/lib/DtMmdb/misc/unique_id.h | 2 +- cde/lib/DtMmdb/oliasdb/c_api.C | 9 - cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C | 13 +- cde/lib/DtMmdb/schema/desc.h | 2 +- cde/lib/DtMmdb/utility/debug.h | 2 +- cde/lib/DtMmdb/utility/filebuf.C | 2 +- cde/lib/DtMmdb/utility/funcs.C | 4 +- cde/lib/DtMmdb/utility/funcs.h | 3 +- cde/lib/DtMrm/DtMrm.c | 4 - cde/lib/DtSearch/libDtSearch.elist | 4 - cde/lib/DtSvc/DtEncap/pty.c | 202 ---- cde/lib/DtSvc/DtEncap/spc-exec.c | 4 - cde/lib/DtSvc/DtEncap/usersig.c | 48 +- cde/lib/DtSvc/DtUtil1/CmdMain.c | 21 - cde/lib/DtSvc/DtUtil1/CmdProcess.c | 4 - cde/lib/DtSvc/DtUtil1/DbLoad.c | 6 - cde/lib/DtSvc/DtUtil1/Dts.c | 7 +- cde/lib/DtSvc/DtUtil1/DtsInit.c | 6 - cde/lib/DtSvc/DtUtil2/FileUtil.c | 4 - cde/lib/DtSvc/DtUtil2/MsgCat.c | 112 +-- cde/lib/DtSvc/DtUtil2/Utility.c | 4 - cde/lib/DtSvc/include/codelibs/stringx.h | 4 +- cde/lib/DtSvc/libDtSvc.elist | 5 +- cde/lib/DtTerm/Term/TermParse.c | 6 - cde/lib/DtTerm/TermPrim/TermPrim.c | 11 +- cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c | 58 +- .../DtTerm/TermPrim/TermPrimGetPty-clone.c | 37 - cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h | 26 - cde/lib/DtTerm/TermPrim/TermPrimParser.c | 6 - cde/lib/DtTerm/TermPrim/TermPrimSetPty.c | 56 +- cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c | 23 +- cde/lib/DtTerm/TermPrim/TermPrimSubproc.c | 17 +- cde/lib/DtWidget/Editor.c | 4 +- cde/lib/csa/agent.wrapbegin | 4 - cde/lib/csa/agent.wrapend | 4 - cde/lib/csa/cm.h | 7 +- cde/lib/csa/cmcb.h | 5 - cde/lib/csa/connection.c | 30 - cde/lib/csa/libcsa.elist | 4 - cde/lib/csa/rtable2.h | 7 +- cde/lib/csa/rtable3.h | 7 +- cde/lib/csa/rtable4.h | 5 - cde/lib/pam/libpam/pam_framework.c | 52 - .../bin/tt_type_comp/frozen.mp_types_gram.C | 6 - cde/lib/tt/bin/ttdbserverd/db_server_svc.C | 4 - cde/lib/tt/lib/db/tt_db_file.h | 2 +- cde/lib/tt/lib/libtt.elist | 40 - cde/lib/tt/lib/mp/mp_session.C | 2 +- cde/lib/tt/lib/realpath.c | 2 +- cde/lib/tt/lib/tt_options.h | 58 -- cde/lib/tt/lib/tttk/ttdesktop.C | 5 +- cde/lib/tt/lib/util/tt_object_list.h | 2 +- cde/lib/tt/lib/util/tt_port.C | 16 +- cde/lib/tt/lib/util/tt_string.h | 6 +- cde/lib/tt/lib/util/tt_string_match.C | 6 - cde/lib/tt/lib/util/tt_tracefile_parse.C | 2 +- cde/lib/tt/lib/util/tt_xdr_utils.C | 2 +- cde/lib/tt/slib/mp_s_session.C | 2 +- cde/programs/dtaction/Main.c | 16 +- cde/programs/dtaction/demo/Makefile.hp | 52 - cde/programs/dtappbuilder/src/ab/Makefile.am | 1 - .../dtappbuilder/src/abmf/make_file.c | 75 +- .../src/include/ab_private/util.h | 1 - .../dtappbuilder/src/libABil/Makefile.am | 4 - .../dtappbuilder/src/libABobjXm/Makefile.am | 4 - .../dtappbuilder/src/libAButil/Makefile.am | 4 - .../dtappbuilder/src/libAButil/util.c | 33 +- .../dtappbuilder/src/libAButil/util_convert.c | 2 - cde/programs/dtcalc/calctool.h | 13 - cde/programs/dtcalc/text.c | 7 - cde/programs/dtcm/server/log.c | 8 - cde/programs/dtcm/server/svcmain.c | 14 +- cde/programs/dtdocbook/instant/main.c | 7 - cde/programs/dtexec/osdep.h | 4 - cde/programs/dtfile/ChangeDir.c | 4 - cde/programs/dtfile/File.c | 10 - cde/programs/dtfile/FileDialog.c | 2 +- cde/programs/dtfile/FileManip.c | 2 +- cde/programs/dtfile/FileOp.c | 6 +- cde/programs/dtfile/Find.c | 23 +- cde/programs/dtfile/Find.h | 2 +- cde/programs/dtfile/FindP.c | 2 +- cde/programs/dtfile/Main.c | 8 +- cde/programs/dtfile/Main.h | 2 +- cde/programs/dtfile/MkDir.c | 3 - cde/programs/dtfile/dtfile.msg | 5 - cde/programs/dtfile/fsDialog.c | 18 +- cde/programs/dthelp/dthelpgen/helpgen.c | 4 - .../dthelp/parser/canon1/helptag/global.h | 6 +- .../dthelp/parser/canon1/helptag/help.c | 6 +- .../dthelp/parser/canon1/helptag/help.if | 16 +- .../dthelp/parser/canon1/helptag/make.c | 4 +- .../dthelp/parser/canon1/helptag/option.c | 6 +- .../dthelp/parser/canon1/parser/parser.c | 2 +- .../dthelp/parser/canon1/util/malloc.c | 6 +- .../dthelp/parser/pass1/helptag/help.c | 6 +- .../dthelp/parser/pass1/helptag/help.if | 16 +- .../dthelp/parser/pass1/helptag/make.c | 4 +- .../dthelp/parser/pass1/helptag/option.c | 6 +- .../dthelp/parser/pass1/parser/parser.c | 2 +- .../dthelp/parser/pass1/util/malloc.c | 6 +- .../dthelp/parser/pass2/htag2/global.h | 2 +- .../dthelp/parser/pass2/htag2/option.c | 6 +- .../dthelp/parser/pass2/parser/parser.c | 2 +- .../dthelp/parser/pass2/util/malloc.c | 6 +- cde/programs/dtimsstart/env.c | 123 --- cde/programs/dtimsstart/file.c | 129 --- cde/programs/dtimsstart/main.c | 10 - cde/programs/dtimsstart/start.c | 208 ---- cde/programs/dtimsstart/util.c | 68 -- cde/programs/dtimsstart/xims.h | 51 - cde/programs/dtimsstart/ximspath.h | 6 - .../dtinfo/src/Agents/BookmarkEditMotif.C | 2 +- .../dtinfo/src/Agents/BookmarkEditMotif.hh | 3 - .../dtinfo/src/Agents/GraphicAgentMotif.C | 10 - .../dtinfo/dtinfo/src/Agents/PrefAgentMotif.C | 2 +- .../dtinfo/src/Agents/PrintPanelAgentMotif.hh | 2 +- .../dtinfo/dtinfo/src/Basic/BitField.hh | 2 +- .../dtinfo/dtinfo/src/Basic/FolioObject.hh | 2 +- .../dtinfo/dtinfo/src/Managers/PrefMgr.C | 2 +- .../dtinfo/src/Other/WindowSystemMotif.C | 6 +- .../dtinfo/src/Preferences/UserPreference.C | 2 +- cde/programs/dtinfo/dtinfo/src/Templates.C | 2 +- .../dtinfo/dtinfo/src/UAS/Base/UAS_Sender.hh | 2 +- .../dtinfo/src/UAS/Test/UserPreference.C | 2 - cde/programs/dtinfo/dtinfo/src/config.h | 4 +- cde/programs/dtinfo/dtinfo/src/main.C | 14 - cde/programs/dtlogin/account.c | 3 - cde/programs/dtlogin/auth.c | 10 +- cde/programs/dtlogin/bls/validate.c | 1 - cde/programs/dtlogin/chooser.c | 10 +- cde/programs/dtlogin/config/Xconfig.src | 2 +- cde/programs/dtlogin/config/Xresources.src | 66 -- cde/programs/dtlogin/config/Xservers.src | 2 - cde/programs/dtlogin/config/Xsession.src | 30 - cde/programs/dtlogin/daemon.c | 3 - cde/programs/dtlogin/dm.c | 8 +- cde/programs/dtlogin/dm.h | 5 +- cde/programs/dtlogin/genauth.c | 2 +- cde/programs/dtlogin/netaddr.c | 2 - cde/programs/dtlogin/resource.c | 6 +- cde/programs/dtlogin/session.c | 6 - cde/programs/dtlogin/sysauth.c | 942 +----------------- cde/programs/dtlogin/util.c | 102 +- cde/programs/dtlogin/verify.c | 10 - cde/programs/dtlogin/vgauth.c | 930 +---------------- cde/programs/dtlogin/vgcallback.c | 2 - cde/programs/dtlogin/vgmain.c | 19 - cde/programs/dtlogin/xdmcp.c | 4 - cde/programs/dtmail/MotifApp/Application.C | 4 - cde/programs/dtmail/dtmail/RoamApp.C | 4 - .../dtmail/include/DtMail/HashTable.hh | 8 - .../dtmail/libDtMail/Common/DtMailError.C | 9 - .../dtmail/libDtMail/Common/DtMailRc.C | 2 - .../dtmail/libDtMail/Common/DtMailServer.C | 8 - .../dtmail/libDtMail/Common/HashTable.C | 2 - .../dtmail/libDtMail/Common/Process.C | 2 - .../dtmail/libDtMail/RFC/RFCMailBox.C | 6 +- .../dtmail/libDtMail/RFC/RFCTransport.C | 2 +- cde/programs/dtmail/libDtMail/RFC/SunV3.C | 2 - cde/programs/dtpad/printSetup.c | 4 - cde/programs/dtpad/ttMsgSupport.c | 8 +- cde/programs/dtprintinfo/DtPrintinfo.C | 27 - cde/programs/dtprintinfo/libUI/BaseUI.C | 6 +- .../dtprintinfo/libUI/MotifUI/DtDND.C | 2 - .../dtprintinfo/objects/PrintObj/ParseJobs.C | 110 +- .../objects/PrintObj/PrintSubSys.C | 10 - .../dtprintinfo/objects/PrintObj/Queue.C | 16 - cde/programs/dtscreen/dtscreen.h | 4 +- cde/programs/dtscreen/usleep.c | 4 +- .../dtsearchpath/dtsp/HelpSearchPath.C | 14 - cde/programs/dtsearchpath/dtsp/Options.C | 3 - cde/programs/dtsearchpath/libCliSrv/UnixEnv.C | 2 - cde/programs/dtsession/Sm.h | 5 - cde/programs/dtsession/SmConMgmt.c | 25 +- cde/programs/dtsession/SmGlobals.c | 43 - cde/programs/dtsession/SmMain.c | 9 +- cde/programs/dtsession/SmRestore.c | 67 +- cde/programs/dtsession/sys.resources.src | 44 - cde/programs/dtspcd/main.c | 15 - cde/programs/dtspcd/spcd_event.c | 4 - cde/programs/dtstyle/Backdrop.c | 29 - cde/programs/dtstyle/ColorFile.c | 12 +- cde/programs/dtstyle/ColorMain.c | 29 - .../dtterm/tests/shared/include_files.h | 4 - cde/programs/dtterm/tests/shared/p2c.h | 10 - .../dtudcfonted/dtgpftobdf/bdftosnf.h | 7 - .../dtudcfonted/libfal/_falSetLocale.c | 8 +- cde/programs/dtwm/Dtwm.defs.src | 3 - cde/programs/dtwm/WmResParse.c | 25 - cde/programs/dtwm/examples/occupy/Makefile.hp | 48 - cde/programs/dtwm/examples/wsinfo/Makefile.hp | 48 - .../localized/de_DE.UTF-8/msg/dtfile.msg | 7 - .../localized/el_GR.UTF-8/msg/dtfile.msg | 5 - .../localized/sv_SE.UTF-8/msg/dtfile.msg | 5 - cde/programs/localized/util/mkcatdefs.c | 6 - cde/programs/ttsnoop/Makefile.am | 1 - cde/programs/ttsnoop/ttsnoop.C.src | 4 +- cde/programs/types/demo/Makefile.hp | 48 - cde/programs/types/unsupported.dt.src | 67 +- cde/programs/types/uxstd.dt.src | 15 - 235 files changed, 198 insertions(+), 6290 deletions(-) delete mode 100644 cde/examples/dtaction/Makefile.hp delete mode 100644 cde/examples/dtcalendar/Makefile.hp delete mode 100644 cde/examples/dtdnd/Makefile.hp delete mode 100644 cde/examples/dtdts/Makefile.hp delete mode 100644 cde/examples/dtscreen/Makefile.hp delete mode 100644 cde/examples/dtsession/Makefile.hp delete mode 100644 cde/examples/dtterm/Makefile.hp delete mode 100644 cde/examples/dtwidget/Makefile.hp delete mode 100644 cde/examples/dtwsm/Makefile.hp delete mode 100644 cde/examples/template/Makefile.hp delete mode 100644 cde/examples/tt/Makefile.hp delete mode 100644 cde/lib/DtHelp/HP-UX.lcx delete mode 100644 cde/programs/dtaction/demo/Makefile.hp delete mode 100644 cde/programs/dtwm/examples/occupy/Makefile.hp delete mode 100644 cde/programs/dtwm/examples/wsinfo/Makefile.hp delete mode 100644 cde/programs/types/demo/Makefile.hp diff --git a/cde/.gitignore b/cde/.gitignore index 0a358afa2..0102a0fab 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -242,7 +242,6 @@ programs/dtappbuilder/src/ab/.dtcodegen.log programs/dtappbuilder/src/ab/Dtbuilder programs/dtappbuilder/src/ab/Dtbuilder.BAK programs/dtappbuilder/src/ab/Makefile.aix -programs/dtappbuilder/src/ab/Makefile.hpux programs/dtappbuilder/src/ab/Makefile.sunos programs/dtappbuilder/src/ab/Makefile.linux programs/dtappbuilder/src/ab/Makefile.freebsd @@ -2105,7 +2104,6 @@ programs/nsgmls/xentmgr_inst.C # programs/ttsnoop programs/ttsnoop/.dtcodegen.log programs/ttsnoop/Makefile.aix -programs/ttsnoop/Makefile.hpux programs/ttsnoop/Makefile.sunos programs/ttsnoop/Makefile.linux programs/ttsnoop/Makefile.freebsd diff --git a/cde/configure.ac b/cde/configure.ac index 316ac182f..e2563db39 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -61,7 +61,6 @@ build_freebsd=no build_openbsd=no build_netbsd=no build_solaris=no -build_hpux=no build_aix=no dnl For now, we need to fake the OSMAJORVERSION, OSMINORVERSION. In Linux @@ -121,9 +120,6 @@ case "${build_os}" in aix*) build_aix=yes ;; - hpux*) - build_hpux=yes - ;; esac AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"]) @@ -133,7 +129,6 @@ AM_CONDITIONAL([OPENBSD], [test "$build_openbsd" = "yes"]) AM_CONDITIONAL([NETBSD], [test "$build_netbsd" = "yes"]) AM_CONDITIONAL([SOLARIS], [test "$build_solaris" = "yes"]) AM_CONDITIONAL([AIX], [test "$build_aix" = "yes"]) -AM_CONDITIONAL([HPUX], [test "$build_hpux" = "yes"]) dnl Add osmajor/minor version to cppflags. OSVERSION="-DOSMAJORVERSION=$OSMAJORVERSION -DOSMINORVERSION=$OSMINORVERSION" diff --git a/cde/examples/dtaction/Makefile.hp b/cde/examples/dtaction/Makefile.hp deleted file mode 100644 index e9215e214..000000000 --- a/cde/examples/dtaction/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:42:21 drk $ -########################################################################## -# -# Makefile for dtdts examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = actions -SOURCES = actions.c -OBJECTS = actions.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -ltt -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtcalendar/Makefile.hp b/cde/examples/dtcalendar/Makefile.hp deleted file mode 100644 index 263a470e2..000000000 --- a/cde/examples/dtcalendar/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:43:48 drk $ -########################################################################## -# -# Makefile for dtcalendar examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = attributes -SOURCES = attributes.c -OBJECTS = attributes.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lcsa -X11LIBS = -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtdnd/Makefile.hp b/cde/examples/dtdnd/Makefile.hp deleted file mode 100644 index 68416fc69..000000000 --- a/cde/examples/dtdnd/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:45:18 drk $ -########################################################################## -# -# Makefile for dtdnddemo -# -# HP Platform -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -PROGRAM = dtdnddemo -SOURCES = demo.c icon.c text.c file.c buff.c -OBJECTS = demo.o icon.o text.o file.o buff.o -APPDEFAULTS = Dtdnddemo - -DEFINES = -D_HPUX_SOURCE -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -ltt -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) $(APPDEFAULTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtdts/Makefile.hp b/cde/examples/dtdts/Makefile.hp deleted file mode 100644 index b3132b0e6..000000000 --- a/cde/examples/dtdts/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:47:02 drk $ -########################################################################## -# -# Makefile for dtdts examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = datatyping -SOURCES = datatyping.c -OBJECTS = datatyping.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtscreen/Makefile.hp b/cde/examples/dtscreen/Makefile.hp deleted file mode 100644 index f8275d53a..000000000 --- a/cde/examples/dtscreen/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:48:11 drk $ -########################################################################## -# -# Makefile for dtsession examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = screensaver -SOURCES = screensaver.c -OBJECTS = screensaver.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = -lm - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtsession/Makefile.hp b/cde/examples/dtsession/Makefile.hp deleted file mode 100644 index 6a2a87819..000000000 --- a/cde/examples/dtsession/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:49:37 drk $ -########################################################################## -# -# Makefile for dtsession examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = session -SOURCES = session.c -OBJECTS = session.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtterm/Makefile.hp b/cde/examples/dtterm/Makefile.hp deleted file mode 100644 index 6f2545afc..000000000 --- a/cde/examples/dtterm/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:51:00 drk $ -########################################################################## -# -# Makefile for dtterm examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = term -SOURCES = term.c -OBJECTS = term.o - -DEFINES = -D_HPUX_SOURCE -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtTerm -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtwidget/Makefile.hp b/cde/examples/dtwidget/Makefile.hp deleted file mode 100644 index 412708a51..000000000 --- a/cde/examples/dtwidget/Makefile.hp +++ /dev/null @@ -1,53 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:52:14 drk $ -########################################################################## -# -# Makefile for dtwidget examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM1 = controls -SOURCES1 = controls.c -OBJECTS1 = controls.o - -PROGRAM2 = editor -SOURCES2 = editor.c -OBJECTS2 = editor.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtWidget -lDtSvc -ltt -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM1) $(PROGRAM2) - -$(PROGRAM1):: $(OBJECTS1) - $(CC) -o $(PROGRAM1) $(LDFLAGS) $(OBJECTS1) $(LIBRARIES) - -$(PROGRAM2):: $(OBJECTS2) - $(CC) -o $(PROGRAM2) $(LDFLAGS) $(OBJECTS2) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM1) $(OBJECTS1) - $(RM) $(PROGRAM2) $(OBJECTS2) diff --git a/cde/examples/dtwsm/Makefile.hp b/cde/examples/dtwsm/Makefile.hp deleted file mode 100644 index 8a93974f0..000000000 --- a/cde/examples/dtwsm/Makefile.hp +++ /dev/null @@ -1,53 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:53:35 drk $ -########################################################################## -# -# Makefile for dtwidget examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM1 = occupy -SOURCES1 = occupy.c -OBJECTS1 = occupy.o - -PROGRAM2 = wsinfo -SOURCES2 = wsinfo.c -OBJECTS2 = wsinfo.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -ltt -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM1) $(PROGRAM2) - -$(PROGRAM1):: $(OBJECTS1) - $(CC) -o $(PROGRAM1) $(LDFLAGS) $(OBJECTS1) $(LIBRARIES) - -$(PROGRAM2):: $(OBJECTS2) - $(CC) -o $(PROGRAM2) $(LDFLAGS) $(OBJECTS2) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM1) $(OBJECTS1) - $(RM) $(PROGRAM2) $(OBJECTS2) diff --git a/cde/examples/template/Makefile.hp b/cde/examples/template/Makefile.hp deleted file mode 100644 index 21e8820f0..000000000 --- a/cde/examples/template/Makefile.hp +++ /dev/null @@ -1,107 +0,0 @@ -# $XConsortium: Makefile.hp /main/3 1996/05/13 12:00:59 drk $ -########################################################################## -# -# Makefile for template example (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f -DTHELPTAG = dthelptag -GENCAT = gencat -MKDIR = mkdir -p -CP = cp -CHMODEXE = chmod a+x - -LOCALE = C - -PACKAGE = template -APPGROUPNAME = template -PROGRAM = templatebin -SOURCES = template.c -OBJECTS = template.o -HELPSOURCE = $(LOCALE)/template.htg -HELPFILE = $(LOCALE)/template.sdl -MSGSOURCE = $(LOCALE)/template.msg -MSGFILE = $(LOCALE)/template.cat -TYPEFILE = $(LOCALE)/template.dt -ICONFILES = \ - $(LOCALE)/template.t.pm $(LOCALE)/template.t.bm \ - $(LOCALE)/template.s.pm $(LOCALE)/template.s.bm \ - $(LOCALE)/template.m.pm $(LOCALE)/template.m.bm \ - $(LOCALE)/template.l.pm $(LOCALE)/template.l.bm \ - $(LOCALE)/template_icon.pm $(LOCALE)/template_icon_m.bm \ - $(LOCALE)/template-brush.bm -APPDEFAULTSSRC = $(LOCALE)/Template.ad -APPDEFAULTS = $(LOCALE)/Template -README = $(LOCALE)/README -EXAMPLES = $(LOCALE)/example.template -ACTIONS = TemplateNew TemplateOpen TemplatePrint - -DEFINES = -D_INCLUDE_XOPEN_SOURCE -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtHelp -lDtSvc -lXm -ltt -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -#all:: $(PACKAGE) - -$(PACKAGE):: $(PROGRAM) $(HELPFILE) $(MSGFILE) $(APPDEFAULTS) \ - $(ICONFILES) $(TYPEFILE) $(README) $(EXAMPLES) $(ACTIONS) - - $(RM) -r $(PACKAGE) - - $(MKDIR) $(PACKAGE)/bin - $(MKDIR) $(PACKAGE)/app-defaults/C - $(MKDIR) $(PACKAGE)/msg/C - - $(CP) $(PROGRAM) $(PACKAGE)/bin - $(CP) $(MSGFILE) $(PACKAGE)/msg/C - $(CP) $(APPDEFAULTS) $(PACKAGE)/app-defaults/C - - $(MKDIR) $(PACKAGE)/dt/appconfig/icons/C - $(MKDIR) $(PACKAGE)/dt/appconfig/help/C - $(MKDIR) $(PACKAGE)/dt/appconfig/types/C - $(MKDIR) $(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME) - - $(CP) $(ICONFILES) $(PACKAGE)/dt/appconfig/icons/C - $(CP) $(HELPFILE) $(PACKAGE)/dt/appconfig/help/C - $(CP) $(TYPEFILE) $(PACKAGE)/dt/appconfig/types/C - $(CHMODEXE) $(ACTIONS) - $(CP) $(README) $(EXAMPLES) $(ACTIONS) \ - $(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -$(APPDEFAULTS):: $(APPDEFAULTSSRC) - $(CP) $(APPDEFAULTSSRC) $(APPDEFAULTS) - -$(HELPFILE):: $(HELPSOURCE) - $(DTHELPTAG) $(HELPSOURCE) - -$(MSGFILE):: $(MSGSOURCE) - $(GENCAT) $(MSGFILE) $(MSGSOURCE) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) $(MSGFILE) $(APPDEFAULTS) - $(DTHELPTAG) -clean $(HELPSOURCE) - $(RM) -r template diff --git a/cde/examples/tt/Makefile.hp b/cde/examples/tt/Makefile.hp deleted file mode 100644 index 6d9cb15ac..000000000 --- a/cde/examples/tt/Makefile.hp +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 12:02:22 drk $ -########################################################################## -# -# Makefile for ToolTalk examples (HP) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = broadcast -SOURCES = broadcast.c -OBJECTS = broadcast.o - -DEFINES = -D_HPUX_SOURCE -CDEBUGFLAGS = -O -CFLAGS = -Aa -z $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/include/X11R5 - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -ltt -lXm -X11LIBS = -L/usr/lib/X11R5 -lXt -lX11 -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - ${RM} $(PROGRAM) $(OBJECTS) diff --git a/cde/include/Dt/SearchP.h b/cde/include/Dt/SearchP.h index e4a1b090d..d9e75bc5f 100644 --- a/cde/include/Dt/SearchP.h +++ b/cde/include/Dt/SearchP.h @@ -154,13 +154,6 @@ #define UNIX /* used in vista.h and elsewhere */ #endif -#ifdef HP_COMPILER -#define _INCLUDE_HPUX_SOURCE -#define _INCLUDE_POSIX_SOURCE -#define _INCLUDE_XOPEN_SOURCE -#endif - - /*----------------------- AUSTEXT.H --------------------- * DBMS record/key structure and constant declarations. * These represent the database schema formerly in austext.h diff --git a/cde/include/Dt/TermPrimP.h b/cde/include/Dt/TermPrimP.h index 6da67cac3..2a34e7554 100644 --- a/cde/include/Dt/TermPrimP.h +++ b/cde/include/Dt/TermPrimP.h @@ -51,13 +51,8 @@ ** (is it worth making resources for defaultShell ** and defaultShellArgv0?) JRM */ -#ifdef hpV4 -# define DEFAULT_SHELL "/usr/bin/sh" -# define DEFAULT_SHELL_ARGV0 "sh" -#else /* hpV4 */ -# define DEFAULT_SHELL "/bin/sh" -# define DEFAULT_SHELL_ARGV0 "sh" -#endif /* hpV4 */ +#define DEFAULT_SHELL "/bin/sh" +#define DEFAULT_SHELL_ARGV0 "sh" #ifdef __cplusplus extern "C" { diff --git a/cde/include/Dt/XlationSvc.h b/cde/include/Dt/XlationSvc.h index 4cbf865ba..552239c35 100644 --- a/cde/include/Dt/XlationSvc.h +++ b/cde/include/Dt/XlationSvc.h @@ -123,11 +123,9 @@ platforms as part of a translation. #define _DtPLATFORM_UNKNOWN ((const char *)0) #define _DtPLATFORM_CURRENT ((const char *)0) #define _DtPLATFORM_CDE "CDE" -#define _DtPLATFORM_HPUX "HP-UX" #define _DtPLATFORM_AIX "AIX" #define _DtPLATFORM_SUNOS "SunOS" #define _DtPLATFORM_SOLARIS "Solaris" /* verify */ -#define _DtPLATFORM_XENIX "Xenix" /* verify */ /*$END$*/ diff --git a/cde/include/Dt/vista.h b/cde/include/Dt/vista.h index a0ace5376..7fd869dca 100644 --- a/cde/include/Dt/vista.h +++ b/cde/include/Dt/vista.h @@ -302,9 +302,6 @@ typedef struct {DB_ADDR *ptr; LOCK_DESC} DB_ADDR_P; #ifdef ANSI #define Piv(t) ,... /* begining of variable number of parameters */ #define Pv(t) /**/ /* function has 0 or more parameters */ -#else -#define Piv(t) , /* [XENIX] begining of variable number of parameters */ -#define Pv(t) , /* [XENIX] function has 0 or more parameters */ #endif #else #define P0 /**/ diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h index 320e6ccfd..50f43020d 100644 --- a/cde/include/EUSCompat.h +++ b/cde/include/EUSCompat.h @@ -52,7 +52,7 @@ extern "C" { ** System V R4 based systems define the stuff we need in ** sys/types.h. Include that and then we are done. */ -#if defined(HPUX) || defined(__linux__) || defined(SunOS) || defined(CSRG_BASED) +#if defined(__linux__) || defined(SunOS) || defined(CSRG_BASED) # include #endif @@ -69,44 +69,6 @@ extern "C" { #endif #endif /* sun && _XOPEN_SOURCE */ -/* -** HPUX defines most of what we need, if we set the right -** include options before including the system files. -*/ -#if defined(HPUX) - -#ifndef _INCLUDE_POSIX_SOURCE -#define _INCLUDE_POSIX_SOURCE -#endif - -#ifndef _INCLUDE_XOPEN_SOURCE -#define _INCLUDE_XOPEN_SOURCE -#endif - -#ifndef _INCLUDE_AES_SOURCE -#define _INCLUDE_AES_SOURCE -#endif - -#ifndef _INCLUDE_HPUX_SOURCE -#define _INCLUDE_HPUX_SOURCE -#endif - -#ifndef hpV4 -typedef unsigned long ulong_t; -#endif /* hpV4 */ -typedef unsigned char uchar_t; -typedef enum {B_FALSE, B_TRUE} boolean_t; - -#define _SC_PAGESIZE _SC_PAGE_SIZE - -#ifndef MAXPATHLEN -#include -#endif - -#define MAXNAMELEN 256 - -#endif /* HPUX */ - #if defined(__linux__) || defined(CSRG_BASED) #include /* memset for libcsa and others */ typedef enum {B_FALSE, B_TRUE} boolean_t; @@ -115,7 +77,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t; /* -** AIX, like HPUX defines most of what we need. +** AIX defines */ #if defined(AIX) @@ -130,7 +92,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t; #include #define _SC_PAGESIZE _SC_PAGE_SIZE -#define vfork fork #ifndef MAXPATHLEN #include diff --git a/cde/include/SPC/spc-proto.h b/cde/include/SPC/spc-proto.h index c22b8a82f..d459baca5 100644 --- a/cde/include/SPC/spc-proto.h +++ b/cde/include/SPC/spc-proto.h @@ -110,7 +110,6 @@ #define DELETE_LOGFILE 21 -#define RESET_TERMIO 22 /* This is obsolete, (hpux binary version) */ #define RESET_TERMIOS 23 /* New B.00 protocol requests */ diff --git a/cde/include/bms/sbport.h b/cde/include/bms/sbport.h index 8f26b028e..000524c16 100644 --- a/cde/include/bms/sbport.h +++ b/cde/include/bms/sbport.h @@ -44,7 +44,6 @@ __cplusplus - Will be set for C++ compilers __STDCPP__ - Will be set for ANSI and C++ compilers - __hpux - Will be set for HP-UX systems __sun - Will be set for SUN systems __aix - Will be set for IBM (AIX) systems @@ -88,27 +87,12 @@ # define __sun #endif -#if defined(hpux) && !defined(__hpux) -# define __hpux -#endif - #if defined(_AIX) && !defined(__aix) # define __aix # define OSF_MOTIF_1_1_1 # define OSF_BUG #endif -#ifdef __hpux -# define __sysv -/* __hp9000s300 or __hp9000s800 is defined by HP-UX cpp */ -# if !defined (__hpux_8_0) -# define __hp_7_0 -# endif -# define __hp_nls_16 -# define __hp_color_object -# define __unsigned_char_ptr_yytext -#endif /* __hpux */ - #ifdef __sun # if defined(sparc) && !defined(__sparc) # define __sparc @@ -181,7 +165,7 @@ /* about above. So, declare them only if we don't already have them */ /* ----------------------------------------------------------------- */ -#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(__linux__) +#if defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(__linux__) /* the "u_types" are defined in standard files */ # undef _INCLUDE_BSD_SOURCE #else diff --git a/cde/lib/DtHelp/HP-UX.lcx b/cde/lib/DtHelp/HP-UX.lcx deleted file mode 100644 index 0acd5600b..000000000 --- a/cde/lib/DtHelp/HP-UX.lcx +++ /dev/null @@ -1,606 +0,0 @@ -!!!!!!!!!!!!!! HP-UX Locale-Related Translations !!!!!!!!!!!!!! -! File: HP-UX.lcx -! Default location: /usr/dt/config/svc/HP-UX.lcx -! Purpose: -! Define the HP-specific set of locale-related translations. -! Description: -! This file contains the set of all locale-related translations -! that can occur during _DtLcxXlateOpToStd() and _DtLcxStdToOp() -! calls on HP platforms. Note that platform-specific tables may -! include more than one translation to and from CDE standard -! strings if they can be distinguished by version, operation, or -! pattern matching. -! -! It is important that additional CDE standard strings only -! be created by the CDE owner of the _DtLcx translation service -! and NOT be created by an individual vendor or user. This be because -! the purpose of adopting a set of CDE standard strings is to -! support interoperability across platforms. If individual vendors -! add their own "standard" strings and these strings are not -! known on other platforms, then the goal of interoperability -! will be defeated. -! -! If you feel that a new CDE standard string is needed, -! contact your CDE representative/vendor with a specific -! proposal and justification and have them forward it to -! the owner of the CDE _DtLcx service. -! -! Note that it is allowed for vendors and users to add new -! operations for which translations are specified and which -! utilize the standard strings. If the operations are of -! general utility, please bring them to the attention of -! your CDE representative/vendor for forwarding to the -! _DtLcx owner. -! Invoked by: -! This table is used by the _DtLcx translation service -! Product: @(#)Cde1 -! Revision: $XConsortium: HP-UX.lcx /main/3 1995/10/26 12:23:15 rswiston $ -! Defects: -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -!!!!!!!!!!!!!!!! translation specification syntax !!!!!!!!!!!!!!!!!!! -! Introductory fields: -! ==================== -! The _DtLcx translation specifications have a fixed number of -! introductory fields followed by a several standard value -! fields and the operation-specific value. -! The introductory fields are: -! ... -! -! Platform generally is the same string as uname(1) -s. -! Version range utilizes normalized version numbers that -! are acquired using the 'version' translations. -! Operations are one or more comma-separated strings that -! uniquely identify the operation associated with the -! operation-specific value. This string is specified -! as part of the request for a translation. -! -! Kinds of translations allow the mechanism to support several modes -! of operation, each useful for different purposes. When -! reading or writing a specification, pay particular attention -! to the kind of specification, as this guides the usage of it. -! -! Specification kinds: -! .=. means a valid bi-directional translation requiring the op-value -! in the translation specification to exactly match the op-value of -! the call to _DtLcxXlateOpToStd(), e.g. foo matches only foo -! .~. means a valid bi-directional translation requiring the op-value -! in the translation specification to match the beginning of the -! op-value of the call to _DtLcxXlateOpToStd(), e.g. foo matches -! foo@bar. This is often useful, e.g. for operation-specific -! locale strings that may also contain modifier suffixes. -! .>. means only from standard to op-specific (generally a -! compatibility translation, meaning on op-specific value -! that will work for the standard, although that is not -! the straight mapping) -! .<. means only from op-specific to standard (generally a -! regex in the op-value which is used to map a class of -! op values to a standard value) -! .0. means that translation is not supported and if a translation -! request matches the specification, the request will fail. -! -! Standard values: -! ================ -! _DtLcx defines the order of the standard values in the -! translations it utilizes. All translation specifications -! must adhere to this order. -! .. -! In CDE 1.0, no modifiers are standardized and that -! portion of the table is unspecified. This means -! that no CDE standard modifiers are available across -! platforms. Operations that use only the -! should specify the wildcard character ("?") for the -! value. -! -! Operation-specific value: -! ========================= -! The operation-specific value is a string that is used -! according to the kind of translation. The syntax is -! : -! or : "", if it contains white space -! -! Filling in the table of translations: -! ===================================== -! The person preparing the translation table should know -! the minimum version of the target platform that is -! be supported. For example, assume that we must -! complete the table for all versions 9.00 and higher. -! -! The objective is then to provide two sets of translations: -! a full set of translations from CDE standard locales to -! valid platform locales, and a full set of translations -! from valid platform locales to some or all CDE standard -! locales. -! -! Translations from CDE standard locales to valid platform -! locales must use the .~. .=. or .>. mappings. When there -! is a 1:1 mapping between a CDE locale and a platform locale, -! use the .~. or .=. mapping. See the comment below to -! decide which to use. When there is no 1:1 mapping between -! CDE locale and platform locale, use the .>. mapping. This -! provides a valid translation from the CDE locale to the -! best-suitable platform locale, but never translates from -! that platform locale to the CDE locale. -! -! Translations from every platform locale to the appropriate -! CDE locale must use the .~. .=. or .<. mappings. -! When there is a 1:1 mapping between a platform locale and -! a CDE standard locale, use the .~. or .=. mapping. See the -! comment below to decide which to use. If there is a 1:1 -! mapping, but the platform locale pattern uses a regular -! expression, or if more than one platform locale can -! be translated to one CDE standard locale, the .<. mapping must -! be used. -! -! If no appropriate CDE standard locale can be found, you have -! identified the need for a new CDE standard locale. Refer to -! the instructions at the head of this file for how to go about -! registering a new CDE standard locale. You should not create -! a new "standard" locale (the left hand side of the translation -! specification) without registering it with CDE, because this -! will hinder the free exchange of information across locales -! and platforms. -! -! The .=. and .~. mappings are similar. The difference is -! that the .=. mapping requires an exact string match between -! the platform locale and the string provided to the -! translation routine. Generally speaking, this mapping -! is risky unless exact matchings can be guaranteed in -! all DtLcx clients for the particular operation in question. -! The .~. mapping is to be preferred, but the .=. translation -! is useful in limited situations, where similar strings may -! occur. -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! uncomment this resource to debug/test the translation db -!*debugDtXlate: True - -!!!!!!!!!!!!!!!! HP Version Identificaton !!!!!!!!!!!!!!!!! -! These translations are used by the _DtXlateGetXlateEnv() -! call to determine the version number to use. -! -! To understand the translation, realize that the -! operation-specific regexp(5) pattern on the right -! hand side is matched against the strings returned -! by uname(2). The best match determines the "normalized" -! version number of the platform, which should range from -! 001 and up. By convention, major release numbers -! map to centuries and minor release numbers to within -! the century. -! -! To determine the string that the regular expression on the -! right hand side is matching against, use uname(1) and run -! 'uname -r' and 'uname -v' and note the strings. During execution, -! the strings returned by this command are retrieved and -! concatenated "rv"--in that order, no extra spaces. -! This is the string that the pattern must match. -! -! Sometimes this string may not be intuitive. For example, -! note that AIX 3.2 returns 2 for 'uname -r' and 3 for 'uname -v'. -! So the pattern string must be 23, not 32. Do not go by -! the order of 'uname -rv' or 'uname -vr', as that is not used. -!!! -HP-UX.?.version.<.1000: "[A-Z]\\.10\\.00" !! any HPUX 10.00 version -HP-UX.?.version.<.1001: "[A-Z]\\.10\\..*" !! any HPUX 10.x version -HP-UX.?.version.<.900: "[A-Z]\\.09\\..*" !! any HPUX 9.x version -HP-UX.?.version.<.903: "[A-Z]\\.09\\.0[3-9].*" !! any HPUX 9.03-9.09 version -HP-UX.?.version.<.910: "[A-Z]\\.09\\.[1-9].*" !! any HPUX 9.1+ version -HP-UX.?.version.<.800: "[A-Z]\\.08\\..*" !! any HPUX 8.x version - - -!!!!!!!!!!!!!!!! HP-specific setlocale translations !!!!!!!!!!!!!!!!!!! -! These translations are for the string returned by the -! getlocale() or setlocale(LC_xxx,NULL) operations, but not -! setlocale(LC_ALL,NULL) operation. -! -! It provides translations from HP operation-specific -! to CDE standard strings and back again. -! -! Some language,territory combinations have the following comments: -! (1) These ISO territory names may be subject to change -! However, their CDE names will continue to be supported -! (2) No ISO "territory" name exists for the Arabic-speaking regions of the -! world as a whole. Vendors have sometimes supplied their own. -! Those names, when conformant to the ISO model, will be adopted for CDE. -! -!Platform Operation Lang_Terr Op-Value Language,Territory Who has -!--- --------- ----- -------- ------------------ ------- -! Version Kind Codeset -! ---- - --------- - -! setlocales Compliance -HP-UX.700+.setlocale.~.C.HP-ROMAN8: C ! setlocales compliance ,IBM, HP, Sun , -HP-UX.700+.setlocale.<.C.HP-ROMAN8: C.roman8 ! setlocales compliance ,IBM, HP, Sun , -HP-UX.700+.setlocale.~.C.ISO-8859-1: C.iso88591 ! setlocales compliance ,IBM, HP, Sun , -HP-UX.700+.setlocale.~.POSIX.HP-ROMAN8: POSIX ! setlocales compliance ,IBM, HP, Sun , -HP-UX.700+.setlocale.<.POSIX.HP-ROMAN8: POSIX.roman8 ! setlocales compliance ,IBM, HP, Sun , -HP-UX.700+.setlocale.~.POSIX.ISO-8859-1: POSIX.iso88591 ! setlocales compliance ,IBM, HP, Sun , - -! W European/Americas, Latin 1 codeset -HP-UX.700+.setlocale.~.da_DK.ISO-8859-1: danish.iso88591 ! Danish, Denmark XoJIG,IBM, HP, , -HP-UX.700+.setlocale.>.de_AT.ISO-8859-1: german.iso88591 ! German,Austria XoJIG, , , , -HP-UX.700+.setlocale.>.de_CH.ISO-8859-1: german.iso88591 ! German,Switzerland XoJIG,IBM, , , -HP-UX.700+.setlocale.~.de_DE.ISO-8859-1: german.iso88591 ! German, Germany XoJIG,IBM, HP, Sun ("de"), -HP-UX.700+.setlocale.>.en_AU.ISO-8859-1: english.iso88591 ! English,Australia , , , , -HP-UX.700+.setlocale.>.en_CA.ISO-8859-1: english.iso88591 ! English,Canada XoJIG, , , , -HP-UX.700+.setlocale.>.en_DK.ISO-8859-1: english.iso88591 ! English, Denmark XoJIG, , , , -HP-UX.700+.setlocale.>.en_GB.ISO-8859-1: english.iso88591 ! English, U.K. XoJIG,IBM, HP, , -HP-UX.700+.setlocale.>.en_JP.ISO-8859-1: english.iso88591 ! English, Japan XoJIG,IBM, , , -HP-UX.700+.setlocale.>.en_IE.ISO-8859-1: english.iso88591 ! English, Ireland XoJIG, , , , -HP-UX.700+.setlocale.>.en_KR.ISO-8859-1: english.iso88591 ! English,Korea , , , , -HP-UX.700+.setlocale.>.en_MY.ISO-8859-1: english.iso88591 ! English,Malaysia , , , , -HP-UX.700+.setlocale.>.en_NZ.ISO-8859-1: english.iso88591 ! English,New Zealand , , , , -HP-UX.700+.setlocale.>.en_TW.ISO-8859-1: english.iso88591 ! English,Taiwan , , , , -HP-UX.700+.setlocale.~.en_US.ISO-8859-1: english.iso88591 ! English, USA XoJIG,IBM, HP, Sun , -HP-UX.700+.setlocale.>.es_AR.ISO-8859-1: spanish.iso88591 ! Spanish, Argentina , , , Sun , -HP-UX.700+.setlocale.>.es_BO.ISO-8859-1: spanish.iso88591 ! Spanish, Bolivia , , , Sun -HP-UX.700+.setlocale.>.es_CL.ISO-8859-1: spanish.iso88591 ! Spanish, Chile , , , Sun , -HP-UX.700+.setlocale.>.es_CO.ISO-8859-1: spanish.iso88591 ! Spanish, Columbia , , , Sun -HP-UX.700+.setlocale.>.es_CR.ISO-8859-1: spanish.iso88591 ! Spanish, Costa Rica , , , Sun -HP-UX.700+.setlocale.>.es_EC.ISO-8859-1: spanish.iso88591 ! Spanish, Ecuador , , , Sun -HP-UX.700+.setlocale.~.es_ES.ISO-8859-1: spanish.iso88591 ! Spanish, Spain XoJIG,IBM, HP, Sun , -HP-UX.700+.setlocale.>.es_GT.ISO-8859-1: spanish.iso88591 ! Spanish, Guatemala , , , Sun -HP-UX.700+.setlocale.>.es_MX.ISO-8859-1: spanish.iso88591 ! Spanish, Mexico , , , Sun , -HP-UX.700+.setlocale.>.es_PE.ISO-8859-1: spanish.iso88591 ! Spanish, Peru , , , Sun -HP-UX.700+.setlocale.>.es_UY.ISO-8859-1: spanish.iso88591 ! Spanish, Uruguay , , , Sun -HP-UX.700+.setlocale.>.es_VE.ISO-8859-1: spanish.iso88591 ! Spanish, Venezuela , , , Sun , -! HP-UX.700+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -HP-UX.700+.setlocale.~.fi_FI.ISO-8859-1: finnish.iso88591 ! Finnish, Finland XoJIG,IBM, HP, , -! HP-UX.700+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -HP-UX.700+.setlocale.>.fr_BE.ISO-8859-1: french.iso88591 ! French,Belgium XoJIG, , , , -HP-UX.700+.setlocale.~.fr_CA.ISO-8859-1: c-french.iso88591 ! French, Canada XoJIG,IBM, HP, , -HP-UX.700+.setlocale.>.fr_CH.ISO-8859-1: french.iso88591 ! French, Switzerland XoJIG,IBM, , , -HP-UX.700+.setlocale.~.fr_FR.ISO-8859-1: french.iso88591 ! French, France XoJIG,IBM, HP, Sun ("fr"), -HP-UX.700+.setlocale.~.is_IS.ISO-8859-1: icelandic.iso88591 ! Icelandic, Iceland XoJIG,IBM, HP, , -HP-UX.700+.setlocale.>.it_CH.ISO-8859-1: italian.iso88591 ! Italian,Switzerland , , , , -HP-UX.700+.setlocale.~.it_IT.ISO-8859-1: italian.iso88591 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), -! HP-UX.700+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, -! HP-UX.700+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, -! HP-UX.700+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -HP-UX.700+.setlocale.>.nl_BE.ISO-8859-1: dutch.iso88591 ! Dutch, Belgium XoJIG,IBM, , , -HP-UX.700+.setlocale.~.nl_NL.ISO-8859-1: dutch.iso88591 ! Dutch, The Netherlands XoJIG,IBM, HP, , -HP-UX.700+.setlocale.~.no_NO.ISO-8859-1: norwegian.iso88591 ! Norwegian, Norway XoJIG,IBM, HP, , -HP-UX.700+.setlocale.>.pt_BR.ISO-8859-1: portuguese.iso88591 ! Portuguese,Brazil , , , , -HP-UX.700+.setlocale.~.pt_PT.ISO-8859-1: portuguese.iso88591 ! Portuguese, Portugal XoJIG,IBM, HP, , -HP-UX.700+.setlocale.>.sv_FI.ISO-8859-1: swedish.iso88591 ! Swedish, Finland XoJIG, -HP-UX.700+.setlocale.~.sv_SE.ISO-8859-1: swedish.iso88591 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), - -! W European/Americas, HP-ROMAN8 codeset -HP-UX.700+.setlocale.~.da_DK.HP-ROMAN8: danish ! Danish, Denmark , , HP -HP-UX.700+.setlocale.~.de_DE.HP-ROMAN8: german ! German, Germany , , HP -HP-UX.700+.setlocale.>.en_GB.HP-ROMAN8: english ! English, U.K. , , HP -HP-UX.700+.setlocale.~.en_US.HP-ROMAN8: english ! English, USA , , HP -HP-UX.700+.setlocale.~.es_ES.HP-ROMAN8: spanish ! Spanish, Spain , , HP -HP-UX.700+.setlocale.~.fi_FI.HP-ROMAN8: finnish ! Finnish, Finland , , HP -HP-UX.700+.setlocale.~.fr_CA.HP-ROMAN8: c-french ! French, Canada , , HP -HP-UX.700+.setlocale.~.fr_FR.HP-ROMAN8: french ! French, France , , HP -HP-UX.700+.setlocale.~.is_IS.HP-ROMAN8: icelandic ! Icelandic, Iceland , , HP -HP-UX.700+.setlocale.~.it_IT.HP-ROMAN8: italian ! Italian, Italy , , HP -HP-UX.700+.setlocale.~.nl_NL.HP-ROMAN8: dutch ! Dutch, The Netherlands , , HP -HP-UX.700+.setlocale.~.no_NO.HP-ROMAN8: norwegian ! Norwegian, Norway , , HP -HP-UX.700+.setlocale.~.pt_PT.HP-ROMAN8: portuguese ! Portuguese, Portugal , , HP -HP-UX.700+.setlocale.~.sv_SE.HP-ROMAN8: swedish ! Swedish, Sweden , , HP - -! E European -HP-UX.700+.setlocale.~.cs_CS.ISO-8859-2: czech ! Czech(1) ,IBM, HP -! HP-UX.700+.setlocale.>.hr_HR.ISO-8859-2: ! Croatian, Croatia ,IBM -HP-UX.700+.setlocale.~.hu_HU.ISO-8859-2: hungarian ! Hungarian, Hungry XoJIG,IBM, HP -HP-UX.700+.setlocale.~.pl_PL.ISO-8859-2: polish ! Polish, Poland XoJIG,IBM, HP -HP-UX.700+.setlocale.~.ro_RO.ISO-8859-2: rumanian ! Rumanian, Romania XoJIG,IBM, HP -HP-UX.700+.setlocale.~.sh_YU.ISO-8859-2: serbocroatian ! Serbocroatian, Yugoslavia(1) ,IBM, HP -HP-UX.700+.setlocale.~.sl_CS.ISO-8859-2: slovene ! Slovenian ,IBM, HP -HP-UX.700+.setlocale.>.si_SI.ISO-8859-2: slovene ! Slovenian ,IBM, HP -! HP-UX.700+.setlocale.>.sk_SK.ISO-8859-2: ! Slovak ,IBM - -! Cyrillic -HP-UX.700+.setlocale.~.bg_BG.ISO-8859-5: bulgarian ! Bulgarian, Bulgaria ,IBM, HP -! HP-UX.700+.setlocale.>.mk_MK.ISO-8859-5: ! Macedonian ,IBM -HP-UX.700+.setlocale.~.ru_RU.ISO-8859-5: russian ! Russian(1) ,IBM, HP -HP-UX.700+.setlocale.>.ru_SU.ISO-8859-5: russian ! Russian(1) ,IBM, HP -! HP-UX.700+.setlocale.>.sp_YU.ISO-8859-5: ! Serbian,Yugoslavia(1) ,IBM - -! Arabic -HP-UX.700+.setlocale.~.ar_DZ.ISO-8859-6: arabic.iso88596 ! Arabic(2) ,IBM, HP -HP-UX.700+.setlocale.~.ar_DZ.HP-ARABIC8: arabic-w ! Arabic(2) , , HP -HP-UX.700+.setlocale.~.ar_SA.ISO-8859-6: arabic.iso88596 ! Arabic(2) ,IBM, HP -HP-UX.700+.setlocale.~.ar_SA.HP-ARABIC8: arabic ! Arabic(2) , , HP - -! Hebrew -HP-UX.700+.setlocale.~.iw_IL.ISO-8859-8: hebrew.iso88598 ! Hebrew, Israel ,IBM, HP -HP-UX.700+.setlocale.~.iw_IL.HP-HEBREW8: hebrew ! Hebrew, Israel , , HP - -! Greek -HP-UX.700+.setlocale.~.el_GR.ISO-8859-7: greek.iso88597 ! Greek, Greece ,IBM, HP -HP-UX.700+.setlocale.~.el_GR.HP-GREEK8: greek ! Greek, Greece , , HP - -! Turkish -HP-UX.700+.setlocale.~.tr_TR.ISO-8859-9: turkish.iso88599 ! Turkish, Turkey ,IBM, HP -HP-UX.700+.setlocale.~.tr_TR.HP-TURKISH8: turkish ! Turkish, Turkey , , HP - -! East Asia -HP-UX.700+.setlocale.~.ja_JP.EUC-JP: japanese.euc ! Japanese, Japan ,IBM, HP, Sun ("ja"), -HP-UX.700+.setlocale.~.ja_JP.HP-SJIS: japanese ! Japanese, Japan aka japanese 15 , , HP, -HP-UX.700+.setlocale.>.ja_JP.IBM-932: japanese ! Japanese, Japan ,IBM, HP, Sun ("ja"), -HP-UX.700+.setlocale.~.ja_JP.HP-KANA8: katakana ! Japanese, Japan , , HP, , -HP-UX.700+.setlocale.<.ja_JP.EUC-JP: ujis ! Japanese, Japan , , HP, -HP-UX.700+.setlocale.~.ko_KR.EUC-KR: korean ! Korean, Korea ,IBM, HP, Sun ("ko"), -HP-UX.700+.setlocale.>.zh_CN.EUC-CN: chinese-s ! Chinese, China ,IBM, , Sun ("zh"), -HP-UX.700+.setlocale.~.zh_CN.HP-15CN: chinese-s ! Chinese, China , , HP -HP-UX.700+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun , -HP-UX.700+.setlocale.~.zh_TW.HP-BIG5: chinese-t.big5 ! Chinese, Taiwan , , HP, , -HP-UX.700+.setlocale.~.zh_TW.HP-CCDC: chinese-t ! Chinese, Taiwan , , HP, , - -! Thai -HP-UX.700+.setlocale.~.th_TH.TIS-620: thai ! Thai, Thailand ,IBM, HP - -! setlocales Compliance; default codeset on 10.01 systems -HP-UX.1000+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , -HP-UX.1000+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , - -! W European/Americas, Latin 1 codeset -HP-UX.1000+.setlocale.>.de_AT.ISO-8859-1: de_DE.iso88591 ! German,Austria XoJIG, , , , -HP-UX.1000+.setlocale.>.de_CH.ISO-8859-1: de_DE.iso88591 ! German,Switzerland XoJIG,IBM, , , -HP-UX.1000+.setlocale.~.de_DE.ISO-8859-1: de_DE.iso88591 ! German, Germany XoJIG,IBM, HP, Sun ("de"), -HP-UX.1000+.setlocale.>.en_AU.ISO-8859-1: en_GB.iso88591 ! English,Australia , , , , -HP-UX.1000+.setlocale.>.en_CA.ISO-8859-1: en_US.iso88591 ! English,Canada XoJIG, , , , -HP-UX.1000+.setlocale.>.en_DK.ISO-8859-1: en_GB.iso88591 ! English, Denmark XoJIG, , , , -HP-UX.1000+.setlocale.>.en_GB.ISO-8859-1: en_GB.iso88591 ! English, U.K. XoJIG,IBM, HP, , -HP-UX.1000+.setlocale.>.en_JP.ISO-8859-1: en_GB.iso88591 ! English, Japan XoJIG,IBM, , , -HP-UX.1000+.setlocale.>.en_IE.ISO-8859-1: en_GB.iso88591 ! English, Ireland XoJIG, , , , -HP-UX.1000+.setlocale.>.en_MY.ISO-8859-1: en_US.iso88591 ! English,Malaysia , , , , -HP-UX.1000+.setlocale.>.en_NZ.ISO-8859-1: en_GB.iso88591 ! English,New Zealand , , , , -HP-UX.1000+.setlocale.~.en_US.ISO-8859-1: en_US.iso88591 ! English, USA XoJIG,IBM, HP, Sun , -HP-UX.1000+.setlocale.>.es_AR.ISO-8859-1: es_ES.iso88591 ! Spanish, Argentina , , , Sun , -HP-UX.1000+.setlocale.>.es_BO.ISO-8859-1: es_ES.iso88591 ! Spanish, Bolivia , , , Sun -HP-UX.1000+.setlocale.>.es_CL.ISO-8859-1: es_ES.iso88591 ! Spanish, Chile , , , Sun , -HP-UX.1000+.setlocale.>.es_CO.ISO-8859-1: es_ES.iso88591 ! Spanish, Columbia , , , Sun -HP-UX.1000+.setlocale.>.es_CR.ISO-8859-1: es_ES.iso88591 ! Spanish, Costa Rica , , , Sun -HP-UX.1000+.setlocale.>.es_EC.ISO-8859-1: es_ES.iso88591 ! Spanish, Ecuador , , , Sun -HP-UX.1000+.setlocale.~.es_ES.ISO-8859-1: es_ES.iso88591 ! Spanish, Spain XoJIG,IBM, HP, Sun , -HP-UX.1000+.setlocale.>.es_GT.ISO-8859-1: es_ES.iso88591 ! Spanish, Guatemala , , , Sun -HP-UX.1000+.setlocale.>.es_MX.ISO-8859-1: es_ES.iso88591 ! Spanish, Mexico , , , Sun , -HP-UX.1000+.setlocale.>.es_PE.ISO-8859-1: es_ES.iso88591 ! Spanish, Peru , , , Sun -HP-UX.1000+.setlocale.>.es_UY.ISO-8859-1: es_ES.iso88591 ! Spanish, Uruguay , , , Sun -HP-UX.1000+.setlocale.>.es_VE.ISO-8859-1: es_ES.iso88591 ! Spanish, Venezuela , , , Sun , -! HP-UX.1000+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -HP-UX.1000+.setlocale.~.fi_FI.ISO-8859-1: fi_FI.iso88591 ! Finnish, Finland XoJIG,IBM, HP, , -! HP-UX.1000+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -HP-UX.1000+.setlocale.>.fr_BE.ISO-8859-1: fr_FR.iso88591 ! French,Belgium XoJIG, , , , -HP-UX.1000+.setlocale.~.fr_CA.ISO-8859-1: fr_CA.iso88591 ! French, Canada XoJIG,IBM, HP, , -HP-UX.1000+.setlocale.>.fr_CH.ISO-8859-1: fr_FR.iso88591 ! French, Switzerland XoJIG,IBM, , , -HP-UX.1000+.setlocale.~.fr_FR.ISO-8859-1: fr_FR.iso88591 ! French, France XoJIG,IBM, HP, Sun ("fr"), -HP-UX.1000+.setlocale.~.is_IS.ISO-8859-1: is_IS.iso88591 ! Icelandic, Iceland XoJIG,IBM, HP, , -HP-UX.1000+.setlocale.>.it_CH.ISO-8859-1: it_IT.iso88591 ! Italian,Switzerland , , , , -HP-UX.1000+.setlocale.~.it_IT.ISO-8859-1: it_IT.iso88591 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), -! HP-UX.1000+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, -! HP-UX.1000+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, -! HP-UX.1000+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -HP-UX.1000+.setlocale.>.nl_BE.ISO-8859-1: nl_NL.iso88591 ! Dutch, Belgium XoJIG,IBM, , , -HP-UX.1000+.setlocale.~.nl_NL.ISO-8859-1: nl_NL.iso88591 ! Dutch, The Netherlands XoJIG,IBM, HP, , -HP-UX.1000+.setlocale.~.no_NO.ISO-8859-1: no_NO.iso88591 ! Norwegian, Norway XoJIG,IBM, HP, , -HP-UX.1000+.setlocale.>.pt_BR.ISO-8859-1: pt_PT.iso88591 ! Portuguese,Brazil , , , , -HP-UX.1000+.setlocale.~.pt_PT.ISO-8859-1: pt_PT.iso88591 ! Portuguese, Portugal XoJIG,IBM, HP, , -HP-UX.1000+.setlocale.>.sv_FI.ISO-8859-1: sv_SE.iso88591 ! Swedish, Finland XoJIG, -HP-UX.1000+.setlocale.~.sv_SE.ISO-8859-1: sv_SE.iso88591 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), - -! W European/Americas, HP-ROMAN8 codeset -HP-UX.1000+.setlocale.~.da_DK.HP-ROMAN8: da_DK.roman8 ! Danish, Denmark , , HP -HP-UX.1000+.setlocale.~.de_DE.HP-ROMAN8: de_DE.roman8 ! German, Germany , , HP -HP-UX.1000+.setlocale.~.en_GB.HP-ROMAN8: en_GB.roman8 ! English, U.K. , , HP -HP-UX.1000+.setlocale.~.en_US.HP-ROMAN8: en_US.roman8 ! English, USA , , HP -HP-UX.1000+.setlocale.~.es_ES.HP-ROMAN8: es_ES.roman8 ! Spanish, Spain , , HP -HP-UX.1000+.setlocale.~.fi_FI.HP-ROMAN8: fi_FI.roman8 ! Finnish, Finland , , HP -HP-UX.1000+.setlocale.~.fr_CA.HP-ROMAN8: fr_CA.roman8 ! French, Canada , , HP -HP-UX.1000+.setlocale.~.fr_FR.HP-ROMAN8: fr_FR.roman8 ! French, France , , HP -HP-UX.1000+.setlocale.~.is_IS.HP-ROMAN8: is_IS.roman8 ! Icelandic, Iceland , , HP -HP-UX.1000+.setlocale.~.it_IT.HP-ROMAN8: it_IT.roman8 ! Italian, Italy , , HP -HP-UX.1000+.setlocale.~.nl_NL.HP-ROMAN8: nl_NL.roman8 ! Dutch, The Netherlands , , HP -HP-UX.1000+.setlocale.~.no_NO.HP-ROMAN8: no_NO.roman8 ! Norwegian, Norway , , HP -HP-UX.1000+.setlocale.~.pt_PT.HP-ROMAN8: pt_PT.roman8 ! Portuguese, Portugal , , HP -HP-UX.1000+.setlocale.~.sv_SE.HP-ROMAN8: sv_SE.roman8 ! Swedish, Sweden , , HP - -! E European -HP-UX.1000+.setlocale.~.cs_CS.ISO-8859-2: cs_CS.iso88592 ! Czech(1) ,IBM, HP -! HP-UX.1000+.setlocale.>.hr_HR.ISO-8859-2: ! Croatian, Croatia ,IBM -HP-UX.1000+.setlocale.~.hu_HU.ISO-8859-2: hu_HU.iso88592 ! Hungarian, Hungry XoJIG,IBM, HP -HP-UX.1000+.setlocale.~.pl_PL.ISO-8859-2: pl_PL.iso88592 ! Polish, Poland XoJIG,IBM, HP -HP-UX.1000+.setlocale.~.ro_RO.ISO-8859-2: ro_RO.iso88592 ! Rumanian, Romania XoJIG,IBM, HP -HP-UX.1000+.setlocale.~.sh_YU.ISO-8859-2: sh_YU.iso88592 ! Serbocroatian, Yugoslavia(1) ,IBM, HP -HP-UX.1000+.setlocale.~.sl_CS.ISO-8859-2: sl_CS.iso88592 ! Slovenian ,IBM, HP -! HP-UX.1000+.setlocale.>.si_SI.ISO-8859-2: ! Slovenian ,IBM, HP -! HP-UX.1000+.setlocale.>.sk_SK.ISO-8859-2: ! Slovak ,IBM - -! Cyrillic -HP-UX.1000+.setlocale.~.bg_BG.ISO-8859-5: bg_BG.iso88595 ! Bulgarian, Bulgaria ,IBM, HP -! HP-UX.1000+.setlocale.>.mk_MK.ISO-8859-5: ! Macedonian ,IBM -HP-UX.1000+.setlocale.>.ru_RU.ISO-8859-5: ru_SU.iso88595 ! Russian(1) ,IBM, HP -HP-UX.1000+.setlocale.~.ru_SU.ISO-8859-5: ru_SU.iso88595 ! Russian(1) ,IBM, HP -! HP-UX.1000+.setlocale.>.sp_YU.ISO-8859-5: ! Serbian,Yugoslavia(1) ,IBM - -! Arabic -HP-UX.1000+.setlocale.>.ar_DZ.ISO-8859-6: ar_SA.iso88596 ! Arabic(2) ,IBM, HP -HP-UX.1000+.setlocale.~.ar_DZ.HP-ARABIC8: ar_DZ.arabic8 ! Arabic(2) , , HP -HP-UX.1000+.setlocale.~.ar_SA.ISO-8859-6: ar_SA.iso88596 ! Arabic(2) ,IBM, HP -HP-UX.1000+.setlocale.~.ar_SA.HP-ARABIC8: ar_SA.arabic8 ! Arabic(2) , , HP - -! Hebrew -HP-UX.1000+.setlocale.~.iw_IL.ISO-8859-8: iw_IL.iso88598 ! Hebrew, Israel ,IBM, HP -HP-UX.1000+.setlocale.~.iw_IL.HP-HEBREW8: iw_IL.hebrew8 ! Hebrew, Israel , , HP - -! Greek -HP-UX.1000+.setlocale.~.el_GR.ISO-8859-7: el_GR.iso88597 ! Greek, Greece ,IBM, HP -HP-UX.1000+.setlocale.~.el_GR.HP-GREEK8: el_GR.greek8 ! Greek, Greece , , HP - -! Turkish -HP-UX.1000+.setlocale.~.tr_TR.ISO-8859-9: tr_TR.iso88599 ! Turkish, Turkey ,IBM, HP -HP-UX.1000+.setlocale.~.tr_TR.HP-TURKISH8: tr_TR.turkish8 ! Turkish, Turkey , , HP - -! East Asia -HP-UX.1000+.setlocale.~.ja_JP.EUC-JP: ja_JP.eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), -HP-UX.1000+.setlocale.~.ja_JP.HP-SJIS: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), -HP-UX.1000+.setlocale.>.ja_JP.IBM-932: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), -HP-UX.1000+.setlocale.~.ja_JP.HP-KANA8: ja_JP.kana8 ! Japanese, Japan , , HP, , -HP-UX.1000+.setlocale.~.ko_KR.EUC-KR: ko_KR.eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), -HP-UX.1000+.setlocale.>.zh_CN.EUC-CN: zh_CN.15CN ! Chinese, China ,IBM, HP, Sun ("zh"), -HP-UX.1000+.setlocale.~.zh_CN.HP-15CN: zh_CN.15CN ! Chinese, China ,IBM, HP, Sun ("zh"), -HP-UX.1000+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun , -HP-UX.1000+.setlocale.~.zh_TW.HP-BIG5: zh_TW.big5 ! Chinese, Taiwan , , HP, , -HP-UX.1000+.setlocale.~.zh_TW.HP-CCDC: zh_TW.ccdc ! Chinese, Taiwan , , HP, , - -! Thai -HP-UX.1000+.setlocale.~.th_TH.TIS-620: th_TH.tis620 ! Thai, Thailand ,IBM, HP - - -! codesets supported for iconv(1,3) on HP-UX 7.0 and above -HP-UX.700+.iconv1,iconv3.=.?.HP-ROMAN8: roman8 -HP-UX.700+.iconv1,iconv3.=.?.ISO-8859-1: iso8859_1 -HP-UX.700+.iconv1,iconv3.=.?.HP-ARABIC8: arabic8 -HP-UX.700+.iconv1,iconv3.=.?.HP-GREEK8: greek8 -HP-UX.700+.iconv1,iconv3.=.?.HP-HEBREW8: hebrew8 -HP-UX.700+.iconv1,iconv3.=.?.HP-TURKISH8: turkish8 -HP-UX.700+.iconv1,iconv3.=.?.EUC-KR: korean15 -HP-UX.700+.iconv1,iconv3.=.?.ISO-2022-JP: jis -HP-UX.700+.iconv1,iconv3.<.?.HP-SJIS: japanese15 -HP-UX.700+.iconv1,iconv3.=.?.HP-SJIS: sjis -HP-UX.700+.iconv1,iconv3.=.?.HP-KANA8: kana8 -HP-UX.700+.iconv1,iconv3.=.?.EUC-JP: ujis -HP-UX.700+.iconv1,iconv3.=.?.HP-CCDC: roc15 - -! codesets supported by iconv(1,3) after HP-UX 10.0 -HP-UX.1000+.iconv1,iconv3.~.?.HP-BIG5: big5 -HP-UX.1000+.iconv1,iconv3.~.?.EUC-TW: eucTW -HP-UX.1000+.iconv1,iconv3.~.?.TIS-620: tis620 -HP-UX.1000+.iconv1,iconv3.>.?.EUC-CN: hp15cn -HP-UX.1000+.iconv1,iconv3.~.?.HP-15CN: hp15cn -HP-UX.1000+.iconv1,iconv3.~.?.EUC-KR: eucKR -HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-2: iso8859_2 -HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-5: iso8859_5 -HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-6: iso8859_6 -HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-7: iso8859_7 -HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-8: iso8859_8 -HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-9: iso8859_9 -HP-UX.1000+.iconv1,iconv3.~.?.IBM-437: cp437 -HP-UX.1000+.iconv1,iconv3.~.?.IBM-850: cp850 - -! codesets not supported by iconv(1,3) through 10.0 HP-UX release -!HP-UX.?.iconv1,iconv3.=.?.ISO-2022-KR: -!HP-UX.?.iconv1,iconv3.=.?.ISO-2022-TW: -!HP-UX.?.iconv1,iconv3.=.?.ISO-2022-CN: -!HP-UX.?.iconv1,iconv3.~.?.IBM-856: -!HP-UX.?.iconv1,iconv3.~.?.IBM-1046: -!HP-UX.?.iconv1,iconv3.~.?.UCS-2: -!HP-UX.?.iconv1,iconv3.~.?.UTF-8: - -! codesets supported for nl_langinfo on HP-UX 7.0 and above -HP-UX.700-999.nl_langinfo(CODESET).=.?.HP-ROMAN8: ROMAN8 -HP-UX.700-999.nl_langinfo(CODESET).>.?.?: ROMAN8 !!! nl_langinfo is hardwired to ROMAN8 for all codesets -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-ROMAN8: roman8 -HP-UX.1000+.nl_langinfo(CODESET).=.?.ISO-8859-1: iso8859_1 -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-ARABIC8: arabic8 -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-GREEK8: greek8 -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-HEBREW8: hebrew8 -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-TURKISH8: turkish8 -HP-UX.1000+.nl_langinfo(CODESET).=.?.EUC-KR: korean15 !!! verify std matches op -HP-UX.1000+.nl_langinfo(CODESET).<.?.HP-SJIS: japanese15 -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-SJIS: sjis -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-KANA8: kana8 -HP-UX.1000+.nl_langinfo(CODESET).=.?.EUC-JP: ujis -HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-CCDC: roc15 !!! verify std matches op - -! 10.0 and above supported iconv(1) codesets -!!! collect and verify this - -! multibyte codesets -! This translation provides an alternative to a call to -! using setlocale() and MB_CUR_MAX to determine this. -HP-UX.?.multibyte.=.?.EUC-KR: 2 -HP-UX.?.multibyte.=.?.HP-SJIS: 2 -HP-UX.700+.multibyte.=.?.EUC-JP: 2 -HP-UX.1000+.multibyte.=.?.EUC-JP: 4 -HP-UX.?.multibyte.=.?.IBM-932: 2 -HP-UX.?.multibyte.=.?.HP-CCDC: 2 -HP-UX.?.multibyte.=.?.HP-BIG5: 2 -HP-UX.?.multibyte.=.?.EUC-TW: 2 -HP-UX.?.multibyte.=.?.TIS-620: 2 -HP-UX.?.multibyte.=.?.EUC-CN: 2 -HP-UX.?.multibyte.=.?.HP-15CN: 2 -HP-UX.?.multibyte.=.?.EUC-KR: 2 -HP-UX.?.multibyte.=.?.EUC-TW: 2 - -! Translations from predefined CCDF-locales to CDE Standard Locales -HP-UX.700+.ccdf.=.?.HP-ROMAN8: hp-roman8 -HP-UX.700+.ccdf.=.?.ISO-8859-1: iso8859-1 -HP-UX.700+.ccdf.=.ko_KR.EUC-KR: hp-korean15 -HP-UX.700+.ccdf.=.ja_JP.HP-SJIS: hp-japanese15 -HP-UX.700+.ccdf.=.ja_JP.EUC-JP: hp-japaneseeuc -HP-UX.700+.ccdf.=.?.DT-SYMBOL-1: symbol !!! this is the Dt symbol font -! These CDE standard locales may have CCDF-locales, but they are defined by localizers -! HP-UX.700+.ccdf.=.ar_SA.HP-ARABIC8: arabic8 -! HP-UX.700+.ccdf.=.el_GR.HP-GREEK8: greek8 -! HP-UX.700+.ccdf.=.iw_IL.HP-HEBREW8: hebrew8 -! HP-UX.700+.ccdf.=.tr_TR.HP-TURKISH8: turkish8 -! HP-UX.700+.ccdf.<.ja_JP.HP-SJIS: sjis -! HP-UX.700+.ccdf.=.ja_JP.HP-KANA8: kana8 -! HP-UX.700+.ccdf.=.ja_JP.EUC-JP: ujis -! HP-UX.700+.ccdf.=.zh_CN.HP-CCDC: roc15 - - -! Codesets that require multibyte parsing to avoid confusion with shell special chars -HP-UX.?.dtkshSpecialParse.=.ja_JP.HP-SJIS: True -HP-UX.?.dtkshSpecialParse.=.ja_JP.IBM-932: True -HP-UX.?.dtkshSpecialParse.=.zh_TW.HP-BIG5: True -HP-UX.?.dtkshSpecialParse.=.zh_TW.HP-CCDC: True -HP-UX.?.dtkshSpecialParse.=.zh_TW.EUC-TW: True - - -!! When content is exchanged with other platforms, the interchange codeset -!! may be different that the codeset used locally. In CDE1, these translations -!! are used by dtmail, but other clients may use the same translations -!! in the future. For example, to improve interoperability of 8-bit mail, -!! the mail messages of users working in codesets such as HP-ROMAN8 or IBM-850 -!! are translated to the interchangeCodeset (in this case, ISO-8859-1) before -!! they are sent. Similarly, the mail of Japanese users is translated to JIS -!! before it is sent. -HP-UX.?.interchangeCodeset.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1 -HP-UX.?.interchangeCodeset.>.?.HP-ROMAN8: ISO-8859-1 ! HP Roman8 -!HP-UX.?.interchangeCodeset.>.?.IBM-850: ISO-8859-1 ! PC (Multi-lingual) -!HP-UX.?.interchangeCodeset.>.?.IBM-437: ISO-8859-1 ! PC (US) -HP-UX.?.interchangeCodeset.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2 -HP-UX.?.interchangeCodeset.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic -HP-UX.?.interchangeCodeset.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic -HP-UX.?.interchangeCodeset.>.?.HP-ARABIC8: ISO-8859-6 ! HP Arabic8 -!HP-UX.?.interchangeCodeset.>.?.IBM-1046: ISO-8859-6 ! PC Arabic Code Set -HP-UX.?.interchangeCodeset.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew -HP-UX.?.interchangeCodeset.>.?.HP-HEBREW8: ISO-8859-8 ! HP Hebrew8 -!HP-UX.?.interchangeCodeset.>.?.IBM-856: ISO-8859-8 ! PC Hebrew -HP-UX.?.interchangeCodeset.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek -HP-UX.?.interchangeCodeset.>.?.HP-GREEK8: ISO-8859-7 ! HP Greek8 -HP-UX.?.interchangeCodeset.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5 -HP-UX.?.interchangeCodeset.>.?.HP-TURKISH8: ISO-8859-9 ! HP Turkish8 -HP-UX.?.interchangeCodeset.~.?.EUC-JP: ISO-2022-JP ! Japanese EUC -HP-UX.?.interchangeCodeset.>.?.HP-SJIS: ISO-2022-JP ! HP Japanese Shift JIS -!HP-UX.?.interchangeCodeset.>.?.IBM-932: ISO-2022-JP ! PC Japanese Shift JIS -HP-UX.?.interchangeCodeset.>.?.HP-KANA8: ISO-2022-JP ! HP Japanese Katakana8 -! comment when ISO-2022-KR iconv available -HP-UX.?.interchangeCodeset.~.?.EUC-KR: EUC-KR ! Korean EUC KSC 5601 -! uncomment when ISO-2022-KR iconv available -!HP-UX.?.interchangeCodeset.~.?.EUC-KR: ISO-2022-KR ! Korean EUC KSC 5601 -! comment when ISO-2022-CN iconv available -HP-UX.?.interchangeCodeset.>.?.EUC-CN: EUC-CN ! China Chinese EUC -HP-UX.?.interchangeCodeset.~.?.HP-15CN: EUC-CN ! HP Chinese EUC -! uncomment when ISO-2022-CN iconv available -!HP-UX.?.interchangeCodeset.>.?.EUC-CN: ISO-2022-CN ! China Chinese EUC -!HP-UX.?.interchangeCodeset.~.?.HP-15CN: ISO-2022-CN ! HP Chinese EUC -! comment when ISO-2022-TW iconv available -HP-UX.?.interchangeCodeset.~.?.EUC-TW: EUC-TW ! Taiwan Chinese EUC -HP-UX.?.interchangeCodeset.>.?.HP-BIG5: EUC-TW ! HP Big5 Chinese -HP-UX.?.interchangeCodeset.>.?.HP-CCDC: EUC-TW ! HP CCDC Chinese -! uncomment when ISO-2022-TW iconv available -!HP-UX.?.interchangeCodeset.~.?.EUC-TW: ISO-2022-TW ! Taiwan Chinese EUC -!HP-UX.?.interchangeCodeset.>.?.HP-BIG5: ISO-2022-TW ! HP Big5 Chinese -!HP-UX.?.interchangeCodeset.>.?.HP-CCDC: ISO-2022-TW ! HP CCDC Chinese -HP-UX.?.interchangeCodeset.~.?.TIS-620: TIS-620 ! Thai -HP-UX.?.interchangeCodeset.>.?.UCS-2: UTF-8 ! multibyte encoding of Unicode -HP-UX.?.interchangeCodeset.~.?.UTF-8: UTF-8 ! multibyte encoding of Unicode - diff --git a/cde/lib/DtHelp/HyperText.c b/cde/lib/DtHelp/HyperText.c index 7ea0935d2..07eec3410 100644 --- a/cde/lib/DtHelp/HyperText.c +++ b/cde/lib/DtHelp/HyperText.c @@ -49,15 +49,11 @@ #include #include #include -#ifdef __hpux -#include -#else /* SUN and IBM */ #ifdef _AIX #include #endif #include #include -#endif #include #include #include @@ -233,11 +229,7 @@ _DtHelpExecProcedure ( /* * fork a child process. */ -#ifdef __hpux - childPid = vfork (); -#else childPid = fork (); -#endif /* __hpux */ /* * If the child, exec the cmd with a shell parent diff --git a/cde/lib/DtHelp/Print.c b/cde/lib/DtHelp/Print.c index 8714a9153..a8699a336 100644 --- a/cde/lib/DtHelp/Print.c +++ b/cde/lib/DtHelp/Print.c @@ -1303,11 +1303,7 @@ void _DtHelpPrintJob( } #endif -#ifdef __hpux - pid = vfork(); -#else pid = fork(); -#endif /* __hpux */ if (pid == 0) { diff --git a/cde/lib/DtHelp/StringFuncs.c b/cde/lib/DtHelp/StringFuncs.c index 71749f587..b1e2db671 100644 --- a/cde/lib/DtHelp/StringFuncs.c +++ b/cde/lib/DtHelp/StringFuncs.c @@ -528,11 +528,7 @@ int _DtHelpCeStrHashToKey( _CEStrcollProc _DtHelpCeGetStrcollProc(void) { int Clang = 0; -#if defined(__hpux) - struct locale_data * li; -#else char * locale; -#endif extern int strcoll(const char *,const char *); #if defined(_AIX) @@ -544,15 +540,9 @@ int _DtHelpCeStrHashToKey( #define C_LANG "C" /* if locale is C, use the explicit case insensitive compare */ -#if defined(__hpux) - li = getlocale(LOCALE_STATUS); - if ( NULL == li->LC_COLLATE_D || strcmp(C_LANG,li->LC_COLLATE_D) == 0 ) - Clang = 1; -#else locale = setlocale(LC_COLLATE,NULL); /* put locale in buf */ if (strcmp(locale,C_LANG) == 0) Clang = 1; -#endif if (Clang) #if defined(_AIX) diff --git a/cde/lib/DtHelp/il/ilversion.c b/cde/lib/DtHelp/il/ilversion.c index 00f061d6c..a90c6a913 100644 --- a/cde/lib/DtHelp/il/ilversion.c +++ b/cde/lib/DtHelp/il/ilversion.c @@ -33,31 +33,8 @@ See notes below "ilVersionName". */ -#ifdef __hpux - IL_PRIVATE - char _ilVersionString[] = "HP IL BETA v 23. bl08"; -/* nnnnn vvvvvv bbbb see below - xxxxxxxxxxxxxxxxx total size = 17 chars - - The above version string *must* maintain the syntax and position of all fields - before the ";". The strings have the following format; each string is 5 chars: - nnnnn A 5 char fixed string equal to "HP IL ". - vvvvvv A 6 char string in the format "v!!.??", where !! is the two-digit - major version number (" n" if less than 10), and ?? is the minor - version number ("n " if less than 10). Examples: "v10.12", - "v 9.6 ". - bbbbb A 4 char string in the format "bl??", where ?? is the baselevel - number (e.g. "bl01", "bl56"). - -*/ - -#else - IL_PRIVATE char _ilVersionString[] = "@(#)HP IL v 2.1 bl06; Image Library for Domain/OS SR10.X 'il'"; /* nnnnn vvvvvv bbbb see above xxxxxxxxxxxxxxxxx total size = 17 chars */ - -#endif - diff --git a/cde/lib/DtHelp/libDtHelp.elist b/cde/lib/DtHelp/libDtHelp.elist index c1cc930df..b160b9199 100644 --- a/cde/lib/DtHelp/libDtHelp.elist +++ b/cde/lib/DtHelp/libDtHelp.elist @@ -112,7 +112,7 @@ private _DtHelpCeFindKeyword private _DtHelpCeXlateOpToStdLocale private _DtHelpCeXlateStdToOpLocale private _DtHelpCeGetDocStamp -#if !defined(sun) && !defined(__hpux) +#if !defined(sun) private _DtHelpCeStrCaseCmp #endif @@ -147,28 +147,6 @@ private _DtGrRead private _DtHelpCeGetTopTopicId private _DtHelpCeIsTopTopic -/***************************************************************************** - **** Private const structures. - **** On HP machines, these core dump if compiled +ESlit and not included - **** in the export list. - *****************************************************************************/ -#if 0 -#ifdef __hpux -private ilBitonal0WhiteImageDes -private ilGray256ImageDes -private ilRGB256ImageDes -private ilPaletteImageDes -private ilYCbCrImageDes -private ilYCbCr2ImageDes - -private ilBitImageFormat -private ilByteImageFormat -private il3BytePixelImageFormat -private il3BytePlaneImageFormat -#endif /* ifdef __hpux */ -#endif - - /***************************************************************************** **** Internal symbols nobody should call from outside DtHelp *****************************************************************************/ diff --git a/cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C b/cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C index 4050c1f2d..6fc7863e4 100644 --- a/cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C +++ b/cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C @@ -35,7 +35,7 @@ #endif /* end of CDE_NEXT */ -#if defined(sun) || defined(hpux) +#if defined(sun) #ifndef CDE_NEXT /* { */ diff --git a/cde/lib/DtMmdb/StyleSheet/Debug.h b/cde/lib/DtMmdb/StyleSheet/Debug.h index d6d2ace8d..db767c7e7 100644 --- a/cde/lib/DtMmdb/StyleSheet/Debug.h +++ b/cde/lib/DtMmdb/StyleSheet/Debug.h @@ -57,7 +57,7 @@ using namespace std; #ifdef DEBUG -#if !defined ( __STDC__) && !defined (hpux) +#if !defined ( __STDC__) #define debug(s, x) s << "x" << " = " << (x) << "\n" #else #define debug(s, x) s << #x << " = " << (x) << "\n" diff --git a/cde/lib/DtMmdb/StyleSheet/SSTemplates.C b/cde/lib/DtMmdb/StyleSheet/SSTemplates.C index 57c0be22d..fd292238c 100644 --- a/cde/lib/DtMmdb/StyleSheet/SSTemplates.C +++ b/cde/lib/DtMmdb/StyleSheet/SSTemplates.C @@ -69,7 +69,7 @@ typedef Stack > _stack_fs_orvec_fs_; // the largest ID used in f's: 59 // -#if defined(sun) || defined(hpux) +#if defined(sun) typedef CC_TPtrSlist _f4_; typedef CC_TPtrSlist _f5_; typedef CC_TPtrSlist _f2_; diff --git a/cde/lib/DtMmdb/dti_excs/Destructable_il.hh b/cde/lib/DtMmdb/dti_excs/Destructable_il.hh index 3c189913c..ea01d5377 100644 --- a/cde/lib/DtMmdb/dti_excs/Destructable_il.hh +++ b/cde/lib/DtMmdb/dti_excs/Destructable_il.hh @@ -98,7 +98,7 @@ Destructable::~Destructable() // This code relies on the fact that in cfront 2.1 this qualified // call to the destructor will actually call the virtual destructor. -#if !defined(hpux) && (CC_VERSION < 30) +#if (CC_VERSION < 30) inline void Destructable::destruct() { diff --git a/cde/lib/DtMmdb/dti_excs/Exception.hh b/cde/lib/DtMmdb/dti_excs/Exception.hh index 726970c8d..2c5322777 100644 --- a/cde/lib/DtMmdb/dti_excs/Exception.hh +++ b/cde/lib/DtMmdb/dti_excs/Exception.hh @@ -31,10 +31,6 @@ class Exception : public Destructable public: #ifdef NATIVE_EXCEPTIONS -#if defined(hpux) - Exception() { } -#endif - #else Exception(); @@ -106,10 +102,6 @@ protected: friend class Jump_Environment; friend class Exceptions; -#if defined(hpux) -#define MakeOperatorNewPublic -#endif - #ifdef MakeOperatorNewPublic // A problem with the HP-UX 3.65 compiler requires us to make this public. // And, since we gen the Templates.nd.c file on a non-HPUX platform, we need diff --git a/cde/lib/DtMmdb/dti_excs/Exceptions.hh b/cde/lib/DtMmdb/dti_excs/Exceptions.hh index ca7850b35..09683486e 100644 --- a/cde/lib/DtMmdb/dti_excs/Exceptions.hh +++ b/cde/lib/DtMmdb/dti_excs/Exceptions.hh @@ -66,7 +66,7 @@ extern "C" { #endif #ifndef STRINGIFY -#if !defined(__STDC__) && !defined(hpux) +#if !defined(__STDC__) #define STRINGIFY(S) "S" #else #define STRINGIFY(S) #S @@ -130,13 +130,8 @@ extern "C" { // This works if OBJ is an object or a pointer since Exception objects // overload operator ->. -#if !defined(hpux) #define mthrow(OBJ) \ (OBJ)->throw_it (__LINE__, __FILE__, DEBUG_THROW_FLAG) -#else -#define mthrow(OBJ) \ - OBJ->throw_it (__LINE__, __FILE__, DEBUG_THROW_FLAG) -#endif #define rethrow \ Exception::current_exception().do_throw (__LINE__, __FILE__) diff --git a/cde/lib/DtMmdb/dti_excs/terminate.C b/cde/lib/DtMmdb/dti_excs/terminate.C index 1fe248f75..f7b684344 100644 --- a/cde/lib/DtMmdb/dti_excs/terminate.C +++ b/cde/lib/DtMmdb/dti_excs/terminate.C @@ -63,11 +63,4 @@ terminate() abort(); } #else - -#ifdef hpux -// HPUX doesn't define the set_terminate function from the ARM. -typedef void (*PFV)(); -PFV set_terminate (PFV) { return (0); } -#endif - #endif /* NATIVE_EXCEPTIONS */ diff --git a/cde/lib/DtMmdb/misc/unique_id.c b/cde/lib/DtMmdb/misc/unique_id.c index 9447afac0..3f34eb576 100644 --- a/cde/lib/DtMmdb/misc/unique_id.c +++ b/cde/lib/DtMmdb/misc/unique_id.c @@ -97,22 +97,7 @@ static unsigned int mask[] = (bits & (1L << (sizeof(BITS) * 8)-1)) ? putchar('1') : putchar('0'); } \ putchar ('\n'); } -#if defined(hpux) -#include -static unsigned int -gethostid() -{ - struct utsname u; - int i; - - i=uname(&u); - if (i==-1) - abort(); - if (u.idnumber[0]) - return atoi(u.idnumber); - abort(); -} -#elif defined(SVR4) && !defined(sun) +#if defined(SVR4) && !defined(sun) static unsigned int gethostid() { diff --git a/cde/lib/DtMmdb/misc/unique_id.h b/cde/lib/DtMmdb/misc/unique_id.h index 185a1a095..ad06f7c7f 100644 --- a/cde/lib/DtMmdb/misc/unique_id.h +++ b/cde/lib/DtMmdb/misc/unique_id.h @@ -29,7 +29,7 @@ extern "C" { #endif -#if defined( __STDC__ ) || defined( _HPUX_SOURCE ) +#if defined( __STDC__ ) const char *unique_id(void); #else char *unique_id(); diff --git a/cde/lib/DtMmdb/oliasdb/c_api.C b/cde/lib/DtMmdb/oliasdb/c_api.C index e77d6df1f..61ed62e14 100644 --- a/cde/lib/DtMmdb/oliasdb/c_api.C +++ b/cde/lib/DtMmdb/oliasdb/c_api.C @@ -25,15 +25,6 @@ #include "oliasdb/DtMmdb.h" #include -#if ( ARCH == hpux) -extern "C" -char __pure_virtual_called() -{ - return 0; -} -#endif - - #ifdef DEBUG extern "C" diff --git a/cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C b/cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C index 12d415851..8f007f024 100644 --- a/cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C +++ b/cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C @@ -28,22 +28,13 @@ extern "C" { -#if defined(hpux) -char __pure_virtual_called() -{ - fprintf(stderr, "DtMmdb: pure virtual called\n"); - exit (-1); - return 0; -} -#else #if defined(SVR4) && defined(SC3) void _pure_error_() { fprintf(stderr, "DtMmdb: pure virtual called\n"); exit (-1); } -#else -#ifdef _AIX +#elif _AIX void __PureVirtualCalled() { fprintf(stderr, "DtMmdb: pure virtual called\n"); @@ -57,8 +48,6 @@ void __pure_virtual_called() exit (-1); } -#endif -#endif #endif } diff --git a/cde/lib/DtMmdb/schema/desc.h b/cde/lib/DtMmdb/schema/desc.h index 7c0c71335..a2c2b5f19 100644 --- a/cde/lib/DtMmdb/schema/desc.h +++ b/cde/lib/DtMmdb/schema/desc.h @@ -59,7 +59,7 @@ #define desc_print3(s, n, x) s << " " << n << "=" << (x) << ":\\" << endl #define desc_print_end3(s, n, x) s << " " << n << "=" << (x) << endl -#if !defined ( __STDC__) && !defined (hpux) +#if !defined ( __STDC__) #define desc_print(s, x) s << " " << "x" << "=" << (x) << ":\\\n" #define desc_print_end(s, x) s << " " << "x" << "=" << (x) << "\n" #else diff --git a/cde/lib/DtMmdb/utility/debug.h b/cde/lib/DtMmdb/utility/debug.h index 1bbc98c85..d4401331a 100644 --- a/cde/lib/DtMmdb/utility/debug.h +++ b/cde/lib/DtMmdb/utility/debug.h @@ -48,7 +48,7 @@ #ifdef DEBUG -#if !defined ( __STDC__) && !defined (hpux) +#if !defined ( __STDC__) #define debug(s, x) s << "x" << " = " << (x) << "\n" #else #define debug(s, x) s << #x << " = " << (x) << "\n" diff --git a/cde/lib/DtMmdb/utility/filebuf.C b/cde/lib/DtMmdb/utility/filebuf.C index a0395d7fa..aedc8fee0 100644 --- a/cde/lib/DtMmdb/utility/filebuf.C +++ b/cde/lib/DtMmdb/utility/filebuf.C @@ -26,7 +26,7 @@ #include #include -#if !defined(hpux) && !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun) +#if !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun) #include #endif diff --git a/cde/lib/DtMmdb/utility/funcs.C b/cde/lib/DtMmdb/utility/funcs.C index 44f1eb68d..0f78ee330 100644 --- a/cde/lib/DtMmdb/utility/funcs.C +++ b/cde/lib/DtMmdb/utility/funcs.C @@ -741,7 +741,7 @@ Boolean cc_is_digit(istream& in) unsigned long disk_space(const char* path) { -#if defined (hpux) || defined (SVR4) || defined(CSRG_BASED) +#if defined (SVR4) || defined(CSRG_BASED) struct statvfs statfs_buf; #else struct statfs statfs_buf; @@ -749,7 +749,7 @@ unsigned long disk_space(const char* path) long free_bytes; -#if defined (hpux) || defined (SVR4) || defined(CSRG_BASED) +#if defined (SVR4) || defined(CSRG_BASED) if ( statvfs(path, &statfs_buf) == 0 ) { free_bytes = statfs_buf.f_bavail * statfs_buf.f_frsize ; #else diff --git a/cde/lib/DtMmdb/utility/funcs.h b/cde/lib/DtMmdb/utility/funcs.h index 9efeecef1..abf9b00d5 100644 --- a/cde/lib/DtMmdb/utility/funcs.h +++ b/cde/lib/DtMmdb/utility/funcs.h @@ -55,8 +55,7 @@ #if !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun) #include #endif -#if defined(hpux) || defined(sgi) || \ - defined(__linux__) || defined(CSRG_BASED) || defined(sun) +#if defined(__linux__) || defined(CSRG_BASED) || defined(sun) #include #else #include diff --git a/cde/lib/DtMrm/DtMrm.c b/cde/lib/DtMrm/DtMrm.c index a642a8dc7..acde8b8f9 100644 --- a/cde/lib/DtMrm/DtMrm.c +++ b/cde/lib/DtMrm/DtMrm.c @@ -85,10 +85,6 @@ static char rcsid[] = "$TOG: DtMrm.c /main/4 1999/10/14 13:35:44 mgreess $" * INCLUDE FILES * */ -#if defined(__hpux) -#include -#endif - #include #include #include diff --git a/cde/lib/DtSearch/libDtSearch.elist b/cde/lib/DtSearch/libDtSearch.elist index 9e4176fcd..306b623fb 100644 --- a/cde/lib/DtSearch/libDtSearch.elist +++ b/cde/lib/DtSearch/libDtSearch.elist @@ -416,10 +416,6 @@ internal yylex internal yynerrs internal yyparse -#if defined(hpux) -internal yymaxdepth -#endif - #if defined(sun) internal yy_yys internal yy_yyv diff --git a/cde/lib/DtSvc/DtEncap/pty.c b/cde/lib/DtSvc/DtEncap/pty.c index a26d3db0d..d580ea1af 100644 --- a/cde/lib/DtSvc/DtEncap/pty.c +++ b/cde/lib/DtSvc/DtEncap/pty.c @@ -35,14 +35,6 @@ #define __need_fd_set -#if defined(hpux) || defined(_hpux) || defined(__hpux) || defined(hp) -#define __hpux_pty -#endif - -#ifdef __hpux_pty -#define __need_timeval /* need struct timeval */ -#endif - #include /* NOTE: sbport.h must be the first include. */ #include #include @@ -56,11 +48,6 @@ #include #endif -#ifdef __hpux_pty -#include -#include -#endif - #ifdef __bsd #include #include @@ -165,28 +152,6 @@ pty_channel_clasp pty_channel_class = &pty_channel_class_struct; /* Local variable */ static XeChar *hexdigits = "0123456789abcdef"; -#ifdef __hpux_pty -/*----------------------------------------------------------------------+*/ -static SPC_Disable_Trapping(int fd) -/*----------------------------------------------------------------------+*/ -{ - int flag=0; - int disable=0; - struct request_info req_info; - - /* Disable trapping */ - ioctl(fd, TIOCTRAP, &disable); - - /* Just in case, flush any queued requests */ - - while((ioctl(fd, TIOCTRAPSTATUS, &flag) != ERROR) && flag) { - ioctl(fd, TIOCREQGET, &req_info); - ioctl(fd, TIOCREQSET, &req_info); - } - return(TRUE); -} -#endif /* __hpux_pty */ - /* * Routines for opening pty master/slave devices */ @@ -384,14 +349,6 @@ int master_pty(int fd, struct termios *state) if (fd < 0) return(TRUE); -#ifdef __hpux_pty - /* Enable trapping of ioctl/open/close (we care about close()) */ - if(ioctl(fd, TIOCTRAP, &enable)==ERROR) { - SPC_Error(SPC_Bad_Ioctl); - return(SPC_ERROR); - } -#endif /* __hpux_pty */ - set_pty_state(fd, state); @@ -510,91 +467,6 @@ int read_pty_channel_object(SPC_Channel_Ptr channel, XeString buffer, int nbytes) /*----------------------------------------------------------------------+*/ -#ifdef __hpux_pty -{ - - int result, select_value; - struct fd_set read_mask, except_mask; - int fd=channel->file_descs[connector]; - struct request_info req_info; - struct timeval timeout, *timeptr; - int i; - - call_parent_method(channel, - read, - (channel, connector, buffer, nbytes), - result); - - if(result==SPC_ERROR) - return(SPC_ERROR); - - if(!IS_SPCIO_DATA(channel->wires[connector]->flags)) - return(0); - - FD_ZERO(&read_mask); - FD_ZERO(&except_mask); - - FD_SET(fd, &read_mask); - FD_SET(fd, &except_mask); - - if(channel->close_timeout) { - timeout.tv_sec=channel->close_timeout; - timeout.tv_usec=0; - timeptr = (&timeout); - } else - timeptr=NULL; - - do - select_value=select(fd+1, &read_mask, NULL, &except_mask, timeptr); - while(select_value==ERROR && errno==EINTR); - - if(select_value==ERROR) { - SPC_Error(SPC_Bad_Select); - return(SPC_ERROR); - } - - /* If there is anything to read, read it & return */ - IS_FD_SET(&read_mask, result); - if(result) { - do { - result = read(fd, buffer, nbytes); - } while (result<0 && errno == EINTR); - if(result==ERROR) { - SPC_Error(SPC_Reading); - return(SPC_ERROR); - } - return(result); - } - - /* Nothing to read. We either timed out or got an exception. */ - - if(select_value != 0) { - - /* We got an exception */ - ioctl(fd, TIOCREQGET, &req_info); - - /* Clear the request (Not really necessary in the case of a close, - but do it anyway) */ - - ioctl(fd, TIOCREQSET, &req_info); - } - - if((select_value == 0) || (req_info.request == TIOCCLOSE)) { - - /* Close, disable trapping on this fd & return EOF. We regard - a timeout as being the same as a close. */ - - SPC_Disable_Trapping(fd); - SPC_Change_State(channel, connector, 0, -1); - return(0); - - } else - - /* Otherwise (open or IOCTL), return -1 */ - - return(EXCEPT_FLAG); -} -#else /* not __hpux_pty */ { int result; int fd=channel->file_descs[connector]; @@ -648,7 +520,6 @@ int read_pty_channel_object(SPC_Channel_Ptr channel, return(result); } -#endif /* __hpux_pty */ /*----------------------------------------------------------------------+*/ int pre_fork_pty_channel_object(SPC_Channel_Ptr channel) @@ -671,38 +542,14 @@ int pre_fork_pty_channel_object(SPC_Channel_Ptr channel) result=SPC_ERROR; } -#ifndef __hpux_pty if(pipe(channel->sync_pipe) < 0) { SPC_Error(SPC_No_Pipe); return(SPC_ERROR); } -#endif /* __hpux_pty */ return(result); } -#ifdef __hpux_pty -/*----------------------------------------------------------------------+*/ -/* clear_trap */ -/*----------------------------------------------------------------------+*/ - -/* I am not particularly enamored of this macro. However, the style of - the SCANBITS macro kinda forces me to write it this way. In particular, - I am a bit worried about the reference to except_mask, which is a - "nonlocal reference" */ - -#define clear_trap(fd) {struct request_info req_info; \ - int my_fd=(fd); \ - ioctl(my_fd, TIOCREQGET, &req_info); \ - if(req_info.request != TIOCOPEN) { \ - SPC_Error(SPC_Bad_Ioctl); \ - return(SPC_ERROR); \ - } \ - ioctl(my_fd, TIOCREQSET, &req_info); \ - FD_CLR(my_fd, &except_mask); \ - } -#endif /* __hpux_pty */ - /*----------------------------------------------------------------------+*/ int post_fork_pty_channel_object(SPC_Channel_Ptr channel, int parentp) @@ -714,9 +561,6 @@ int post_fork_pty_channel_object(SPC_Channel_Ptr channel, int iomode=channel->IOMode; int fd=channel->file_descs[STDIN]; int stdinfd, stdoutfd, stderrfd; -#ifdef __hpux_pty - struct fd_set except_mask, temp_mask; -#endif int pid; char c; @@ -726,40 +570,12 @@ int post_fork_pty_channel_object(SPC_Channel_Ptr channel, return(SPC_ERROR); if (parentp) { /* Master process */ -#ifdef __hpux_pty - { int i; - int select_value; - - stdinfd = channel->wires[STDIN]->fd[MASTER_SIDE]; - stdoutfd = channel->wires[STDOUT]->fd[MASTER_SIDE]; - stderrfd = channel->wires[STDERR]->fd[MASTER_SIDE]; - - FD_ZERO(&except_mask); - - if(stdinfd >= 0) - FD_SET(stdinfd, &except_mask); - if(stdoutfd >= 0) - FD_SET(stdoutfd, &except_mask); - if(stderrfd >= 0) - FD_SET(stderrfd, &except_mask); - - IS_FD_SET(&except_mask, result); - while (result) { - temp_mask = except_mask; - select_value=select(max_fds, NULL, NULL, &temp_mask, NULL); - SCANBITS(&temp_mask, clear_trap); - IS_FD_SET(&except_mask, result); - } - } -#else /* not __hpux_pty */ close(channel->sync_pipe[WRITE_SIDE]); read(channel->sync_pipe[READ_SIDE], &c, 1); close(channel->sync_pipe[READ_SIDE]); channel->sync_pipe[READ_SIDE] = -1; channel->sync_pipe[WRITE_SIDE] = -1; XeSPCAddInput(channel, NULL, NULL); -#endif /* __hpux_pty */ - } else { /* Slave process */ /* Open the slave pty. Do it up to three times to set up @@ -811,14 +627,12 @@ int post_fork_pty_channel_object(SPC_Channel_Ptr channel, stderrfd=stdoutfd; } -#ifndef __hpux_pty /* The pty trapping stuff handles EOF for us. Use the "sync" pipe */ /* to inform the other side when we don't have that code. */ c=040; write(channel->sync_pipe[WRITE_SIDE], &c, 1); close(channel->sync_pipe[READ_SIDE]); close(channel->sync_pipe[WRITE_SIDE]); -#endif /* __hpux_pty */ /* Duplicate these file descriptors to 3, 4, 5 so we don't have to worry about any of std[in|out|err]fd being 0, 1, or 2. */ @@ -863,15 +677,6 @@ int reset_pty_channel_object(SPC_Channel_Ptr channel) for(wirelist=channel->wire_list; wirelist; wirelist=wirelist->next) { -#ifdef __hpux_pty - { - int fd=wirelist->fd[MASTER_SIDE]; - /* Disable trapping of ioctl/open/close */ - if(SPC_Disable_Trapping(fd) == SPC_ERROR) - result=SPC_ERROR; - } -#endif /* __hpux_pty */ - wirelist->flags &= ~SPCIO_DATA; } @@ -925,13 +730,6 @@ int add_input_pty_channel_object(SPC_Channel_Ptr channel, fd, channel->class_ptr->input, SPC_Input); -#ifdef __hpux_pty - SPC_XtAddInput(channel, - &wirelist->except_toolkit_id, - fd, - channel->class_ptr->input, - SPC_Exception); -#endif /* __hpux_pty */ } return(TRUE); diff --git a/cde/lib/DtSvc/DtEncap/spc-exec.c b/cde/lib/DtSvc/DtEncap/spc-exec.c index 7afcb0522..eb49d8e4d 100644 --- a/cde/lib/DtSvc/DtEncap/spc-exec.c +++ b/cde/lib/DtSvc/DtEncap/spc-exec.c @@ -603,11 +603,7 @@ int exec_proc_local_channel_object(SPC_Channel_Ptr channel) if(result!=SPC_ERROR) { /* Execute */ /* Compiler barfs without cast ? */ -#if defined(__hpux_8_0) || defined(__aix) - result=execvp(channel->path, channel->argv); -#else result=execvp(channel->path, channel->argv); -#endif /* If we return from exec, it failed */ SPC_Error(SPC_Cannot_Exec, channel->path); } diff --git a/cde/lib/DtSvc/DtEncap/usersig.c b/cde/lib/DtSvc/DtEncap/usersig.c index c5e2ab957..ff95c7ab5 100644 --- a/cde/lib/DtSvc/DtEncap/usersig.c +++ b/cde/lib/DtSvc/DtEncap/usersig.c @@ -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 */ + Xe_addsig((XeString)"SIGIO", SIGIO); /* sun */ # else # ifdef SIGPOLL - Xe_addsig((XeString)"SIGIO", SIGPOLL); /* hpux sun */ + Xe_addsig((XeString)"SIGIO", SIGPOLL); /* sun */ # endif # endif # ifdef SIGPOLL - Xe_addsig((XeString)"SIGPOLL", SIGPOLL); /* hpux sun */ + Xe_addsig((XeString)"SIGPOLL", SIGPOLL); /* sun */ # else # ifdef SIGIO - Xe_addsig((XeString)"SIGPOLL", SIGIO); /* hpux sun */ + Xe_addsig((XeString)"SIGPOLL", SIGIO); /* sun */ # endif # endif # ifdef SIGEMT - Xe_addsig((XeString)"SIGEMT", SIGEMT); /* hpux sun */ + Xe_addsig((XeString)"SIGEMT", SIGEMT); /* sun */ # endif # ifdef SIGBUS - Xe_addsig((XeString)"SIGBUS", SIGBUS); /* hpux sun */ + Xe_addsig((XeString)"SIGBUS", SIGBUS); /* sun */ # endif # ifdef SIGIOT - Xe_addsig((XeString)"SIGIOT", SIGIOT); /* hpux sun */ + Xe_addsig((XeString)"SIGIOT", SIGIOT); /* sun */ # endif # ifdef SIGURG - Xe_addsig((XeString)"SIGURG", SIGURG); /* hpux sun */ + Xe_addsig((XeString)"SIGURG", SIGURG); /* sun */ # endif # ifdef SIGSYS - Xe_addsig((XeString)"SIGSYS", SIGSYS); /* hpux sun */ + Xe_addsig((XeString)"SIGSYS", SIGSYS); /* sun */ # endif # ifdef SIGTRAP - Xe_addsig((XeString)"SIGTRAP", SIGTRAP); /* hpux sun */ + Xe_addsig((XeString)"SIGTRAP", SIGTRAP); /* sun */ # endif # ifdef SIGPROF - Xe_addsig((XeString)"SIGPROF", SIGPROF); /* hpux sun */ + Xe_addsig((XeString)"SIGPROF", SIGPROF); /* sun */ # endif # ifdef SIGCLD - Xe_addsig((XeString)"SIGCLD", SIGCLD); /* hpux sun */ + Xe_addsig((XeString)"SIGCLD", SIGCLD); /* sun */ # endif # ifdef SIGVTALRM - Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM); /* hpux sun */ + Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM); /* sun */ # endif # ifdef SIGWINCH @@ -204,56 +204,56 @@ 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 */ +# ifdef SIGIO /* sun */ /* (SIGPOLL, SIGTINT are aliases) */ case SIGIO: return (XeString)"SIGIO"; # endif -# ifdef SIGPOLL /* hpux sun */ +# ifdef SIGPOLL /* sun */ /* ----> Duplicated by SIGIO above case SIGPOLL: return (XeString)"SIGPOLL"; */ # endif -# ifdef SIGEMT /* hpux sun */ +# ifdef SIGEMT /* sun */ case SIGEMT: return (XeString)"SIGEMT"; # endif -# ifdef SIGBUS /* hpux sun */ +# ifdef SIGBUS /* sun */ case SIGBUS: return (XeString)"SIGBUS"; # endif -# ifdef SIGIOT /* hpux sun */ +# ifdef SIGIOT /* sun */ /* ----> Duplicated by SIGABRT above case SIGIOT: return (XeString)"SIGIOT"; */ # endif -# ifdef SIGURG /* hpux sun */ +# ifdef SIGURG /* sun */ case SIGURG: return (XeString)"SIGURG"; # endif -# ifdef SIGSYS /* hpux sun */ +# ifdef SIGSYS /* sun */ case SIGSYS: return (XeString)"SIGSYS"; # endif -# ifdef SIGTRAP /* hpux sun */ +# ifdef SIGTRAP /* sun */ case SIGTRAP: return (XeString)"SIGTRAP"; # endif -# ifdef SIGPROF /* hpux sun */ +# ifdef SIGPROF /* sun */ case SIGPROF: return (XeString)"SIGPROF"; # endif -# ifdef SIGCLD /* hpux sun */ +# ifdef SIGCLD /* sun */ /* ----> Duplicated by SIGCHLD above case SIGCLD: return (XeString)"SIGCLD"; */ # endif -# ifdef SIGVTALRM /* hpux sun */ +# ifdef SIGVTALRM /* sun */ case SIGVTALRM: return (XeString)"SIGVTALRM"; # endif diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c index 67dfd9dac..61f2069d6 100644 --- a/cde/lib/DtSvc/DtUtil1/CmdMain.c +++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c @@ -73,14 +73,6 @@ */ #define COMMAND_CHECK_FAILURE 1 -#ifdef __hpux -#ifdef hpV4 -#define INETD_SECURITY_FILE "/var/adm/inetd.sec" -#else /* hpV4 */ -#define INETD_SECURITY_FILE "/usr/adm/inetd.sec" -#endif /* hpV4 */ -#endif /* __hpux */ - #define Cmd_FreeAllocatedStringVector(sv) \ _DtCmdFreeStringVector(sv);\ XtFree((char *)sv); @@ -337,24 +329,11 @@ _DtSPCOpen( SPC_BUFSIZ); break; case SPC_Connection_EOF: -#ifdef __hpux - (void) sprintf (errorMessage, - errorInetSecurity, - hostname, - _cmdClientHost, - SPC_SERVICE, - _cmdClientHost, - SPC_SERVICE, - INETD_SECURITY_FILE, - hostname); - -#else /* __hpux */ (void) sprintf (errorMessage, errorBadConnect, hostname, SPC_SERVICE, _cmdClientHost); -#endif /* __hpux */ break; default: /* diff --git a/cde/lib/DtSvc/DtUtil1/CmdProcess.c b/cde/lib/DtSvc/DtUtil1/CmdProcess.c index ecb66a780..1a70a78d8 100644 --- a/cde/lib/DtSvc/DtUtil1/CmdProcess.c +++ b/cde/lib/DtSvc/DtUtil1/CmdProcess.c @@ -45,10 +45,6 @@ #include #endif -#if defined(__hpux) -#include -#endif - #include #include #include diff --git a/cde/lib/DtSvc/DtUtil1/DbLoad.c b/cde/lib/DtSvc/DtUtil1/DbLoad.c index 07caa4ee7..9fb8275f7 100644 --- a/cde/lib/DtSvc/DtUtil1/DbLoad.c +++ b/cde/lib/DtSvc/DtUtil1/DbLoad.c @@ -49,18 +49,12 @@ #include #include -#ifdef __hpux -#include -#else - #if defined(sun) || defined(CSRG_BASED) #include #else #include #endif /* sun || CSRD_BASED */ -#endif /* __hpux */ - #include #include diff --git a/cde/lib/DtSvc/DtUtil1/Dts.c b/cde/lib/DtSvc/DtUtil1/Dts.c index 0e29ba405..5cb2c5271 100644 --- a/cde/lib/DtSvc/DtUtil1/Dts.c +++ b/cde/lib/DtSvc/DtUtil1/Dts.c @@ -54,12 +54,7 @@ #include #include #include -#if defined (__hpux) -/* - * On HP MAXINT is defined in both and - */ -#undef MAXINT -#elif defined(CSRG_BASED) +#if defined(CSRG_BASED) #define MAXINT INT_MAX #else #include diff --git a/cde/lib/DtSvc/DtUtil1/DtsInit.c b/cde/lib/DtSvc/DtUtil1/DtsInit.c index 0e385e274..1d92a0bde 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsInit.c +++ b/cde/lib/DtSvc/DtUtil1/DtsInit.c @@ -47,18 +47,12 @@ #include #include -#ifdef __hpux -#include -#else - #if defined(sun) || defined(CSRG_BASED) #include #else #include #endif /* sun || CSRG_BASED */ -#endif /* __hpux */ - #include #include diff --git a/cde/lib/DtSvc/DtUtil2/FileUtil.c b/cde/lib/DtSvc/DtUtil2/FileUtil.c index d3e799ccd..32ba894a9 100644 --- a/cde/lib/DtSvc/DtUtil2/FileUtil.c +++ b/cde/lib/DtSvc/DtUtil2/FileUtil.c @@ -37,15 +37,11 @@ #include /* MAXPATHLEN */ #include /* errno(2) */ -#ifdef __hpux -#include /* opendir(), directory(3C) */ -#else #if defined(sun) || defined(CSRG_BASED) #include /* opendir(), directory(3C) */ #else #include #endif /* sun || CSRG_BASED */ -#endif /* __hpux */ #include #include /* Xt stuff */ diff --git a/cde/lib/DtSvc/DtUtil2/MsgCat.c b/cde/lib/DtSvc/DtUtil2/MsgCat.c index f34b8020b..99afa3497 100644 --- a/cde/lib/DtSvc/DtUtil2/MsgCat.c +++ b/cde/lib/DtSvc/DtUtil2/MsgCat.c @@ -44,116 +44,10 @@ #else #include #include -#endif /* NO_XLIB */ +#endif #include
-#if defined(hpV4) && !defined(NO_XLIB) -typedef struct _dt_msg_cache -{ - char ***cached_msgs; - int nmsgs_per_set; - int nsets; - - nl_catd catd; - struct _dt_msg_cache *next; -} _DtMsgCache; - -static _DtMsgCache *catalog_message_caches = NULL; - -static _DtMsgCache *get_msg_cache(nl_catd catd) -{ - const int initial_nmsgs_per_set = 300; - const int initial_nsets = 50; - - _DtMsgCache *c; - - for (c=catalog_message_caches; NULL!=c; c=c->next) - if (catd == c->catd) return c; - - c = (_DtMsgCache*) XtMalloc(sizeof(_DtMsgCache)); - c->cached_msgs = NULL; - c->nmsgs_per_set = initial_nmsgs_per_set; - c->nsets = initial_nsets; - c->catd = catd; - c->next = catalog_message_caches; - catalog_message_caches = c; - return c; -} - -/* - * Wrapper around catgets -- this makes sure the message string is saved - * in a safe location; so repeated calls to catgets() do not overwrite - * the catgets() internal buffer. This has been a problem on HP systems. - */ -char *_DtCatgetsCached(nl_catd catd, int set, int num, const char *dflt) -{ - char *message = NULL; - _DtMsgCache *c; - char **setptr; - int i, multiplier; - int size; - - /* convert to a zero based index */ - int setIdx = set - 1; - int numIdx = num - 1; - - c = get_msg_cache(catd); - if (NULL == c) - { - message = catgets(catd, set, num, dflt); - return message; - } - - if (NULL == c->cached_msgs) - { - size = sizeof(char**) * c->nsets; - c->cached_msgs = (char***) XtMalloc(size); - memset((char*) c->cached_msgs, 0, size); - } - else if (setIdx >= c->nsets) - { - for (multiplier=2; setIdx > multiplier*c->nsets; multiplier++) {} - size = sizeof(char**) * c->nsets; - c->cached_msgs = - (char***) XtRealloc((char*) c->cached_msgs, multiplier*size); - memset((char*) (c->cached_msgs + size), 0, multiplier*size); - c->nsets *= multiplier; - } - - if (NULL == c->cached_msgs[setIdx]) - { - size = sizeof(char*) * c->nmsgs_per_set; - c->cached_msgs[setIdx] = (char**) XtMalloc(size); - memset((char*) c->cached_msgs[setIdx], 0, size); - } - else if (numIdx >= c->nmsgs_per_set) - { - for (multiplier=2; numIdx > multiplier*c->nsets; multiplier++) {} - size = sizeof(char*) * c->nmsgs_per_set; - - for (i=0; inmsgs_per_set; i++) - { - if (NULL != c->cached_msgs[i]) - { - c->cached_msgs[i] = - (char**) XtRealloc((char*)c->cached_msgs[i], multiplier*size); - memset((char*) (c->cached_msgs[i] + size), 0, multiplier*size); - } - } - c->nmsgs_per_set *= multiplier; - } - - setptr = c->cached_msgs[setIdx]; - if (NULL == setptr[numIdx]) - setptr[numIdx] = strdup(catgets(catd, set, num, dflt)); - - message = setptr[numIdx]; - - return message; -} -#endif /* hpV4 */ - int _DtCatclose(nl_catd catd) { return (catd == (nl_catd) -1) ? 0 : catclose(catd); @@ -169,11 +63,7 @@ char *_DtCatgets(nl_catd catd, int set, int num, const char *dflt) } else { /* Per POSIX, we cannot assume catgets() is thread-safe. */ _DtSvcProcessLock(); -#if defined(hpV4) && !defined(NO_XLIB) - msg = _DtCatgetsCached(catd, set, num, dflt); -#else msg = catgets(catd, set, num, dflt); -#endif /* hpV4 */ _DtSvcProcessUnlock(); } diff --git a/cde/lib/DtSvc/DtUtil2/Utility.c b/cde/lib/DtSvc/DtUtil2/Utility.c index af2db9454..30cb63555 100644 --- a/cde/lib/DtSvc/DtUtil2/Utility.c +++ b/cde/lib/DtSvc/DtUtil2/Utility.c @@ -35,15 +35,11 @@ #include #include -#ifdef __hpux -#include -#else #if defined(sun) || defined(CSRG_BASED) #include #else #include #endif -#endif #include #ifdef NLS16 diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h index 78a8ddc2b..f69fb54e1 100644 --- a/cde/lib/DtSvc/include/codelibs/stringx.h +++ b/cde/lib/DtSvc/include/codelibs/stringx.h @@ -124,11 +124,11 @@ inline void strfree(const char *s) { if (s != NULL) free((char *)s); } #else inline void strfree(const char *s) -#if defined(__hpux) || defined(CSRG_BASED) +#if defined(CSRG_BASED) { if (s != NULL) free((void *)s); } #else { if (s != NULL) free((void *)s); } -#endif /* __hpux */ +#endif /* bsd */ #endif #if defined(bsd) inline char *strdup(const char *s) diff --git a/cde/lib/DtSvc/libDtSvc.elist b/cde/lib/DtSvc/libDtSvc.elist index 719f3e7c8..3b2f7069d 100644 --- a/cde/lib/DtSvc/libDtSvc.elist +++ b/cde/lib/DtSvc/libDtSvc.elist @@ -1106,10 +1106,7 @@ internalC++ xalloc::xalloc(const char*,unsigned int) #endif /* This symbol does not get mangled consistently across platforms. -#ifdef hpV4 -internalC++ shellscan_C_000046c7_parsemeta_:__std -internal __link__std__shellscan_C_000046c7_parsemeta_ -#elif defined(sun) +#if defined(sun) internalC++ shellscan_C:__std #elif defined(_AIX) internalC++ __sterm80000000_x_2fproj_2fcde_2flib_2fDtSvc_2fDtCodelibs_2fshellscan_2eC() diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c index 9750ecca6..7649ce84c 100644 --- a/cde/lib/DtTerm/Term/TermParse.c +++ b/cde/lib/DtTerm/Term/TermParse.c @@ -49,12 +49,6 @@ #include "TermPrimUtil.h" #include "TermPrimParseTable.h" -#if defined (__hpux) -/* - * On HP MAXINT is defined in both and - */ -#undef MAXINT -#endif #if defined(CSRG_BASED) #define MAXSHORT SHRT_MAX #else diff --git a/cde/lib/DtTerm/TermPrim/TermPrim.c b/cde/lib/DtTerm/TermPrim/TermPrim.c index 3688e4623..159d73424 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrim.c +++ b/cde/lib/DtTerm/TermPrim/TermPrim.c @@ -75,7 +75,7 @@ extern char * _DtTermPrimGetMessage( char *filename, int set, int n, char *s ); #include #include
#include -#if defined(__linux__) || defined(hpV4) +#if defined(__linux__) # include /* For FD_* macros. */ # include /* For select() prototype. */ #else @@ -246,21 +246,12 @@ static XtResource resources[] = XtOffsetOf(struct _DtTermPrimitiveRec, term.columns), XmRImmediate, (XtPointer) defaultColumns }, -#ifdef HPVUE - { - DtNbackgroundIsSelect, DtCBackgroundIsSelect, XmRBoolean, - sizeof(Boolean), - XtOffsetOf(struct _DtTermPrimitiveRec, term.backgroundIsSelect), - XtRImmediate, (XtPointer) True - }, -#else /* HPVUE */ { DtNbackgroundIsSelect, DtCBackgroundIsSelect, XmRBoolean, sizeof(Boolean), XtOffsetOf(struct _DtTermPrimitiveRec, term.backgroundIsSelect), XtRImmediate, (XtPointer) False }, -#endif /* HPVUE */ { XmNtraversalOn, XmCTraversalOn, XmRBoolean, sizeof(Boolean), XtOffsetOf(struct _DtTermPrimitiveRec, primitive.traversal_on), diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c index 0beb1d190..bd9ef8f41 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c @@ -172,7 +172,7 @@ static struct _pty_dirs { {PTY_null, PTY_null, PTY_null, PTY_null, PTY_null, False}, }; -#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) +#if defined(CSRG_BASED) /* Use openpty() to open Master/Slave pseudo-terminal pair */ /* Current version of openpty() uses non-STREAM device. BSD name space */ #define TTYNAMELEN 25 @@ -273,25 +273,8 @@ GetPty(char **ptySlave, char **ptyMaster) * This allows us to access the pty when we * are no longer suid root... */ -#ifdef HP_ARCHITECTURE - { - struct group *grp; - gid_t gid; - _Xgetgrparams grp_buf; - - if (grp = _XGetgrnam("tty", grp_buf)) { - gid = grp->gr_gid; - } else { - gid = 0; - } - (void) endgrent(); - (void) chown(ttyDev, getuid(), gid); - (void) chmod(ttyDev, 0620); - } -#else /* HP_ARCHITECTURE */ (void) chown(ttyDev, getuid(), getgid()); (void) chmod(ttyDev, 0622); -#endif /* HP_ARCHITECTURE */ /* close off the pty slave... */ (void) close(ttyFd); @@ -336,7 +319,7 @@ GetPty(char **ptySlave, char **ptyMaster) return(-1); } -#endif /* ALPHA_ARCHITECTURE */ +#endif /* BSD */ /* this is a public wrapper around the previous function that runs the * previous function setuid root... @@ -358,45 +341,8 @@ _DtTermPrimGetPty(char **ptySlave, char **ptyMaster) static int SetupPty(char *ptySlave, int ptyFd) { -#ifdef HP_ARCHITECTURE - { - struct group *grp; - gid_t gid; - _Xgetgrparams grp_buf; - - if (grp = _XGetgrnam("tty", grp_buf)) { - gid = grp->gr_gid; - } else { - gid = 0; - } - (void) endgrent(); - (void) chown(ptySlave, getuid(), gid); - (void) chmod(ptySlave, 0620); - } -#else /* HP_ARCHITECTURE */ -#ifdef ALPHA_ARCHITECTURE - /* code from xterm to setup ownership and permission */ - { - struct group *ttygrp; - _Xgetgrparams grp_buf; - - if (ttygrp = _XGetgrnam("tty", grp_buf)) { - /* change ownership of tty to real uid, "tty" gid */ - chown (ptySlave, getuid(), ttygrp->gr_gid); - chmod (ptySlave, 0620); - } - else { - /* change ownership of tty to real group and user id */ - chown (ptySlave, getuid(), getgid()); - chmod (ptySlave, 0622); - } - endgrent(); - } -#else /* ALPHA_ARCHITECTURE */ (void) chown(ptySlave, getuid(), getgid()); (void) chmod(ptySlave, 0622); -#endif /* ALPHA_ARCHITECTURE */ -#endif /* HP_ARCHITECTURE */ return 0; } diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c index d22bb8102..7409234ba 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c @@ -34,9 +34,6 @@ #include #include #include -#ifdef HP_ARCHITECTURE -# define X_INCLUDE_GRP_H -#endif /* HP_ARCHITECTURE */ #define X_INCLUDE_UNISTD_H #define XOS_USE_XT_LOCKING #include @@ -85,25 +82,8 @@ GetPty(char **ptySlave, char **ptyMaster) (void) close(ttyFd); /* fix the owner, mode, and group... */ -#ifdef HP_ARCHITECTURE - { - struct group *grp; - gid_t gid; - _Xgetgrparams grp_buf; - - if (grp = _XGetgrnam("tty", grp_buf)) { - gid = grp->gr_gid; - } else { - gid = 0; - } - (void) endgrent(); - (void) chown(*ptySlave, getuid(), gid); - (void) chmod(*ptySlave, 0620); - } -#else /* HP_ARCHITECTURE */ (void) chown(*ptySlave, getuid(), getgid()); (void) chmod(*ptySlave, 0622); -#endif /* HP_ARCHITECTURE */ /* pty master and slave names are already set. Return * the file descriptor... @@ -142,25 +122,8 @@ _DtTermPrimGetPty(char **ptySlave, char **ptyMaster) static int SetupPty(char *ptySlave, int ptyFd) { -#ifdef HP_ARCHITECTURE - { - struct group *grp; - gid_t gid; - _Xgetgrparams grp_buf; - - if (grp = _XGetgrnam("tty", grp_buf)) { - gid = grp->gr_gid; - } else { - gid = 0; - } - (void) endgrent(); - (void) chown(ptySlave, getuid(), gid); - (void) chmod(ptySlave, 0620); - } -#else /* HP_ARCHITECTURE */ (void) chown(ptySlave, getuid(), getgid()); (void) chmod(ptySlave, 0622); -#endif /* HP_ARCHITECTURE */ } int diff --git a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h index 3f9da45f1..d79c22f69 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h @@ -63,32 +63,6 @@ #ifndef _Dt_TermPrimOSDepI_h #define _Dt_TermPrimOSDepI_h -#ifdef ALPHA_ARCHITECTURE -# define USE_TIOCCONS /* use tioccons for -C */ -# define HAS_SETEUID /* seteuid available */ -# define HAS_SETREUID /* setreuid available */ -# define USE_PTYS /* use ptys */ -# define USE_TCSBRK /* use TCSBRK ioctl() */ -#endif /* ALPHA_ARCHITECTURE */ - -#ifdef HP_ARCHITECTURE -# define XOR_CAPS_LOCK /* xor caps lock and shift */ -# define USE_TIOCCONS /* use tioccons for -C */ -# define SETENV_LINES_AND_COLS /* set $LINES and $COLUMNS */ -# define HAS_SETRESUID /* setresuid available */ - -# if OSMAJORVERSION > 9 -# define USE_STREAMS /* use streams */ -# define USE_CSWIDTH /* use the csWidth resource to */ - /* initialize multi-byte processing */ - /* in ldterm */ -# define USE_TCSENDBREAK /* use tiocbreak() */ -# else /* OSMAJORVERSION > 9 */ -# define USE_PTYS /* use ptys */ -# define USE_TIOCBREAK /* use TIOCBREAK ioctl() */ -# endif /* OSMAJORVERSION > 9 */ -#endif /* HP_ARCHITECTURE */ - #ifdef LINUX_ARCHITECTURE # define USE_TIOCCONS /* use tioccons for -C */ # define HAS_SETEUID /* seteuid available */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParser.c b/cde/lib/DtTerm/TermPrim/TermPrimParser.c index 6a953ea0e..2eaa3ce29 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimParser.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimParser.c @@ -37,12 +37,6 @@ #include "TermPrimParserP.h" #include "TermPrimBuffer.h" -#if defined (__hpux) -/* - * On HP MAXINT is defined in both and - */ -#undef MAXINT -#endif #if defined(CSRG_BASED) #define MAXINT INT_MAX #else diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c index 154d28f3c..97b502046 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c @@ -36,19 +36,7 @@ #include "TermPrimDebug.h" #include -#ifdef ALPHA_ARCHITECTURE -#include -#include -#endif /* ALPHA_ARCHITECTURE */ #include -#ifdef USE_PTYS -#ifdef HP_ARCHITECTURE -#include -#endif /* HP_ARCHITECTURE */ -#endif /* USE_PTYS */ -#if defined(HP_ARCHITECTURE) && !(OSMAJORVERSION > 9) -#include -#endif /* defined(HP_ARCHITECTURE) && !(OSMAJORVERSION > 9) */ #if defined (USE_SETCSMAP) #include @@ -571,40 +559,7 @@ _DtTermPrimPtyInit TMODE (XTTYMODE_eof, tio.c_cc[VEOF]); TMODE (XTTYMODE_eol, tio.c_cc[VEOL]); -#if defined(HP_ARCHITECTURE) - TMODE (XTTYMODE_swtch, tio.c_cc[VSWTCH]); - TMODE (XTTYMODE_susp, tio.c_cc[VSUSP]); -#if OSMAJORVERSION > 9 - /* HP-UX 10.0 supports the new, extended c_cc[] array... - */ - TMODE (XTTYMODE_start, tio.c_cc[VSTART]); - TMODE (XTTYMODE_stop, tio.c_cc[VSTOP]); - TMODE (XTTYMODE_dsusp, tio.c_cc[VDSUSP]); -#ifdef NOTDEF - /* the following two parameters are not supported by - * HP-UX 10.0. - */ - TMODE (XTTYMODE_rprnt, tio.c_cc[VREPRINT]); - TMODE (XTTYMODE_flush, tio.c_cc[VDISCARD]); -#endif /* NOTDEF */ - TMODE (XTTYMODE_weras, tio.c_cc[VWERASE]); - TMODE (XTTYMODE_lnext, tio.c_cc[VLNEXT]); -#else /* OSMAJORVERSION > 9 */ - { - /* With HP-UX 9.0 (and earlier) we need to set dsuspc - * via the ltchars array. In addition, we have no support - * for rprnt, flush, weras, and lnext... - */ - struct ltchars ltc; - - if (!ioctl(pty, TIOCGLTC, <c)) { - TMODE (XTTYMODE_dsusp, ltc.t_dsuspc); - (void) ioctl(pty, TIOCSLTC, <c); - } - } -#endif /* OSMAJORVERSION > 9 */ - -#elif defined(IBM_ARCHITECTURE) +#if defined(IBM_ARCHITECTURE) TMODE (XTTYMODE_start, tio.c_cc[VSTRT]); TMODE (XTTYMODE_stop, tio.c_cc[VSTOP]); TMODE (XTTYMODE_susp, tio.c_cc[VSUSP]); @@ -625,15 +580,6 @@ _DtTermPrimPtyInit TMODE (XTTYMODE_weras, tio.c_cc[VWERASE]); TMODE (XTTYMODE_lnext, tio.c_cc[VLNEXT]); -#elif defined(ALPHA_ARCHITECTURE) - TMODE (XTTYMODE_start, tio.c_cc[VSTART]); - TMODE (XTTYMODE_stop, tio.c_cc[VSTOP]); - TMODE (XTTYMODE_susp, tio.c_cc[VSUSP]); - TMODE (XTTYMODE_dsusp, tio.c_cc[VDSUSP]); - TMODE (XTTYMODE_rprnt, tio.c_cc[VREPRINT]); - TMODE (XTTYMODE_flush, tio.c_cc[VDISCARD]); - TMODE (XTTYMODE_weras, tio.c_cc[VWERASE]); - TMODE (XTTYMODE_lnext, tio.c_cc[VLNEXT]); #endif } #undef TMODE diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c index 49e10bd54..32e576c4c 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c @@ -69,11 +69,6 @@ #define UT_NO_pututline #endif /* sun */ -#ifdef __hpux -#define UT_HOST ut_host -#define UT_ADDR ut_addr -#endif /* __hpux */ - #ifdef __AIX #define UT_HOST ut_host #define UT_NO_pututline @@ -362,24 +357,10 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine) if (NULL == (utPtr = getutline(&ut))) { /* build a base utmp entry... */ utPtr = &ut; -#ifdef __hpux - if (c = strstr(utmpLine, "tty")) { - c += strlen("tty"); - } else if (c = strstr(utmpLine, "pts")) { - c += strlen("pts"); - } else { - c = utmpLine; - if (strlen(utmpLine) > sizeof(utPtr->ut_id)) { - c += strlen(utmpLine) - sizeof(utPtr->ut_id); - } - } - (void) strncpy(utPtr->ut_id, c, sizeof(utPtr->ut_id)); -#else /* __hpux */ #if defined(__AIX) (void) strncpy(utPtr->ut_id, utmpLine, sizeof(utPtr->ut_id)); -#else /* __AIX */ -#if defined(__linux__) || defined(sun) +#elif defined(__linux__) || defined(sun) if (c = strchr(utmpLine, '/')) { c++; } else { @@ -389,8 +370,6 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine) #else /* linux || sun */ error out -- missing code for utPtr->ut_id #endif /* sun */ -#endif /* __AIX */ -#endif /* __hpux */ } /* set up the new entry... */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c index da6f2b824..a0c1df334 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c @@ -32,10 +32,10 @@ #include "TermHeader.h" #include -#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE) +#if defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE) /* For TIOCSTTY definitions */ #include -#endif /* ALPHA_ARCHITECTURE */ +#endif /* BSD || Linux */ #include #include @@ -301,11 +301,6 @@ _DtTermPrimSubprocExec(Widget w, _Xgetpwparams pw_buf; _Xgetloginparams login_buf; -#ifdef ALPHA_ARCHITECTURE - /* merge code from xterm, ignore so that TIOCSWINSZ doesn't block */ - signal(SIGTTOU, SIG_IGN); -#endif /* ALPHA_ARCHITECTURE */ - /* build a default exec command and argv list if one wasn't supplied... */ /* cmd... */ @@ -456,13 +451,13 @@ _DtTermPrimSubprocExec(Widget w, /* child... */ _DtTermProcessUnlock(); -#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE) +#if defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE) /* establish a new session for child */ setsid(); #else /* do a setpgrp() so that we can... */ (void) setpgrp(); -#endif /* ALPHA_ARCHITECTURE */ +#endif /* Linux || BSD */ #if defined(LINUX_ARCHITECTURE) /* set the ownership and mode of the pty... */ @@ -477,7 +472,7 @@ _DtTermPrimSubprocExec(Widget w, (void) _exit(1); } -#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE) +#if defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE) /* BSD needs to do this to acquire pty as controlling terminal */ if (ioctl(pty, TIOCSCTTY, (char *)NULL) < 0) { (void) close(pty); @@ -488,7 +483,7 @@ _DtTermPrimSubprocExec(Widget w, /* Do it when no controlling terminal doesn't work for OSF/1 */ _DtTermPrimPtyGetDefaultModes(); -#endif /* ALPHA_ARCHITECTURE */ +#endif /* Linux || BSD */ #if !defined(LINUX_ARCHITECTURE) /* set the ownership and mode of the pty... */ diff --git a/cde/lib/DtWidget/Editor.c b/cde/lib/DtWidget/Editor.c index 168d95a19..4edb0df76 100644 --- a/cde/lib/DtWidget/Editor.c +++ b/cde/lib/DtWidget/Editor.c @@ -57,9 +57,7 @@ #include #include -#if defined(__hpux) -# include -#elif defined(sun) +#if defined(sun) # if (_XOPEN_VERSION==3) # include # else diff --git a/cde/lib/csa/agent.wrapbegin b/cde/lib/csa/agent.wrapbegin index b263e1784..a72172f49 100644 --- a/cde/lib/csa/agent.wrapbegin +++ b/cde/lib/csa/agent.wrapbegin @@ -1,6 +1,2 @@ #ifndef _AGENTX_H #define _AGENTX_H - -#if defined(HPUX) -#include -#endif /* HPUX */ diff --git a/cde/lib/csa/agent.wrapend b/cde/lib/csa/agent.wrapend index 015de2924..69331c3ca 100644 --- a/cde/lib/csa/agent.wrapend +++ b/cde/lib/csa/agent.wrapend @@ -1,5 +1 @@ -#ifdef HPUX -#undef hpux -#define hpux -#endif #endif diff --git a/cde/lib/csa/cm.h b/cde/lib/csa/cm.h index 4a99849f1..81a593a83 100644 --- a/cde/lib/csa/cm.h +++ b/cde/lib/csa/cm.h @@ -33,7 +33,7 @@ #ifndef SunOS #include -#endif /* HPUX */ +#endif /* Sun */ #include @@ -703,9 +703,4 @@ extern bool_t xdr_cms_delete_args(); } #endif -#ifdef HPUX -#undef hpux -#define hpux #endif -#endif - diff --git a/cde/lib/csa/cmcb.h b/cde/lib/csa/cmcb.h index 91c383f32..efe95d03b 100644 --- a/cde/lib/csa/cmcb.h +++ b/cde/lib/csa/cmcb.h @@ -151,9 +151,4 @@ extern bool_t xdr_cmcb_update_callback_args(); } #endif -#ifdef HPUX -#undef hpux -#define hpux #endif -#endif - diff --git a/cde/lib/csa/connection.c b/cde/lib/csa/connection.c index 91e095daa..baa01c62c 100644 --- a/cde/lib/csa/connection.c +++ b/cde/lib/csa/connection.c @@ -39,9 +39,6 @@ #include #include #include -#ifdef HPUX -#include -#endif #include "connection.h" #include "rtable2.h" #include "rtable3.h" @@ -53,11 +50,7 @@ #include "convert3-4.h" #include "rpccalls.h" -#ifdef HPUX -#define MAX_COUNT 10 -#else #define MAX_COUNT 40 -#endif static struct timeval timeout_tv; static struct timeval retry_tv; @@ -636,17 +629,12 @@ cleanup_some_connection(_DtCm_Client_Info *dontclose) for (ci = client_cache_head; ci != NULL; ) { total++; -#ifdef HPUX - /* clean up whole list */ - if (ci != dontclose && ci->nregistered == 0) { -#else if (ci != dontclose && ci->nregistered == 0 && (ci->tcpcl || (!done && ci->tcpcl == NULL) || (ci->tcpcl==NULL && (time(NULL) - ci->last_used)>DAYSEC))) { if (!done) done = 1; -#endif deleted++; oldci = ci; @@ -829,31 +817,13 @@ get_client_handle( struct timeval tv; enum clnt_stat status; -#ifdef HPUX - static int bumped = 0; - struct rlimit rl; - - if (bumped == 0) { - bumped = 1; - - /* raise the soft limit of number of file descriptor */ - getrlimit(RLIMIT_NOFILE, &rl); - rl.rlim_cur = rl.rlim_max; - setrlimit(RLIMIT_NOFILE, &rl); - } -#endif - tv.tv_sec = 1; tv.tv_usec = 0; *clnt = NULL; for (vers = vers_high; vers >= vers_low; vers--) { -#if defined(__hpux) - if ((cl = clnt_create((char *)host, prognum, vers, nettype)) != NULL) { -#else if ((cl = clnt_create(host, prognum, vers, nettype)) != NULL) { -#endif clnt_control(cl, CLSET_TIMEOUT, (char *)&tv); status = clnt_call(cl, 0, (xdrproc_t) xdr_void, (char *)NULL, (xdrproc_t) xdr_void, diff --git a/cde/lib/csa/libcsa.elist b/cde/lib/csa/libcsa.elist index c43704e99..09fa43b23 100644 --- a/cde/lib/csa/libcsa.elist +++ b/cde/lib/csa/libcsa.elist @@ -536,10 +536,6 @@ internal _DtCm_yylval internal _DtCm_yynerrs internal _DtCm_yytext -#if defined(__hpux) -internal _DtCm_yymaxdepth -#endif - #if defined(sun) internal _DtCm_yy__DtCm_yys internal _DtCm_yy__DtCm_yyv diff --git a/cde/lib/csa/rtable2.h b/cde/lib/csa/rtable2.h index f9cff654f..67f4164a3 100644 --- a/cde/lib/csa/rtable2.h +++ b/cde/lib/csa/rtable2.h @@ -47,7 +47,7 @@ #ifndef SunOS #include -#endif /* HPUX */ +#endif /* Sun */ #include @@ -465,9 +465,4 @@ extern bool_t _DtCm_xdr_Registration_Status_2(); } #endif -#ifdef HPUX -#undef hpux -#define hpux #endif -#endif - diff --git a/cde/lib/csa/rtable3.h b/cde/lib/csa/rtable3.h index 122d96bce..e104f12a9 100644 --- a/cde/lib/csa/rtable3.h +++ b/cde/lib/csa/rtable3.h @@ -46,7 +46,7 @@ #ifndef SunOS #include -#endif /* HPUX */ +#endif /* Sun */ #include @@ -533,9 +533,4 @@ extern bool_t _DtCm_xdr_Registration_Status_3(); } #endif -#ifdef HPUX -#undef hpux -#define hpux #endif -#endif - diff --git a/cde/lib/csa/rtable4.h b/cde/lib/csa/rtable4.h index 502a09334..344bf68b0 100644 --- a/cde/lib/csa/rtable4.h +++ b/cde/lib/csa/rtable4.h @@ -597,9 +597,4 @@ extern bool_t _DtCm_xdr_Registration_Status_4(); } #endif -#ifdef HPUX -#undef hpux -#define hpux #endif -#endif - diff --git a/cde/lib/pam/libpam/pam_framework.c b/cde/lib/pam/libpam/pam_framework.c index 8a20ed2ea..d65f9bf41 100644 --- a/cde/lib/pam/libpam/pam_framework.c +++ b/cde/lib/pam/libpam/pam_framework.c @@ -35,12 +35,6 @@ #include #endif -#ifdef hpV4 -#include -#endif - - - #include #include #include @@ -77,10 +71,6 @@ static int load_modules(pam_handle_t *, int, char *); static void *open_module(char *); static int load_function(void *, char *, int (**func)()); #endif -#ifdef hpV4 -static shl_t open_module(char *); -static int load_function(shl_t, char *, int (**func)()); -#endif /* functions to read and store the pam.conf configuration file */ static int open_pam_conf(struct pam_fh **); @@ -1040,10 +1030,6 @@ load_modules(pam_handle_t *pamh, int type, char *function_name) void *mh; #endif -#ifdef hpV4 - shl_t mh; -#endif - pamtab *pam_entry; struct auth_module *authp; struct account_module *accountp; @@ -1233,20 +1219,12 @@ load_modules(pam_handle_t *pamh, int type, char *function_name) static void * open_module(char *module_so) { -#endif -#ifdef hpV4 -static shl_t -open_module(char *module_so) -{ #endif struct stat stb; char *errmsg; #ifdef sun void *lfd; #endif /* sun */ -#ifdef hpV4 - shl_t lfd; -#endif /* hpV4 */ /* * Stat the file so we can check modes and ownerships @@ -1289,10 +1267,6 @@ open_module(char *module_so) lfd = (void *) dlopen(module_so, RTLD_LAZY); #endif /* sun */ -#ifdef hpV4 - lfd = shl_load(module_so, BIND_DEFERRED, 0L); -#endif /* hpV4 */ - if (lfd == NULL) { if (pam_debug) { errmsg = (char *) strerror(errno); @@ -1313,20 +1287,9 @@ open_module(char *module_so) static int load_function(void *lfd, char *name, int (**func)()) { -#endif -#ifdef hpV4 -static int -load_function(shl_t lfd, char *name, int (**func)()) -{ #endif char *errmsg = NULL; -#ifdef hpV4 -void *proc_addr = NULL; -int stat; - -#endif - if (lfd == NULL) return (PAM_SYMBOL_ERR); @@ -1347,21 +1310,6 @@ int stat; } #endif -#ifdef hpV4 - - stat = shl_findsym(&lfd, name, TYPE_PROCEDURE, proc_addr); - - *func = (int (*)())proc_addr; - - if (stat) { - if (pam_debug) { - strerror_r(errno, errmsg, MAX_ERRMESSAGE_LENGTH); - syslog(LOG_DEBUG, "shl_findsym failed %s: error %s", - name, errmsg != NULL ? errmsg : ""); - } - return (PAM_SYMBOL_ERR); - } -#endif if (pam_debug) { syslog(LOG_DEBUG, "load_function: successful load of %s", name); diff --git a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C index 6b1ac3653..1b487a910 100644 --- a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C +++ b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C @@ -84,12 +84,6 @@ typedef union #include -#if defined (__hpux) -/* - * On HP MAXINT is defined in both and - */ -#undef MAXINT -#endif #if defined(CSRG_BASED) #define MAXINT INT_MAX #else diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C index ab32ee474..3716b737a 100644 --- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C +++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C @@ -214,15 +214,11 @@ main(int argc, char** argv, char **envp) void install_signal_handler(); SVCXPRT *transp; struct sockaddr_in saddr; -#if defined(HPUX) - int asize = sizeof(saddr); -#else # if defined(__linux__) || defined(CSRG_BASED) || defined(sun) socklen_t asize = sizeof(saddr); # else size_t asize = sizeof(saddr); # endif -#endif int is_aix = 0; int do_garbage_collect = 0; diff --git a/cde/lib/tt/lib/db/tt_db_file.h b/cde/lib/tt/lib/db/tt_db_file.h index 4a608f13a..71e7147a1 100644 --- a/cde/lib/tt/lib/db/tt_db_file.h +++ b/cde/lib/tt/lib/db/tt_db_file.h @@ -40,7 +40,7 @@ #include "db/tt_db_hostname_global_map_ref.h" #include "db/tt_db_access_utils.h" #include "db/tt_db_property_utils.h" -#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX) +#if defined(OPT_BUG_AIX) # undef copy #endif diff --git a/cde/lib/tt/lib/libtt.elist b/cde/lib/tt/lib/libtt.elist index a9dbb4420..e2acc245b 100644 --- a/cde/lib/tt/lib/libtt.elist +++ b/cde/lib/tt/lib/libtt.elist @@ -32,26 +32,16 @@ # define size_t unsigned long # define pid_t int # define uid_t unsigned long -#elif defined(hpV4) -# define size_t unsigned int -# define pid_t int -# define uid_t int #else # define size_t unsigned int # define pid_t long # define uid_t long #endif -#if defined(hpV4) -# define xdrproc_t int (*)(...) -#else # define xdrproc_t int (*)(void) -#endif #if defined(_AIX) # define va_list char* -#elif defined(hpV4) -# define va_list double* #else # define va_list void* #endif @@ -830,36 +820,6 @@ privateC++ _Tt_message_list::__vtbl privateC++ _Tt_procid_list::__vtbl #endif -#ifdef hpV4 -/* If debugging is enabled the tt clients require these symbols on HP. */ -privateC++ _Tt_arg::__vtbl -privateC++ _Tt_context::__vtbl -privateC++ _Tt_db_access::__vtbl -privateC++ _Tt_db_client::__vtbl -privateC++ _Tt_db_hostname_redirection_map::__vtbl -privateC++ _Tt_db_key::__vtbl -privateC++ _Tt_db_object::__vtbl -privateC++ _Tt_db_property::__vtbl -privateC++ _Tt_desktop_lock::__vtbl -privateC++ _Tt_file_system_entry::__vtbl -privateC++ _Tt_global::__vtbl -privateC++ _Tt_int_rec::__vtbl -privateC++ _Tt_message::__vtbl -privateC++ _Tt_mp::__vtbl -privateC++ _Tt_msg_context::__vtbl -privateC++ _Tt_object_list::__vtbl -privateC++ _Tt_object_table::__vtbl -privateC++ _Tt_pat_context::__vtbl -privateC++ _Tt_patlist::__vtbl -privateC++ _Tt_pattern::__vtbl -privateC++ _Tt_procid::__vtbl -privateC++ _Tt_session::__vtbl -privateC++ _Tt_session_prop::__vtbl -privateC++ _Tt_string_buf::__vtbl -privateC++ _Tt_string_buf_list::__vtbl -privateC++ _Tt_string_list::__vtbl -#endif - #ifdef OPT_BUG_SUNOS_5 /* This symbol was accidentally exported in libtt.so.1, so preserve */ /* it for backward compatibility. */ diff --git a/cde/lib/tt/lib/mp/mp_session.C b/cde/lib/tt/lib/mp/mp_session.C index 32ef0da85..2f2ebcba7 100644 --- a/cde/lib/tt/lib/mp/mp_session.C +++ b/cde/lib/tt/lib/mp/mp_session.C @@ -149,7 +149,7 @@ c_open_unix_socket(char *socket_name) memset(&server_addr, 0, sizeof(server_addr)); server_addr.sun_family = AF_UNIX; strcpy(server_addr.sun_path, socket_name); -#if defined(_AIX) || defined(hpux) +#if defined(_AIX) int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\ ily); if (connect(sock, (sockaddr *)&server_addr, servlen) < 0) { diff --git a/cde/lib/tt/lib/realpath.c b/cde/lib/tt/lib/realpath.c index f1801df31..cd22ba9d7 100644 --- a/cde/lib/tt/lib/realpath.c +++ b/cde/lib/tt/lib/realpath.c @@ -57,7 +57,7 @@ char *finalpath; strcpy(curpath, pathname); if (*pathname != '/') { -#if defined(__STDC__) && defined(hpux) +#if defined(__STDC__) if (!getcwd(workpath)) { #else if (!getwd(workpath)) { diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h index de3a30e23..3af74946a 100644 --- a/cde/lib/tt/lib/tt_options.h +++ b/cde/lib/tt/lib/tt_options.h @@ -71,15 +71,9 @@ * OPT_BUG_SUNOS_5 -- used to flag special hacks only needed because * of bugs or quirks in SunOS 5.x. * - * OPT_BUG_HPUX -- used to flag special hacks only needed because - * of bugs or quirks in HP-UX. - * * OPT_BUG_RPCINTR -- used to flag that RPC_INTR is not defined * in enum clnt_stat. * - * OPT_BUG_SGI -- used to flag special hacks only needed because of - * bugs or quirks in SGI IRIX. - * * OPT_XDR_LONG_TYPE -- used for (64-bit) architectures where * defines x_putlong and x_getlong to not take "long*". * @@ -337,58 +331,6 @@ # undef OPT_GARBAGE_THREADS # endif -#elif defined(sgi) -/* these are probably way obsolete now that irix is svr4 based */ -# define OPT_UNIX_SOCKET_RPC -# undef OPT_TLI -# undef OPT_DLOPEN_X11 -# undef OPT_DLOPEN_CE -# undef OPT_ADDMSG_DIRECT -# undef OPT_SECURE_RPC -# undef OPT_CLASSING_ENGINE -# define OPT_TAR_HAS_EXCLUDE_OPTION - -#elif defined(__hpux) || defined(hpux) - -# undef OPT_UNIX_SOCKET_RPC -# undef OPT_TLI -# undef OPT_DLOPEN_X11 -# undef OPT_DLOPEN_CE -# undef OPT_ADDMSG_DIRECT -# define OPT_BUG_HPUX -# undef OPT_SECURE_RPC -# undef OPT_CLASSING_ENGINE -# undef OPT_BSD_SIGNAL -# define OPT_POSIX_SIGNAL -# undef OPT_BSD_WAIT -# undef OPT_DGETTEXT -# define OPT_CATGETS -# undef OPT_GETDTABLESIZE -# undef OPT_SYSINFO -# define OPT_HAS_REALPATH -# define OPT_AUTOMOUNT_PATH_FIX -/* - * re-define these. HP-UX does not seem to want to wake up a swapped - * process. The timeouts have to be increased so that HP-UX has time - * to swap in ttsession (if it is out). - */ -# undef OPT_PING_TRIES -# define OPT_PING_TRIES 10 -# undef OPT_PING_SLEEP -# define OPT_PING_SLEEP 2 -# if OSMAJORVERSION < 10 -# define OPT_CPP_PATH "/lib/cpp" -# else -# define OPT_CPP_PATH "/opt/langtools/lbin/cpp" -# endif -# define OPT_CPP_OPTIONS "" -# undef OPT_SVR4_GETMNTENT -# undef OPT_LOCKF_MNTENT -# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_HFS -# define OPT_DEFINE_SIG_PF -# undef OPT_TAR_HAS_EXCLUDE_OPTION -# define OPT_BUG_RPCINTR - #elif defined(__linux__) # undef OPT_UNIX_SOCKET_RPC diff --git a/cde/lib/tt/lib/tttk/ttdesktop.C b/cde/lib/tt/lib/tttk/ttdesktop.C index a352cfe74..33752bb2a 100644 --- a/cde/lib/tt/lib/tttk/ttdesktop.C +++ b/cde/lib/tt/lib/tttk/ttdesktop.C @@ -1765,8 +1765,7 @@ _ttdt_posix_cb( tt_message_arg_val_set( msg, 4, names.machine ); // The last 3 are from sysinfo which seems to be SVR4 only. // For platforms without the sysinfo call, we just leave - // the values unset for now, except for the serial - // number which is available from utsname onHPUX. + // the values unset for now #if defined(OPT_SYSINFO) if (sysinfo( SI_ARCHITECTURE, buf, SYS_NMLN ) >= 0) { tt_message_arg_val_set( msg, 5, buf ); @@ -1777,8 +1776,6 @@ _ttdt_posix_cb( if (sysinfo( SI_HW_SERIAL, buf, SYS_NMLN ) >= 0) { tt_message_arg_val_set( msg, 7, buf ); } -#elif defined(__hpux) || defined(hpux) - tt_message_arg_val_set( msg, 7, names.idnumber); #endif tt_message_reply( msg ); tttk_message_destroy( msg ); diff --git a/cde/lib/tt/lib/util/tt_object_list.h b/cde/lib/tt/lib/util/tt_object_list.h index 1e93c7984..25f3cf554 100644 --- a/cde/lib/tt/lib/util/tt_object_list.h +++ b/cde/lib/tt/lib/util/tt_object_list.h @@ -37,7 +37,7 @@ #include #include #include -#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX) +#if defined(OPT_BUG_AIX) # undef remove #endif diff --git a/cde/lib/tt/lib/util/tt_port.C b/cde/lib/tt/lib/util/tt_port.C index 39da7edbc..1544cbea1 100644 --- a/cde/lib/tt/lib/util/tt_port.C +++ b/cde/lib/tt/lib/util/tt_port.C @@ -45,12 +45,6 @@ #include #include #include -#if defined(OPT_BUG_HPUX) && !defined(hpV4) -extern "C" { - int syslog(int priority, const char *message, ...); - int openlog(const char *ident, int logopt, int facility); -} -#endif #if defined(sun) #include #endif @@ -200,15 +194,11 @@ _tt_gethostid(void) sscanf(serial_num, "%12lx", &_hostid); } } -#elif defined(hpux) || defined(_AIX) +#elif defined(_AIX) struct utsname uts_name; uname(&uts_name); -# if defined(_AIX) - _hostid = atol(uts_name.machine); -# else - _hostid = atol(uts_name.idnumber); -# endif + _hostid = atol(uts_name.machine); #else _hostid = gethostid(); #endif @@ -365,7 +355,7 @@ _tt_vsyslog( return; } -#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) +#if defined(OPT_BUG_AIX) char buf[5000]; vsprintf( buf, _format, args ); syslog( priority, buf ); diff --git a/cde/lib/tt/lib/util/tt_string.h b/cde/lib/tt/lib/util/tt_string.h index 6e7181606..1c9f7b60f 100644 --- a/cde/lib/tt/lib/util/tt_string.h +++ b/cde/lib/tt/lib/util/tt_string.h @@ -44,11 +44,7 @@ #endif #include -#if defined(OPT_BUG_HPUX) -extern "C" { -#include -}; -#elif defined(OPT_BUG_SUNOS_5) +#if defined(OPT_BUG_SUNOS_5) #include #include #elif defined(OPT_BUG_AIX) diff --git a/cde/lib/tt/lib/util/tt_string_match.C b/cde/lib/tt/lib/util/tt_string_match.C index aab8e3a18..8e3a3b5c0 100644 --- a/cde/lib/tt/lib/util/tt_string_match.C +++ b/cde/lib/tt/lib/util/tt_string_match.C @@ -42,12 +42,6 @@ #include "util/tt_assert.h" #include -#if defined (__hpux) -/* - * On HP MAXINT is defined in both and - */ -#undef MAXINT -#endif #if defined(CSRG_BASED) #define MAXINT INT_MAX #else diff --git a/cde/lib/tt/lib/util/tt_tracefile_parse.C b/cde/lib/tt/lib/util/tt_tracefile_parse.C index 8d66ce345..69bea1886 100644 --- a/cde/lib/tt/lib/util/tt_tracefile_parse.C +++ b/cde/lib/tt/lib/util/tt_tracefile_parse.C @@ -41,7 +41,7 @@ #include "util/tt_trace_parser.h" #include "util/tt_entry_pt_names.h" -#if defined (_AIX) || defined(hpux) || defined(__linux__) || defined(CSRG_BASED) +#if defined (_AIX) || defined(__linux__) || defined(CSRG_BASED) #include #endif diff --git a/cde/lib/tt/lib/util/tt_xdr_utils.C b/cde/lib/tt/lib/util/tt_xdr_utils.C index ee6585cfe..d4603c664 100644 --- a/cde/lib/tt/lib/util/tt_xdr_utils.C +++ b/cde/lib/tt/lib/util/tt_xdr_utils.C @@ -113,7 +113,7 @@ _tt_xdr_sizeof(xdrproc_t f, void *data) _Tt_xdr_size_stream:: _Tt_xdr_size_stream() { memset (&ops, 0, sizeof ops); -#if defined(OPT_BUG_SUNOS_4) || defined(OPT_BUG_HPUX) +#if defined(OPT_BUG_SUNOS_4) ops.x_putlong = (int (*)(...))tt_x_putlong; ops.x_putbytes = (int (*)(...))tt_x_putbytes; ops.x_inline = (long *(*)(...))tt_x_inline; diff --git a/cde/lib/tt/slib/mp_s_session.C b/cde/lib/tt/slib/mp_s_session.C index 2adb0b535..0d9450224 100644 --- a/cde/lib/tt/slib/mp_s_session.C +++ b/cde/lib/tt/slib/mp_s_session.C @@ -115,7 +115,7 @@ s_open_unix_socket(char *socket_name) server_addr.sun_family = AF_UNIX; (void)unlink(socket_name); strcpy(server_addr.sun_path, socket_name); -#if defined(_AIX) || defined(hpux) +#if defined(_AIX) int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\ ily); if (bind(sock, (struct sockaddr *)&server_addr,servlen) < 0) { diff --git a/cde/programs/dtaction/Main.c b/cde/programs/dtaction/Main.c index 74b767f78..3d8f676ea 100644 --- a/cde/programs/dtaction/Main.c +++ b/cde/programs/dtaction/Main.c @@ -403,10 +403,7 @@ SetGidUid ( unsigned short rgid, unsigned short ruid ) if(-1 == setregid(rgid, rgid)) { fprintf(stderr, "SetGidUid: setregid failed on %d\n", rgid); } -#elif defined(__hpux) - setresgid(rgid, rgid, rgid); -#else - setregid(rgid, rgid, rgid); + setregid(rgid, rgid); #endif /* fix process uid */ @@ -416,10 +413,7 @@ SetGidUid ( unsigned short rgid, unsigned short ruid ) if(-1 == setreuid(ruid, ruid)) { fprintf(stderr, "SetGidUid: setreuid failed on %d\n", ruid); } -#elif defined(__hpux) - setresuid(ruid, ruid, ruid); -#else - setreuid(ruid, ruid, ruid); + setreuid(ruid, ruid); #endif } @@ -591,13 +585,7 @@ AddSuLog( time_t timenow; struct tm *now; -#ifdef hpV4 /* 10.* versions */ char * SULog = "/var/adm/sulog"; -#elif defined( hpux ) /* 9.* versions */ - char * SULog = "/usr/adm/sulog"; -#else - char * SULog = "/var/adm/sulog"; -#endif if ((f = fopen (SULog, "a")) == NULL) return; diff --git a/cde/programs/dtaction/demo/Makefile.hp b/cde/programs/dtaction/demo/Makefile.hp deleted file mode 100644 index 2ef1e978c..000000000 --- a/cde/programs/dtaction/demo/Makefile.hp +++ /dev/null @@ -1,52 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:29:32 drk $ -########################################################################### -# -# Makefile for dtactiondemo.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################### - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = dtactiondemo -SOURCES = dtactiondemo.c -OBJECTS = dtactiondemo.o - -CFLAGS = +Obb2000 -Aa -OPTIMIZEDFLAGS = -O - -DEFINES = -D_HPUX_SOURCE - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -XMINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/include/X11R5 -EXTRA_INCLUDES = -INCLUDES = $(DTINCLUDE) $(XMINCLUDE) $(X11INCLUDE) $(EXTRA_INCLUDES) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXt -X11LIB = -L/usr/lib/X11R5 -lX11 - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) $(X11LIB) - -LDFLAGS = - -.c.o: - cc -c $(CFLAGS) $(DEFINES) $(OPTIMIZEDFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/dtappbuilder/src/ab/Makefile.am b/cde/programs/dtappbuilder/src/ab/Makefile.am index 0d43ea0cf..e40629c7e 100644 --- a/cde/programs/dtappbuilder/src/ab/Makefile.am +++ b/cde/programs/dtappbuilder/src/ab/Makefile.am @@ -29,7 +29,6 @@ endif AB_MAKEFILES = \ Makefile.aix \ - Makefile.hpux \ Makefile.sunos \ Makefile.linux \ Makefile.freebsd \ diff --git a/cde/programs/dtappbuilder/src/abmf/make_file.c b/cde/programs/dtappbuilder/src/abmf/make_file.c index 3c443b44c..211cebd18 100644 --- a/cde/programs/dtappbuilder/src/abmf/make_file.c +++ b/cde/programs/dtappbuilder/src/abmf/make_file.c @@ -99,7 +99,6 @@ static int write_os_params( AbmfLibs libs ); static int write_aix_stuff(File makeFile, AbmfLibs libs); -static int write_hpux_stuff(File makeFile, AbmfLibs libs); static int write_sunos_params(File makeFile, AbmfLibs libs); static int write_lnx_params(File makeFile, AbmfLibs libs); static int write_fbsd_params(File makeFile, AbmfLibs libs); @@ -107,7 +106,6 @@ static int write_nbsd_params(File makeFile, AbmfLibs libs); static int write_obsd_params(File makeFile, AbmfLibs libs); static int determine_aix_libs(AbmfLibs libs, ABObj project); -static int determine_hpux_libs(AbmfLibs libs, ABObj project); static int determine_sunos_libs(AbmfLibs libs, ABObj project); static int determine_lnx_libs(AbmfLibs libs, ABObj project); static int determine_fbsd_libs(AbmfLibs libs, ABObj project); @@ -196,11 +194,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType) lib_add(libs, LibICE, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP); lib_add(libs, LibSM, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP); lib_add(libs, LibXp, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP); - - if (osType == AB_OS_HPUX) - { - lib_add(libs, LibTt, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP); - } } if (projData->has_terminal) @@ -217,10 +210,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType) return_value = determine_aix_libs(libs, project); break; - case AB_OS_HPUX: - return_value = determine_hpux_libs(libs, project); - break; - case AB_OS_SUNOS: return_value = determine_sunos_libs(libs, project); break; @@ -247,18 +236,6 @@ determine_aix_libs(AbmfLibs libs, ABObj project) return 0; } - -static int -determine_hpux_libs(AbmfLibs libs, ABObj project) -{ - /* - lib_add(libs, LibWlarchive, ABMF_LIB_PREPEND, ABMF_LIB_REPLACE_DUP); - lib_add(libs, LibWldefault, ABMF_LIB_APPEND, ABMF_LIB_REPLACE_DUP); - */ - return 0; -} - - static int determine_sunos_libs(AbmfLibs libs, ABObj project) { @@ -476,10 +453,6 @@ write_os_params( return_value = write_aix_stuff(makeFile, libs); break; - case AB_OS_HPUX: - return_value = write_hpux_stuff(makeFile, libs); - break; - case AB_OS_SUNOS: return_value = write_sunos_params(makeFile, libs); break; @@ -551,52 +524,6 @@ write_aix_stuff(File makeFile, AbmfLibs libs) } -static int -write_hpux_stuff(File makeFile, AbmfLibs libs) -{ - STRING osName = util_os_type_to_string(AB_OS_HPUX); - - abio_printf(makeFile, -"###########################################################################\n" -"# These are the %s-dependent configuration parameters that must be\n" -"# set in order for any application to build.\n" -"###########################################################################\n", - osName); - - abio_puts(makeFile, "\n"); - abio_puts(makeFile, -" RM = rm -f\n" -" INCLUDES = -I/usr/dt/include -I/X11/include\n" -"\n" -" STD_DEFINES = -DSYSV -DNLS16 -DMALLOC_0_RETURNS_NULL -DMERGE -DNDEBUG" - " -D__hpux -Dhpux -DOSMAJORVERSION=9 -DOSMINORVERSION=0 -DSHMLINK" - " -D__hp9000s800 -Dhp9000s800 -Dhp9000s700 -DHPPEX\n" -" ANSI_DEFINES = -Aa -D_HPUX_SOURCE -DANSICPP\n" -"\n" -" CDEBUGFLAGS = -g -z\n" -" COPTFLAGS = -O -z\n" -" SYS_LIBRARIES = -lm\n" -" CDE_LIBPATH = /usr/dt/lib\n" -" CDE_LDFLAGS = -L$(CDE_LIBPATH)\n" -" ALLX_LIBPATH = /X11/lib\n" -" ALLX_LDFLAGS = -L$(ALLX_LIBPATH)\n" -); - - write_local_libraries(makeFile, libs, AB_OS_HPUX); - - abio_puts(makeFile, -"\n" -" CFLAGS = $(CDEBUGFLAGS) $(INCLUDES) $(STD_DEFINES)" - " $(ANSI_DEFINES)\n" -" LDLIBS = $(SYS_LIBRARIES)\n" -" LDOPTIONS = $(CDE_LDFLAGS) $(ALLX_LDFLAGS)\n" -"\n" -); - - return 0; -} - - static int write_sunos_params(File makeFile, AbmfLibs libs) { @@ -1159,7 +1086,7 @@ write_targets( "\n" "scour:\n" " $(RM) $(CLEAN_FILES) $(TARGETS.h.merged) $(TARGETS.c.merged) \\\n" -" Makefile Makefile.aix Makefile.hpux Makefile.sunos \\\n" +" Makefile Makefile.aix Makefile.sunos \\\n" " Makefile.linux \\\n" " Makefile.freebsd Makefile.netbsd Makefile.openbsd\n" ); diff --git a/cde/programs/dtappbuilder/src/include/ab_private/util.h b/cde/programs/dtappbuilder/src/include/ab_private/util.h index aceedbd00..a67dd3af2 100644 --- a/cde/programs/dtappbuilder/src/include/ab_private/util.h +++ b/cde/programs/dtappbuilder/src/include/ab_private/util.h @@ -78,7 +78,6 @@ extern char *strdup(const char *); typedef enum { AB_OS_UNDEF = 0, - AB_OS_HPUX, AB_OS_AIX, AB_OS_SUNOS, AB_OS_LNX, diff --git a/cde/programs/dtappbuilder/src/libABil/Makefile.am b/cde/programs/dtappbuilder/src/libABil/Makefile.am index 1fc2ab05e..a9873fcaf 100644 --- a/cde/programs/dtappbuilder/src/libABil/Makefile.am +++ b/cde/programs/dtappbuilder/src/libABil/Makefile.am @@ -8,10 +8,6 @@ BUILT_SOURCES = bil_parse.h bil_parse.c CLEANFILES = bil_parse.h bil_parse.c AM_YFLAGS = -d -if HPUX -CCOPTIONS = -Ae -endif - noinst_LIBRARIES = libABil.a #noinst_PROGRAMS = bil_test diff --git a/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am b/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am index 2e15f3c2e..ed0151061 100644 --- a/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am +++ b/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am @@ -4,10 +4,6 @@ ABINCLUDES = ../include EXTRA_DEFINES = -D_POSIX_SOURCE=1 -if HPUX -CCOPTIONS = -Ae -endif - noinst_LIBRARIES = libABobjXm.a libABobjXm_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES) diff --git a/cde/programs/dtappbuilder/src/libAButil/Makefile.am b/cde/programs/dtappbuilder/src/libAButil/Makefile.am index 71dae306b..d683a00e8 100644 --- a/cde/programs/dtappbuilder/src/libAButil/Makefile.am +++ b/cde/programs/dtappbuilder/src/libAButil/Makefile.am @@ -4,10 +4,6 @@ ABINCLUDES = ../include EXTRA_DEFINES = -D_POSIX_SOURCE=1 -if HPUX -CCOPTIONS = -Ae -endif - noinst_LIBRARIES = libAButil.a #noinst_PROGRAMS = util_test istr_test diff --git a/cde/programs/dtappbuilder/src/libAButil/util.c b/cde/programs/dtappbuilder/src/libAButil/util.c index b7e62c336..f4e4f12f3 100644 --- a/cde/programs/dtappbuilder/src/libAButil/util.c +++ b/cde/programs/dtappbuilder/src/libAButil/util.c @@ -233,7 +233,7 @@ util_vfork(void) #ifdef __cplusplus extern "C" { #endif -#if defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 ) +#if (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 ) extern int putenv(const char *string); #elif !(defined(__aix) || defined(__NetBSD__)) extern int putenv(char *string); @@ -258,7 +258,6 @@ util_get_os_type(void) int rc = 0; /* return code */ struct utsname sysInfo; int aixIndex = -1; - int hpIndex = -1; int sunIndex = -1; int lnxIndex = -1; int fbsdIndex = -1; @@ -275,7 +274,6 @@ util_get_os_type(void) } aixIndex = util_strcasestr(sysInfo.sysname, "aix"); - hpIndex = util_strcasestr(sysInfo.sysname, "hp"); sunIndex = util_strcasestr(sysInfo.sysname, "sun"); lnxIndex = util_strcasestr(sysInfo.sysname, "linux"); fbsdIndex = util_strcasestr(sysInfo.sysname, "freebsd"); @@ -283,49 +281,36 @@ util_get_os_type(void) obsdIndex = util_strcasestr(sysInfo.sysname, "openbsd"); if (aixIndex < 0) aixIndex = INT_MAX; - if (hpIndex < 0) hpIndex = INT_MAX; if (sunIndex < 0) sunIndex = INT_MAX; if (lnxIndex < 0) lnxIndex = INT_MAX; if (fbsdIndex < 0) fbsdIndex = INT_MAX; if (nbsdIndex < 0) nbsdIndex = INT_MAX; if (obsdIndex < 0) obsdIndex = INT_MAX; -#define IS_MATCH(a,b,c,d,e,f,g) \ - (((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f)) && \ - ((a) < (g))) +#define IS_MATCH(a,b,c,d,e,f) \ + (((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f))) - if (IS_MATCH(aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex, - obsdIndex)) + if (IS_MATCH(aixIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_AIX; } - if (IS_MATCH(hpIndex, aixIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex, - obsdIndex)) - { - return AB_OS_HPUX; - } - if (IS_MATCH(sunIndex, aixIndex, hpIndex, lnxIndex, fbsdIndex, nbsdIndex, - obsdIndex)) + if (IS_MATCH(sunIndex, aixIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_SUNOS; } - if (IS_MATCH(lnxIndex, aixIndex, hpIndex, sunIndex, fbsdIndex, nbsdIndex, - obsdIndex)) + if (IS_MATCH(lnxIndex, aixIndex, sunIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_LNX; } - if (IS_MATCH(fbsdIndex, aixIndex, hpIndex, sunIndex, lnxIndex, nbsdIndex, - obsdIndex)) + if (IS_MATCH(fbsdIndex, aixIndex, sunIndex, lnxIndex, nbsdIndex, obsdIndex)) { return AB_OS_FBSD; } - if (IS_MATCH(nbsdIndex, aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex, - obsdIndex)) + if (IS_MATCH(nbsdIndex, aixIndex, sunIndex, lnxIndex, fbsdIndex, obsdIndex)) { return AB_OS_NBSD; } - if (IS_MATCH(obsdIndex, aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex, - nbsdIndex)) + if (IS_MATCH(obsdIndex, aixIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex)) { return AB_OS_OBSD; } diff --git a/cde/programs/dtappbuilder/src/libAButil/util_convert.c b/cde/programs/dtappbuilder/src/libAButil/util_convert.c index c319d39b5..3b7622748 100644 --- a/cde/programs/dtappbuilder/src/libAButil/util_convert.c +++ b/cde/programs/dtappbuilder/src/libAButil/util_convert.c @@ -852,7 +852,6 @@ util_os_type_to_ident(AB_OS_TYPE osType) switch (osType) { case AB_OS_AIX: typeString = "aix"; break; - case AB_OS_HPUX: typeString = "hpux"; break; case AB_OS_SUNOS: typeString = "sunos"; break; case AB_OS_LNX: typeString = "linux"; break; case AB_OS_FBSD: typeString = "freebsd"; break; @@ -875,7 +874,6 @@ util_os_type_to_string(AB_OS_TYPE osType) switch (osType) { case AB_OS_AIX: nameString = "AIX"; break; - case AB_OS_HPUX: nameString = "HP-UX"; break; case AB_OS_SUNOS: nameString = "SunOS"; break; case AB_OS_LNX: nameString = "Linux"; break; case AB_OS_FBSD: nameString = "FreeBSD"; break; diff --git a/cde/programs/dtcalc/calctool.h b/cde/programs/dtcalc/calctool.h index 3377e9f47..e5b7fa66d 100644 --- a/cde/programs/dtcalc/calctool.h +++ b/cde/programs/dtcalc/calctool.h @@ -91,16 +91,6 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s); #endif #endif /* sun */ -#ifdef hpux -#define HIL_PC101_KBD 1 -#define HIL_ITF_KBD 2 -#define SERIAL_PC101_KBD 3 -#define FIRST_HIL_KBD 0xC0 -#define LAST_HIL_KBD 0xDF -#define LED_BITS 0x30 -#define PS2_DIN_NAME "PS2_DIN_KEYBOARD" -#endif - #include #define MEM 1 @@ -535,9 +525,6 @@ struct calcVars { /* Calctool variables and options. */ int funstate ; /* whether the last key pressed was a fin. func. key*/ int defState ; /* Set when calculator has just been cleared */ -#ifdef hpux - int keybdID; -#endif }; extern struct calcVars CalcVars; diff --git a/cde/programs/dtcalc/text.c b/cde/programs/dtcalc/text.c index fb88666c2..b2ab0c717 100644 --- a/cde/programs/dtcalc/text.c +++ b/cde/programs/dtcalc/text.c @@ -310,14 +310,7 @@ init_text(void) /* Setup text strings depending upon language. */ get_key_val(&buttons[i++].value, LGET(GETMESSAGE(3, 467, "\010"))) ; /* del */ -#ifdef hpux - if(v->keybdID == HIL_ITF_KBD) - get_key_val(&buttons[i++].value, LGET(GETMESSAGE(3, 513, "\013"))) ; - else - get_key_val(&buttons[i++].value, LGET(GETMESSAGE(3, 468, "\177"))) ; -#else get_key_val(&buttons[i++].value, LGET(GETMESSAGE(3, 468, "\177"))) ; -#endif get_key_val(&buttons[i++].value, LGET(GETMESSAGE(3, 469, "d"))) ; diff --git a/cde/programs/dtcm/server/log.c b/cde/programs/dtcm/server/log.c index 4ccd39250..9d963dbb7 100644 --- a/cde/programs/dtcm/server/log.c +++ b/cde/programs/dtcm/server/log.c @@ -734,13 +734,9 @@ _DtCmsSetFileMode( if (changeeuid == B_TRUE) { #ifndef AIX -#ifdef HPUX - setuid (0); -#else if(-1 == seteuid (0)) { perror(strerror(errno)); } -#endif #endif } @@ -767,11 +763,7 @@ _DtCmsSetFileMode( } #ifndef AIX -#ifdef HPUX - if (changeeuid == B_TRUE && setuid (daemon_uid) < 0) -#else if (changeeuid == B_TRUE && seteuid (daemon_uid) < 0) -#endif { if (printerr == B_TRUE) { error = errno; diff --git a/cde/programs/dtcm/server/svcmain.c b/cde/programs/dtcm/server/svcmain.c index 7c8f796c1..8cdb9d2ac 100644 --- a/cde/programs/dtcm/server/svcmain.c +++ b/cde/programs/dtcm/server/svcmain.c @@ -688,14 +688,12 @@ main(int argc, char **argv) /* don't register unsupported versions: */ if (ph->prog[version].nproc == 0) continue; -#ifndef HPUX if (standalone) -#endif (void) pmap_unset(ph->program_num, version); if (udp_transp == (SVCXPRT *)-1) { udp_transp = svcudp_create(standalone ? RPC_ANYSOCK : 0 -#if defined(_AIX) || defined(hpV4) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(__linux__) || defined(CSRG_BASED) ); #else ,0,0); @@ -707,13 +705,8 @@ main(int argc, char **argv) } } -#ifndef HPUX if (!svc_register(udp_transp, ph->program_num, version, program, standalone ? IPPROTO_UDP : 0)) { -#else - if (!svc_register(udp_transp, ph->program_num, version, program, - IPPROTO_UDP)) { -#endif (void)fprintf(stderr, "rtable_main.c: unable to register"); exit(1); } @@ -742,17 +735,12 @@ main(int argc, char **argv) #endif /* SunOS */ #ifndef AIX -#ifdef HPUX - setgid (daemon_gid); - setuid (daemon_uid); -#else if(-1 == setegid (daemon_gid)) { perror(strerror(errno)); } if(-1 == seteuid (daemon_uid)) { perror(strerror(errno)); } -#endif /* HPUX */ #endif /* AIX */ init_time(); diff --git a/cde/programs/dtdocbook/instant/main.c b/cde/programs/dtdocbook/instant/main.c index 65d2678a2..20e089f69 100644 --- a/cde/programs/dtdocbook/instant/main.c +++ b/cde/programs/dtdocbook/instant/main.c @@ -309,9 +309,6 @@ Initialize1( time_t tnow; struct tm *nowtm; char *cp, buf[100]; -#if HPUX - extern int gethostname(char *, int); /* not in a system .h file... */ -#endif /* where we try to find data/library files */ if (!(tpt_lib=getenv(TPT_LIB))) tpt_lib = DEF_TPT_LIB; @@ -330,11 +327,7 @@ Initialize1( nowtm = localtime(&tnow); strftime(buf, 100, "%a %d %b %Y, %R", nowtm); SetMappingNV(Variables, "date", buf); -#if HPUX - if (gethostname(buf, 100) < 0) strcpy(buf, "unknown-host"); -#else strcpy(buf, "unknown-host"); -#endif SetMappingNV(Variables, "host", buf); SetMappingNV(Variables, "transpec", tranfile ? tranfile : "??"); } diff --git a/cde/programs/dtexec/osdep.h b/cde/programs/dtexec/osdep.h index 6aed26d92..767799a73 100644 --- a/cde/programs/dtexec/osdep.h +++ b/cde/programs/dtexec/osdep.h @@ -43,12 +43,8 @@ #include #include -#ifndef __hpux # include # define FD_SET_CAST(x) (x) -#else -# define FD_SET_CAST(x) ((int *)(x)) -#endif #ifndef OPEN_MAX # define OPEN_MAX 128 diff --git a/cde/programs/dtfile/ChangeDir.c b/cde/programs/dtfile/ChangeDir.c index c8d8eee15..6d4c438fd 100644 --- a/cde/programs/dtfile/ChangeDir.c +++ b/cde/programs/dtfile/ChangeDir.c @@ -62,10 +62,6 @@ #include #include -#ifdef __hpux -#include -#endif - #include #include diff --git a/cde/programs/dtfile/File.c b/cde/programs/dtfile/File.c index 87f0be00e..b740d8c13 100644 --- a/cde/programs/dtfile/File.c +++ b/cde/programs/dtfile/File.c @@ -484,24 +484,14 @@ StrcollProc GetStrcollProc(void) { int Clang = 0; -#if defined(__hpux) - struct locale_data * li; -#else char * locale; -#endif #define C_LANG "C" /* if locale is C, use the explicit case insensitive compare */ -#if defined(__hpux) - li = getlocale(LOCALE_STATUS); - if ( NULL == li->LC_COLLATE_D || strcmp(C_LANG,li->LC_COLLATE_D) == 0 ) - Clang = 1; -#else locale = setlocale(LC_COLLATE,NULL); /* put locale in buf */ if (strcmp(locale,C_LANG) == 0) Clang = 1; -#endif if (Clang) return StrCaseCmp; diff --git a/cde/programs/dtfile/FileDialog.c b/cde/programs/dtfile/FileDialog.c index 497b03415..29b0d7ba1 100644 --- a/cde/programs/dtfile/FileDialog.c +++ b/cde/programs/dtfile/FileDialog.c @@ -59,7 +59,7 @@ #include #include -#if defined(_AIX) || defined(hpux) +#if defined(_AIX) #include #else #ifndef MAXNAMLEN diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c index 4500b0a99..2741cc368 100644 --- a/cde/programs/dtfile/FileManip.c +++ b/cde/programs/dtfile/FileManip.c @@ -954,7 +954,7 @@ FileManip( #else #if defined(SVR4) || defined(_AIX) ((s3.st_mode & S_IFMT) == S_IFDIR) ) /* if is a directory */ -#else /* (__hpux) */ +#else (((s3.st_mode & S_IFMT) == S_IFDIR) /* if is a directory */ || ((s3.st_mode & S_IFMT) == S_IFNWK)) ) /* or a net special */ #endif diff --git a/cde/programs/dtfile/FileOp.c b/cde/programs/dtfile/FileOp.c index 67afc0def..dce79f5c4 100644 --- a/cde/programs/dtfile/FileOp.c +++ b/cde/programs/dtfile/FileOp.c @@ -84,7 +84,7 @@ #include #endif -#if defined(_AIX)|| defined(hpux) +#if defined(_AIX) #include #else #ifndef MAXNAMLEN @@ -2287,11 +2287,7 @@ _FileMoveCopy( /* do the select */ FD_SET(fd, &select_fds); -#if defined(__hpux) && (OSMAJORVERSION <= 10) && (OSMINORVERSION < 2) - rc = select(fd + 1, (int *)&select_fds, NULL, NULL, &select_timeout); -#else rc = select(fd + 1, &select_fds, NULL, NULL, &select_timeout); -#endif if (rc < 0 && errno != EINTR) { perror("select failed in FileMoveCopy"); diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c index 8688f500d..e599cfad9 100644 --- a/cde/programs/dtfile/Find.c +++ b/cde/programs/dtfile/Find.c @@ -84,9 +84,6 @@ #include -#ifdef __hpux -#include -#endif /* __hpux */ #include #include @@ -159,9 +156,9 @@ static char * PRINT_OPTION = " -print "; static char * FIND_COMMAND = "find "; static char * GREP_COMMAND = "grep -i -l "; static char * NAME_OPTION = " -name "; -#if defined(__hpux) || defined(sun) +#if defined(sun) static char * FOLLOW_OPTION = " -follow"; -#endif /* __hpux */ +#endif /* sun */ static char * REDIRECTOR = " 2>&-"; static char * TYPEDIR = " -type d"; static char * FIND_FILE = "FindFile"; @@ -368,7 +365,7 @@ Create( Widget newFM, outputSeparator; Widget headLabel, contentLabel, contentText; Widget filterText, filterLabel, listLabel, scrolledList, dirName, dirLabel; -#if defined(__hpux) || defined(sun) +#if defined(sun) Widget followLink, followLinkPD; #endif Widget putOnDT, separator; @@ -487,7 +484,7 @@ Create( XtAddCallback(contentText, XmNhelpCallback, (XtCallbackProc)HelpRequestCB, HELP_FIND_DIALOG_STR); -#if defined(__hpux) || defined(sun) +#if defined(sun) n = 0; XtSetArg (args[n], XmNmarginWidth, 1); n++; XtSetArg (args[n], XmNmarginHeight, 1); n++; @@ -543,7 +540,7 @@ Create( XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++; XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++; XtSetArg (args[n], XmNtopAttachment, XmATTACH_WIDGET); n++; -#if defined(__hpux) || defined(sun) +#if defined(sun) XtSetArg (args[n], XmNtopWidget, form1); n++; #else XtSetArg (args[n], XmNtopWidget, contentText); n++; @@ -797,7 +794,7 @@ Create( find_rec->form = form; find_rec->fileNameFilter = filterText; find_rec->content = contentText; -#if defined(__hpux) || defined(sun) +#if defined(sun) find_rec->followLink = followLink; #else find_rec->followLink = NULL; @@ -979,7 +976,7 @@ GetDefaultValues( void ) find_data->matches = NULL; find_data->num_matches = 0; find_data->selected_item = -1; -#if defined(__hpux) || defined(sun) +#if defined(sun) find_data->follow_links = follow_links; #endif @@ -1108,7 +1105,7 @@ SetValues( XtSetValues (find_rec->matchList, args, 1); } -#if defined(__hpux) || defined(sun) +#if defined(sun) /* Set up the Follow links option menu */ if(find_data->follow_links) XtSetArg(args[0], XmNmenuHistory, find_rec->widgArry[ON]); @@ -1295,7 +1292,7 @@ GetFindValues( } } -#if defined(__hpux) || defined(sun) +#if defined(sun) { Widget menuHistory; @@ -1883,7 +1880,7 @@ ExecuteFind( } -#if defined(__hpux) || defined(sun) +#if defined(sun) { Widget menuHistory; diff --git a/cde/programs/dtfile/Find.h b/cde/programs/dtfile/Find.h index c6b468b7e..e9cb10fda 100644 --- a/cde/programs/dtfile/Find.h +++ b/cde/programs/dtfile/Find.h @@ -57,7 +57,7 @@ typedef struct Dimension width; Dimension height; -#if defined(__hpux) || defined(sun) +#if defined(sun) Boolean follow_links; #endif String directories; diff --git a/cde/programs/dtfile/FindP.c b/cde/programs/dtfile/FindP.c index dd23bab2f..fc39634a1 100644 --- a/cde/programs/dtfile/FindP.c +++ b/cde/programs/dtfile/FindP.c @@ -197,7 +197,7 @@ ShowFindDialog( XtFree(tempStr); file_mgr_rec->findBtn_child=find_rec->shell; -#if defined(__hpux) || defined(sun) +#if defined(sun) if(file_mgr_data->toolbox) { XtSetArg (args[0], XmNmenuHistory, find_rec->widgArry[ON]); diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c index e52f36c08..328ed85b9 100644 --- a/cde/programs/dtfile/Main.c +++ b/cde/programs/dtfile/Main.c @@ -263,7 +263,7 @@ typedef struct Boolean restrictMode; int desktopPlacement; Boolean freezeOnConfig; -#if defined(__hpux) || defined(sun) +#if defined(sun) Boolean follow_links; #endif char * fileMgrIcon; @@ -590,7 +590,7 @@ int checkBrokenLink; int trashWait; int desktopPlacement; Boolean freezeOnConfig; -#if defined(__hpux) || defined(sun) +#if defined(sun) Boolean follow_links; #endif int treeType; @@ -949,7 +949,7 @@ static XtResource resources[] = (XtPointer)False, }, -#if defined(__hpux) || defined(sun) +#if defined(sun) { "followLinks", "FollowLinks", XmRBoolean, sizeof(Boolean), XtOffset(ApplicationArgsPtr, follow_links), XmRImmediate, (XtPointer) False, @@ -1459,7 +1459,7 @@ _DtPerfChkpntMsgSend("Begin XtInitialize"); desktopPlacement = application_args.desktopPlacement; freezeOnConfig = application_args.freezeOnConfig; emptyTrashOnExit = application_args.emptyTrashOnExit; -#if defined(__hpux) || defined(sun) +#if defined(sun) follow_links = application_args.follow_links; #endif instanceWidth = application_args.instanceIconWidth; diff --git a/cde/programs/dtfile/Main.h b/cde/programs/dtfile/Main.h index 0fb5ed8ab..07ca2b97a 100644 --- a/cde/programs/dtfile/Main.h +++ b/cde/programs/dtfile/Main.h @@ -289,7 +289,7 @@ extern char *fileMgrTitle; extern char *fileMgrHelpVol; extern int desktopIconType; extern Boolean freezeOnConfig; -#if defined(__hpux) || defined(sun) +#if defined(sun) extern Boolean follow_links; #endif extern int maxDirectoryProcesses; diff --git a/cde/programs/dtfile/MkDir.c b/cde/programs/dtfile/MkDir.c index 9299f25ae..a7fb51710 100644 --- a/cde/programs/dtfile/MkDir.c +++ b/cde/programs/dtfile/MkDir.c @@ -51,9 +51,6 @@ #include #include -#ifdef __hpux -#include -#endif #include diff --git a/cde/programs/dtfile/dtfile.msg b/cde/programs/dtfile/dtfile.msg index cac72d0c1..04edf36cb 100644 --- a/cde/programs/dtfile/dtfile.msg +++ b/cde/programs/dtfile/dtfile.msg @@ -808,11 +808,6 @@ The selected file no longer exists. 31 File or Folder Name: 32 File Contents: -$ Messages 33-35 are used on hpux systems -33 On -34 Off -35 Follow Links: - 36 Open New View 37 Put In Workspace 38 Files Found (by Contents): diff --git a/cde/programs/dtfile/fsDialog.c b/cde/programs/dtfile/fsDialog.c index 9817fd3ca..a5f78e4d9 100644 --- a/cde/programs/dtfile/fsDialog.c +++ b/cde/programs/dtfile/fsDialog.c @@ -111,10 +111,6 @@ #include #endif -#ifdef __hpux -#include -#endif - /*---------------------- * global variables *----------------------*/ @@ -259,17 +255,6 @@ static void getFSType(const String path, strncpy(fsType,"",MAXLINELENGTH); #endif /* sun */ -#ifdef __hpux -#define GETFSTYPE - struct statfs buf; - - strncpy(platform,"hpux",MAXLINELENGTH); - if (statfs(path, &buf) == 0) - sprintf(fsType,"%li",buf.f_fsid[1]); - else - strncpy(fsType,"",MAXLINELENGTH); -#endif /* __hpux */ - #ifndef GETFSTYPE strncpy(platform,"unknown",MAXLINELENGTH); strncpy(fsType, "",MAXLINELENGTH); @@ -306,7 +291,6 @@ static void getFSType(const String path, * * sample dtfs configuration file * * aix:4=afs - * hpux:8=afs * sunos:nfs=nfs * end * @@ -459,7 +443,7 @@ configFileName(void) * get the file-system identifier from the configuration file * * fptr refers to an open configuration file - * fsType and platform identify the platfrom (aix, hpux, sunos, etc) + * fsType and platform identify the platfrom (aix, sunos, etc) * and file-system type (afs, nfs, dfs, etc.) * fsID is filled by matching platform:fsType with with information in the * file and reading the id; the string comparisons are case insensitive diff --git a/cde/programs/dthelp/dthelpgen/helpgen.c b/cde/programs/dthelp/dthelpgen/helpgen.c index 84ad947e8..665848ab0 100644 --- a/cde/programs/dthelp/dthelpgen/helpgen.c +++ b/cde/programs/dthelp/dthelpgen/helpgen.c @@ -1317,11 +1317,7 @@ main( * telling the user that we're building help browser * information. */ -#ifdef __hpux - childPid = vfork(); -#else childPid = fork(); -#endif /* * if this is the child, exec the dthelpgen.ds script. */ diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h index 3e8ed60e6..482307f02 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/global.h +++ b/cde/programs/dthelp/parser/canon1/helptag/global.h @@ -38,7 +38,7 @@ #include #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) #include #include #include @@ -170,14 +170,14 @@ struct search { EXTERN SEARCH *path INIT(NULL) ; EXTERN SEARCH **endpath INIT(&path) ; EXTERN char dirsep -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) INIT('/') #else ****define directory separator here**** #endif ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) #define CSEP '/' #define SSEP "/" #else diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c index d8652b757..ed96d7c76 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.c +++ b/cde/programs/dthelp/parser/canon1/helptag/help.c @@ -349,7 +349,7 @@ m_free(string, "GetDefaultHeaderString return"); /* construct a qualified file name */ static int mb_getqualified(char *qualname, char *unqualname) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) FILE *f; #endif @@ -374,7 +374,7 @@ else fnp = fn; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) qualname[0] = '\0'; gp = qualname + strlen(qualname); roomleft = roomleft - strlen(qualname); @@ -488,7 +488,7 @@ do { while (1); *strrchr(qualname, CSEP) = '\0'; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) #else strupr ( qualname ); #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.if b/cde/programs/dthelp/parser/canon1/helptag/help.if index 6c856cfb7..1e31834b0 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.if +++ b/cde/programs/dthelp/parser/canon1/helptag/help.if @@ -144,17 +144,6 @@ -#if defined(hpux) - { - M_WCHAR *wc_1, *wc_2; - - wc_1 = MakeWideCharString("HPUX"); - wc_2 = MakeWideCharString("m-machine"); - m_piaction(wc_1, wc_2, M_SDATA) ; - m_free(wc_1,"wide character string"); - m_free(wc_2,"wide character string"); - } -#else #if defined(_AIX) { M_WCHAR *wc_1, *wc_2; @@ -165,8 +154,7 @@ m_free(wc_1,"wide character string"); m_free(wc_2,"wide character string"); } -#else -#if defined(sun) +#elif defined(sun) { M_WCHAR *wc_1, *wc_2; @@ -180,8 +168,6 @@ m_piaction("UNDEFINED MACHINE", "m-machine", M_SDATA) ; -#endif -#endif #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/make.c b/cde/programs/dthelp/parser/canon1/helptag/make.c index 5c6ab8ef0..dbda7cfd7 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/make.c +++ b/cde/programs/dthelp/parser/canon1/helptag/make.c @@ -31,14 +31,14 @@ or invoke function pointers should be in tex.c. */ -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) #include #include #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) #undef M_PI /* M_PI is used by markup, we don't need the math PI */ #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/option.c b/cde/programs/dthelp/parser/canon1/helptag/option.c index f3c49192b..513c512b4 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/option.c +++ b/cde/programs/dthelp/parser/canon1/helptag/option.c @@ -26,7 +26,7 @@ #include "userinc.h" #include "globdec.h" -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -59,7 +59,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) { char *opts; @@ -76,7 +76,7 @@ if (opts) } } } -#endif /* hpux or _AIX or sun */ +#endif /* _AIX or sun */ /* Check helptag.opt in input directory */ if (indir) diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.c b/cde/programs/dthelp/parser/canon1/parser/parser.c index 130716661..0bd301160 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parser.c +++ b/cde/programs/dthelp/parser/canon1/parser/parser.c @@ -90,7 +90,7 @@ static char sopt[] = static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) +#if defined(_AIX) || defined(sun) || defined(__linux__) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c index 32ef2dbf1..f3e5766e1 100644 --- a/cde/programs/dthelp/parser/canon1/util/malloc.c +++ b/cde/programs/dthelp/parser/canon1/util/malloc.c @@ -55,7 +55,7 @@ void m_free(void *block, char *msg) free(block) ; if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block) ; @@ -84,7 +84,7 @@ void *m_malloc(int size, char *msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -116,7 +116,7 @@ void *m_realloc(void *ptr, int size, char *msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.c b/cde/programs/dthelp/parser/pass1/helptag/help.c index 8b31d1cea..0cbd21cea 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.c +++ b/cde/programs/dthelp/parser/pass1/helptag/help.c @@ -350,7 +350,7 @@ m_free(string, "GetDefaultHeaderString return"); /* construct a qualified file name */ static int mb_getqualified(char *qualname, char *unqualname) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) FILE *f; #endif char fn[FNAMELEN]; @@ -374,7 +374,7 @@ else fnp = fn; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) qualname[0] = '\0'; gp = qualname + strlen(qualname); roomleft = roomleft - strlen(qualname); @@ -488,7 +488,7 @@ do { while (1); *strrchr(qualname, CSEP) = '\0'; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) #else strupr ( qualname ); #endif diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.if b/cde/programs/dthelp/parser/pass1/helptag/help.if index aa43e0ccb..78d7d0c77 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.if +++ b/cde/programs/dthelp/parser/pass1/helptag/help.if @@ -133,17 +133,6 @@ <\CODE> -#if defined(hpux) - { - M_WCHAR *wc_1, *wc_2; - - wc_1 = MakeWideCharString("HPUX"); - wc_2 = MakeWideCharString("m-machine"); - m_piaction(wc_1, wc_2, M_SDATA) ; - m_free(wc_1,"wide character string"); - m_free(wc_2,"wide character string"); - } -#else #if defined(_AIX) { M_WCHAR *wc_1, *wc_2; @@ -154,8 +143,7 @@ m_free(wc_1,"wide character string"); m_free(wc_2,"wide character string"); } -#else -#if defined(sun) +#elif defined(sun) { M_WCHAR *wc_1, *wc_2; @@ -169,8 +157,6 @@ m_piaction("UNDEFINED MACHINE", "m-machine", M_SDATA) ; -#endif -#endif #endif <\CODE> diff --git a/cde/programs/dthelp/parser/pass1/helptag/make.c b/cde/programs/dthelp/parser/pass1/helptag/make.c index 7dfe88931..30e975bab 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/make.c +++ b/cde/programs/dthelp/parser/pass1/helptag/make.c @@ -31,14 +31,14 @@ or invoke function pointers should be in tex.c. */ -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) #include #include #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) #undef M_PI /* M_PI is used by markup, we don't need the math PI */ #endif diff --git a/cde/programs/dthelp/parser/pass1/helptag/option.c b/cde/programs/dthelp/parser/pass1/helptag/option.c index 32ade5beb..87eac3397 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/option.c +++ b/cde/programs/dthelp/parser/pass1/helptag/option.c @@ -28,7 +28,7 @@ void m_mberr1(char *text, const char *arg); -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -59,7 +59,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) { char *opts; @@ -76,7 +76,7 @@ if (opts) } } } -#endif /* hpux or _AIX or sun */ +#endif /* _AIX or sun */ /* Check helptag.opt in input directory */ if (indir) diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.c b/cde/programs/dthelp/parser/pass1/parser/parser.c index 1a28b615f..65eef4d8d 100644 --- a/cde/programs/dthelp/parser/pass1/parser/parser.c +++ b/cde/programs/dthelp/parser/pass1/parser/parser.c @@ -43,7 +43,7 @@ int main(int argc, char **argv) "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ; static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) +#if defined(_AIX) || defined(sun) || defined(__linux__) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c index b574fafd7..42a15e231 100644 --- a/cde/programs/dthelp/parser/pass1/util/malloc.c +++ b/cde/programs/dthelp/parser/pass1/util/malloc.c @@ -54,7 +54,7 @@ void m_free(void *block, char *msg) char buffer[32] ; if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block) ; @@ -84,7 +84,7 @@ void *m_malloc(int size, char *msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -116,7 +116,7 @@ void *m_realloc(void *ptr, int size, char *msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h index b12441cd9..5816d7221 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/global.h +++ b/cde/programs/dthelp/parser/pass2/htag2/global.h @@ -38,7 +38,7 @@ #include #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) #include #include #include diff --git a/cde/programs/dthelp/parser/pass2/htag2/option.c b/cde/programs/dthelp/parser/pass2/htag2/option.c index 1f882be20..b6e33f45c 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/option.c +++ b/cde/programs/dthelp/parser/pass2/htag2/option.c @@ -26,7 +26,7 @@ #include "userinc.h" #include "globdec.h" -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -59,7 +59,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) { char *opts; @@ -76,7 +76,7 @@ if (opts) } } } -#endif /* hpux or _AIX or sun */ +#endif /* _AIX or sun */ /* Check helptag.opt in input directory */ if (indir) diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.c b/cde/programs/dthelp/parser/pass2/parser/parser.c index 0c915da22..65277caa8 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parser.c +++ b/cde/programs/dthelp/parser/pass2/parser/parser.c @@ -43,7 +43,7 @@ void main(int argc, char **argv) "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ; static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c index ff63f1348..dfb98d84f 100644 --- a/cde/programs/dthelp/parser/pass2/util/malloc.c +++ b/cde/programs/dthelp/parser/pass2/util/malloc.c @@ -54,7 +54,7 @@ void m_free(void *block, char *msg) char buffer[32] ; if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block) ; @@ -84,7 +84,7 @@ void *m_malloc(int size, char *msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -116,7 +116,7 @@ void *m_realloc(void *ptr, int size, char *msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) +#if defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dtimsstart/env.c b/cde/programs/dtimsstart/env.c index c7358c27f..4063017f3 100644 --- a/cde/programs/dtimsstart/env.c +++ b/cde/programs/dtimsstart/env.c @@ -51,14 +51,6 @@ int set_cmd_env(void) if ((ret = read_cmd_conf()) != NoError) return ret; -# ifdef old_hpux - p = get_real_locale(uenv->locale, &aliases); - if (p) { - uenv->real_locale = NEWSTR(p); - uenv->locale_aliases = aliases; - } -# endif /* old_hpux */ - expand_cmd_conf(); return ret; @@ -170,11 +162,6 @@ int expand_string(char *in_str, char *out_str, int out_len, ImsConf *ims) case 'A': ep = conf->userAltDir; break; case 'C': ep = conf->dt->confDir; break; case 'U': ep = conf->dt->userDir; break; -# ifdef old_hpux - case 'V': ep = conf->vue->confDir; break; - case 'X': ep = conf->vue->userDir; break; -# endif /* old_hpux */ - case 'L': if (ep = uenv->real_locale) break; case 'l': ep = uenv->locale; break; case 'H': ep = uenv->homedir; break; @@ -264,13 +251,8 @@ int make_new_environ(OutEnv *oenv, UserSelection *sel) ims = sel->ent->ims; xmod = ENV_XMODIFIERS; xmod_done = False; -# ifdef old_hpux - xinput = xhp_xinput_name(NULL); - xinput_done = (xinput) ? False : True; -# else xinput = NULL; xinput_done = True; -# endif /* old_hpux */ proto = renv ? renv->proto : default_protocol(ims); setp = unsetp = 0; @@ -295,20 +277,6 @@ int make_new_environ(OutEnv *oenv, UserSelection *sel) ep++; xmod_done = True; } -# ifdef old_hpux - if (!xinput_done && (proto == Proto_Xhp)) { -#ifdef DEBUG - if (!ims->servername) { - DPR(("make_new_environ(): '%s' servername not defined\n", - sel->name)); - } -#endif - ep->name = NEWSTR(xinput); - ep->value = NEWSTR(ims->servername); - ep++; - xinput_done = True; - } -# endif /* old_hpux */ if (ep == oenv->set) { FREE(oenv->set); oenv->set = (EnvEnt *)0; } else @@ -324,13 +292,6 @@ int make_new_environ(OutEnv *oenv, UserSelection *sel) ep++; xmod_done = True; } -# ifdef old_hpux - if (!xinput_done) { - ep->name = NEWSTR(xinput); - ep++; - xinput_done = True; - } -# endif /* old_hpux */ for (i = 0; i < num && (p = unsetp[i]); i++) { if (strcmp(p, xmod) == 0 || (xinput && (strcmp(p, xinput) == 0))) continue; @@ -470,87 +431,3 @@ int set_remote_env(char *ptr, char *env_pass) Conf.remote->passEnv, env_pass, ptr)); return bp - ptr; } - -# ifdef old_hpux -char *xhp_xinput_name(char *locale) -{ - char *xinput_name = "X@INPUT"; - char **pp, *p; - int i, len; - XhpLocale *xhp = Conf.xhp; - char **ls; - char typ = 0; - - if (!xhp) return NULL; - if (!locale) locale = userEnv.locale; - - for (i = 0; !typ && i < XHP_LANG_NUM; i++) { - if (!(ls = parse_strlist(xhp[i].locales, ' '))) continue; - for (pp = ls; *pp; pp++) { - if (locale[0] != (*pp)[0]) continue; - len = strlen(p = *pp); - if ((p[len - 1] == '*' && strncmp(locale, p, len - 1) == 0) - || strcmp(locale, p) == 0) { - typ = xhp[i].type; - break; - } - } - FREE_LIST(ls); - } - if (!typ) { - DPR2(("xhp_xinput_name(%s): unknown locale\n", locale)); - return NULL; - } - - xinput_name[1] = typ; - return NEWSTR(xinput_name); -} - - -char *get_real_locale(char *locale, char ***aliases) -{ - int i; - int match_idx = -1; - LocaleAlias **alias = Conf.alias, *ap; - char **ls, **pp; - char *real_locale = NULL; - - if (!locale || !alias) return NULL; - - for (i = 0; match_idx < 0 && (ap = alias[i]); i++) { - if (strcmp(ap->name, locale) == 0) { - match_idx = i; - if (aliases) - ls = parse_strlist(ap->aliases, ' '); - break; - } - if (ls = parse_strlist(ap->aliases, ' ')) { - for (pp = ls; *pp; pp++) - if (strcmp(locale, *pp) == 0) { - match_idx = i; - break; - } - FREE_LIST(ls); - ls = (char **)NULL; - } - } - - if (match_idx >= 0) { - real_locale = alias[match_idx]->name; - if (aliases) { - *aliases = ls; - ls = (char **)NULL; - } - } else { - real_locale = NULL; - if (aliases) *aliases = (char **) NULL; - } - if (ls) FREE_LIST(ls); - - DPR(("get_real_locale(%s): real_locale=%s aliases=%s\n", - locale, real_locale, aliases ? *aliases : NULL)); - - return real_locale; -} - -# endif /* old_hpux */ diff --git a/cde/programs/dtimsstart/file.c b/cde/programs/dtimsstart/file.c index cd19ba8d7..8147c8a17 100644 --- a/cde/programs/dtimsstart/file.c +++ b/cde/programs/dtimsstart/file.c @@ -153,11 +153,6 @@ int read_cmd_conf(void) DtEnv *dt = NULL; RemoteEnv *remote; FILE *fp; -# ifdef old_hpux - VueEnv *vue; - LocaleAlias *tmp_alias[MAXIMSENT], *ap; -# endif /* old_hpux */ - conf_dir = DTIMS_CONFDIR; if (!(path = Opt.ConfPath) || !*path) { if (!(path = getenv("DTIMS_STARTCONF")) || !*path) { @@ -235,10 +230,6 @@ int read_cmd_conf(void) RENEWSTR(conf->xmod[Proto_Ximp], valp); } else if (strncmp(p, "Xsi", 3) == 0) { RENEWSTR(conf->xmod[Proto_Xsi], valp); -# ifdef old_hpux - } else if (strncmp(p, "Xhp", 3) == 0) { - RENEWSTR(conf->xmod[Proto_Xhp], valp); -# endif /* old_hpux */ } else if (strncmp(p, "None", 3) == 0) { RENEWSTR(conf->xmod[Proto_None], valp); } else @@ -251,10 +242,6 @@ int read_cmd_conf(void) RENEWSTR(conf->atom[Proto_Ximp], valp); } else if (strncmp(p, "Xsi", 3) == 0) { RENEWSTR(conf->atom[Proto_Xsi], valp); -# ifdef old_hpux - } else if (strncmp(p, "Xhp", 3) == 0) { - RENEWSTR(conf->atom[Proto_Xhp], valp); -# endif /* old_hpux */ } else if (strncmp(p, "None", 3) == 0) { RENEWSTR(conf->atom[Proto_None], valp); } else @@ -281,47 +268,6 @@ int read_cmd_conf(void) RENEWSTR(remote->passEnv, valp); } else goto _inv; -# ifdef old_hpux - } else if (strncmp(lp, "Vue", 3) == 0) { - p = lp + 3; - if (!conf->vue) vue = conf->vue = ALLOC(1, VueEnv); - if (strncmp(p, "ConfigDir", 4) == 0) { - RENEWSTR(vue->confDir, valp); - } else if (strncmp(p, "UserDir", 5) == 0) { - RENEWSTR(vue->userDir, valp); - } else if (strncmp(p, "UseLiteFile", 5) == 0) { - RENEWSTR(vue->uselite, valp); - } else if (strncmp(p, "LiteResourcePath", 5) == 0) { - RENEWSTR(vue->litePath, valp); - } else if (strncmp(p, "ResourcePath", 5) == 0) { - RENEWSTR(vue->resPath, valp); - } else - goto _inv; - } else if (strncmp(lp, "LocaleAlias", 6) == 0) { - ap = ALLOC(1, LocaleAlias); - p = valp; cut_field(valp); - ap->name = NEWSTR(p); - ap->aliases = NEWSTR(valp); - tmp_alias[num_alias++] = ap; - } else if (strncmp(lp, "XhpLocales", 3) == 0) { - int idx = 0; - p = strrchr(lp, '.'); - if (!p) continue; /* invalid */ - switch (p[1]) { - case 'J': idx = XHP_JPN; break; - case 'K': idx = XHP_KOR; break; - case 'C': idx = XHP_CHS; break; - case 'T': idx = XHP_CHT; break; - default: goto _inv; - } - if (!conf->xhp) - conf->xhp = ALLOC(XHP_LANG_NUM, XhpLocale); - else if (conf->xhp[idx].locales) { - FREE(conf->xhp[idx].locales); - } - conf->xhp[idx].type = p[1]; - conf->xhp[idx].locales = NEWSTR(valp); -# endif /* old_hpux */ } else { _inv: DPR(("\t[line=%d] invalid entry '%s'\n", line_num, lp)); @@ -329,15 +275,6 @@ int read_cmd_conf(void) } fclose(fp); -# ifdef old_hpux - if (num_alias > 0) { - conf->alias = ALLOC(num_alias + 1, LocaleAlias *); - memcpy((void *)conf->alias, (void *)tmp_alias, - num_alias*sizeof(LocaleAlias *)); - conf->alias[num_alias] = (LocaleAlias *)0; - } -# endif /* old_hpux */ - /* if (remote->disabled) FREE(remote->passEnv); */ _default: @@ -353,11 +290,6 @@ _default: if (!conf->dt) conf->dt = ALLOC(1, DtEnv); if (!conf->dt->confDir) conf->dt->confDir = NEWSTR(DT_CONFDIR); if (!conf->dt->userDir) conf->dt->userDir = NEWSTR(DT_USERDIR); -# ifdef old_hpux - if (!conf->vue) conf->vue = ALLOC(1, VueEnv); - if (!conf->vue->confDir) conf->vue->confDir = NEWSTR(VUE_CONFDIR); - if (!conf->vue->userDir) conf->vue->userDir = NEWSTR(VUE_USERDIR); -# endif /* old_hpux */ if (!conf->xmod[Proto_XIM]) conf->xmod[Proto_XIM] = NEWSTR(IM_XMOD_XIM); if (!conf->xmod[Proto_Ximp]) conf->xmod[Proto_Ximp] = NEWSTR(IM_XMOD_XIMP); if (!conf->xmod[Proto_Xsi]) conf->xmod[Proto_Xsi] = NEWSTR(IM_XMOD_XSI); @@ -401,15 +333,6 @@ int expand_cmd_conf(void) CHK_ADD(conf->dt->userDir) CHK_ADD(conf->dt->resPath) } -# ifdef old_hpux - if (conf->vue) { - CHK_ADD(conf->vue->confDir) - CHK_ADD(conf->vue->userDir) - CHK_ADD(conf->vue->uselite) - CHK_ADD(conf->vue->resPath) - CHK_ADD(conf->vue->litePath) - } -# endif /* old_hpux */ /* xmod[] & atom[] must not be expanded, since no ims selected */ /* remote->* should be expanded at preparation of remote exec */ @@ -498,10 +421,6 @@ int read_imsconf(ImsConf *conf, char *ims_name, char *ims_fname) SET_FLAG(F_NO_REMOTE); else if (strcmp(lp, "no_option") == 0) SET_FLAG(F_NO_OPTION); -# ifdef old_hpux - else if (strcmp(lp, "try_connect") == 0) - SET_FLAG(F_TRY_CONNECT); -# endif /* old_hpux */ else if (strcmp(lp, "has_window") == 0) SET_FLAG(F_HAS_WINDOW); #undef SET_FLAG @@ -1046,48 +965,6 @@ static int user_selection_fname(char *buf, int buf_len, int dpy_specific) } len = expand_string(dpy_specific ? "%S/%d/" : "%S/", buf, buf_len, 0); -# ifdef old_hpux - if (!real_done && uenv->real_locale) { - real_done = True; - strcpy(buf + len, uenv->real_locale); - if (!is_readable(buf, True)) { - bool rename_done = False; - char buf2[MAXPATHLEN], *bp; - - strncpy(buf2, buf, len); - bp = buf2 + len; *bp = 0; - if (strcmp(uenv->locale, uenv->real_locale)) { - strcpy(bp, uenv->locale); - if (is_readable(buf2, False)) { - rename_done = rename(buf2, buf) == 0; - DPR(("user_selection_fname(): rename(%s, %s) %s\n", - uenv->locale, uenv->real_locale, - rename_done ? "OK" : "Failed")); - } - } - - if (uenv->locale_aliases) { - char **ap; - for (ap = uenv->locale_aliases; *ap; ap++) { - strcpy(bp, *ap); - if (!is_readable(buf2, False)) continue; - if (rename_done) { - (void) unlink(buf2); - DPR(("user_selection_fname(): unlink(%s) %s\n", - *ap)); - } else { - rename_done = rename(buf2, buf) == 0; - DPR(("user_selection_fname(): rename(%s, %s) %s\n", - *ap, uenv->real_locale, - rename_done ? "OK" : "Failed")); - } - } - } - /* real_done = rename_done; */ - } - } -# endif /* old_hpux */ - /* Add the CDE-generic locale name */ strcpy(buf + len, real_done ? uenv->real_locale : uenv->CDE_locale); buf[buf_len-1] = 0; @@ -1104,9 +981,6 @@ int parse_protolist(char *valp) if (strstr(valp, "XIM")) proto_bits |= ProtoBit(Proto_XIM); if (strstr(valp, "Ximp")) proto_bits |= ProtoBit(Proto_Ximp); if (strstr(valp, "Xsi")) proto_bits |= ProtoBit(Proto_Xsi); -# ifdef old_hpux - if (strstr(valp, "Xhp")) proto_bits |= ProtoBit(Proto_Xhp); -# endif /* old_hpux */ if (strstr(valp, "None")) proto_bits |= ProtoBit(Proto_None); return proto_bits; } @@ -1116,9 +990,6 @@ int default_protocol(ImsConf *conf) if (conf->protocols & ProtoBit(Proto_XIM)) return Proto_XIM; else if (conf->protocols & ProtoBit(Proto_Ximp)) return Proto_Ximp; else if (conf->protocols & ProtoBit(Proto_Xsi)) return Proto_Xsi; -# ifdef old_hpux - else if (conf->protocols & ProtoBit(Proto_Xhp)) return Proto_Xhp; -# endif /* old_hpux */ else return Proto_None; } diff --git a/cde/programs/dtimsstart/main.c b/cde/programs/dtimsstart/main.c index 8756e2183..4a3b3b60c 100644 --- a/cde/programs/dtimsstart/main.c +++ b/cde/programs/dtimsstart/main.c @@ -845,12 +845,6 @@ static int parse_options(int argc, char **argv) SET_FLAG(FLAG_CONNECT); } else if (optname_match("dt", opt, 2)) { SET_FLAG(FLAG_DT); -# ifdef old_hpux - CLR_FLAG(FLAG_VUE); - } else if (optname_match("vue", opt, 2)) { - SET_FLAG(FLAG_VUE); - CLR_FLAG(FLAG_DT); -# endif /* old_hpux */ } else if (optname_match("window", opt, 2)) { SET_FLAG(FLAG_WINDOW); } else if (optname_match("nowindow", opt, 4)) { @@ -1062,10 +1056,6 @@ static OptDesc opts_internal[] = { { "-notimeout", "do not timeout" }, { "-noremote", "disable remote execution" }, { "-notify", "print error code to stderr" }, -# ifdef old_hpux - { "-vue", "in VUE environment" }, - { "-connect", "enable try_connect" }, -# endif /* old_hpux */ #ifdef SelectMode_ONCE { "-once", "auto-selection once selected" }, #endif /* SelectMode_ONCE */ diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c index afd145616..d509e7545 100644 --- a/cde/programs/dtimsstart/start.c +++ b/cde/programs/dtimsstart/start.c @@ -45,12 +45,6 @@ static void on_sig_chld(/* sig */); static bool is_ims_running(/* renv, ims */); static int settle_ims(/* sel */); static Window property_owner(/* prop_atom, prop_str */); -# ifdef old_hpux -static void catch_alarm(/* sig */); -static int try_connection(/* sel */); -static int create_dummy_ic(/* xim */); -# endif /* old_hpux */ - void ximsStart(void) { @@ -185,12 +179,6 @@ void ximsWaitDone(void) case ErrImsWaitDone: sel->status = NoError; -# ifdef old_hpux - if ((OpFlag & FLAG_CONNECT) - || (sel->ent->ims->flags & F_TRY_CONNECT)) { - sel->status = try_connection(sel); - } -# endif /* old_hpux */ break; case ErrImsConnecting: @@ -360,11 +348,6 @@ int load_resources(void) if (isDT()) { sess_res = find_session_resfile(RES_TYPE_DT); } -# ifdef old_hpux - else if (isVUE()) { - sess_res = find_session_resfile(RES_TYPE_VUE); - } -# endif /* old_hpux */ if (sess_res && !is_readable(sess_res, False)) { FREE(sess_res); sess_res = NULL; @@ -407,17 +390,6 @@ static char *find_session_resfile(int res_type) if (res_type == RES_TYPE_DT) { /* DT */ res = Conf.dt ? (Conf.dt)->resPath : NULL; } -# ifdef old_hpux - else if (res_type == RES_TYPE_VUE && Conf.vue) { /* VUE */ - VueEnv *vue = Conf.vue; - res = vue->resPath; - if (vue->uselite) { - expand_string(vue->uselite, path, MAXPATHLEN, (ImsConf *)0); - if (access(path, R_OK) == 0) - res = vue->litePath; - } - } -# endif /* old_hpux */ if (!res) return NULL; if (ls = parse_strlist(res, ':')) { @@ -490,12 +462,6 @@ static int build_run_env(UserSelection *sel) renv->atom_name = NEWSTR(buf); } else { /* copy im_mod, instead */ renv->atom_name = NEWSTR(renv->im_mod); -# ifdef old_hpux - if ((p = renv->atom_name) && strchr(p, '#')) { - while (p = strchr(p, '#')) /* replace '#' with '@' */ - *p++ = '@'; - } -# endif /* old_hpux */ } /* others */ @@ -768,177 +734,3 @@ static Window property_owner(Atom *prop_atom, char *prop_str) } return XGetSelectionOwner(Dpy, property); } - - -# ifdef old_hpux - /* ***** try_connection ***** */ - -#define MAX_RETRY 5 - -static jmp_buf jmp_env; -static Window dmy_win = 0; /* temporary window used for XCreateIC() */ - -static void catch_alarm(int sig) -{ - signal(SIGALRM, SIG_IGN); - alarm(0); - longjmp(jmp_env, 1); -} - -static int try_connection(UserSelection *sel) -{ - RunEnv *renv = sel->renv; - ImsConf *ims = sel->ent->ims; - char envbuf[BUFSIZ], *bp; - XIM xim; - int ic_ok, retry_cnt; - static char *saved_xmod = NULL; -#ifdef DEBUG - time_t last_time; -#endif - - DPR(("try_connection(%s):\n", sel->name)); - - if (sel->status != NoError || !renv->im_mod) - return sel->status; - - renv->status = ErrImsConnecting; - set_sig_chld(True); - - /* set XMODIFIERS */ - saved_xmod = NULL; - bp = strcpyx(envbuf, ENV_MOD_IM); - bp = strcpyx(bp, renv->im_mod); - saved_xmod = XSetLocaleModifiers(envbuf); - DPR(("\tXSetLocaleModifiers(%s)\n", envbuf)); - - ic_ok = False; - if (setjmp(jmp_env) == 0) { - signal(SIGALRM, catch_alarm); - alarm(Opt.Timeout); - - for (retry_cnt = 0; !ic_ok && retry_cnt <= MAX_RETRY; retry_cnt++) { - if (retry_cnt) sleep(retry_cnt * retry_cnt); - -#ifdef DEBUG - last_time = time((time_t)0); -#endif - xim = XOpenIM(Dpy, (XrmDatabase)0, ims->servername, ims->classname); - if (xim) { - DPR(("try_connection(%d): XOpenIM() OK [%d sec.]", - retry_cnt, time((time_t)0) - last_time)); -#ifdef DEBUG - last_time = time((time_t)0); -#endif - ic_ok = create_dummy_ic(xim); - DPR(("\tXCreateIC() %s [%d sec.]\n", - ic_ok ? "OK" : "Failed", time((time_t)0) - last_time)); - XCloseIM(xim); xim = 0; - } else { - DPR(("try_connection(%d): XOpenIM() failed.\n", retry_cnt)); - ic_ok = False; - } - } - } else { /* long_jmp() by alarm [timeout] */ - alarm(0); signal(SIGALRM, SIG_IGN); - DPR(("try_connection(): XOpenIM() & XCreateIC() timed-out.\n")); - if (dmy_win) { - XDestroyWindow(Dpy, dmy_win); dmy_win = 0; - } - /* neither XDestroyIC() nor XCloseIM() should be called */ - xim = 0; - ic_ok = False; - } - alarm(0); signal(SIGALRM, SIG_IGN); - - /* restore XMODIFIERS */ - if (saved_xmod) { - DPR2(("\tXSetLocaleModifiers(save='%s')\n", saved_xmod)); - XSetLocaleModifiers(saved_xmod); - } - - set_sig_chld(False); - renv->status = ErrImsConnectDone; - - return ic_ok ? NoError : ErrImsTimeout; /* ErrImsConnect; */ -} - -static int create_dummy_ic(XIM xim) -{ - int scr; - XFontSet fset; - XIMStyles *im_styles; - XIMStyle style; - XIC ic; - unsigned long fg, bg; - XRectangle area; - XVaNestedList status_attr; - - scr = DefaultScreen(Dpy); - fg = BlackPixel(Dpy, scr); - bg = WhitePixel(Dpy, scr); - dmy_win = XCreateSimpleWindow(Dpy, RootWindow(Dpy, scr), - 0, 0, 1, 1, 0, bg, fg); - - /* search (PreeditNothing | StatusNothing [or StatusArea]) style */ - ic = 0; - style = (XIMStyle) 0; - im_styles = (XIMStyles *) 0; - if (XGetIMValues(xim, XNQueryInputStyle, &im_styles, NULL)) { - DPR(("create_dummy_ic(): XGetIMValues(XNQueryInutStyle) failed.\n")); - goto _err; - } - if (!im_styles || !im_styles->count_styles) { - DPR(("create_dummy_ic(): No input styles supported on IMS.\n")); - if (im_styles) XFree(im_styles); - goto _err; - } - if ((int)im_styles->count_styles > 0) { - int i, alt; - for (i = 0, alt = -1; i < (int)im_styles->count_styles; i++) - if (im_styles->supported_styles[i] & XIMPreeditNothing) { - if (im_styles->supported_styles[i] & XIMStatusNothing) { - style = im_styles->supported_styles[i]; - break; - } else if (im_styles->supported_styles[i] & XIMStatusArea) { - alt = i; - } - } - if (!style && alt >= 0) style = im_styles->supported_styles[alt]; - XFree(im_styles); - } - if (!style) { - DPR(("create_dummy_ic(): 'PreeditNothing' styles not supported.\n")); - goto _err; - /* style = XIMPreeditNothing | XIMStatusNothing; */ - } - - fset = 0; - status_attr = (XVaNestedList) 0; - if (style & XIMStatusArea) { - area.x = area.y = 0; area.width = area.height = 1; - status_attr = XVaCreateNestedList(NULL, - XNArea, &area, - XNForeground, fg, - XNBackground, bg, - XNFontSet, fset, - NULL ); - } - - ic = XCreateIC(xim, XNInputStyle, style, - XNClientWindow, dmy_win, - XNStatusAttributes, status_attr, - XNFocusWindow, dmy_win, - NULL ); - - /* if (fset) XFreeFontSet(Dpy, fset); */ - if (ic) XDestroyIC(ic); - -_err: - if (dmy_win) XDestroyWindow(Dpy, dmy_win); - dmy_win = 0; - - return ic ? True : False; -} - -# endif /* old_hpux */ diff --git a/cde/programs/dtimsstart/util.c b/cde/programs/dtimsstart/util.c index e359c319d..a7dabd674 100644 --- a/cde/programs/dtimsstart/util.c +++ b/cde/programs/dtimsstart/util.c @@ -700,28 +700,6 @@ void clear_CmdConf(void) FREE(conf->dt->resPath); FREE(conf->dt); } -# ifdef old_hpux - if (conf->vue) { - FREE(conf->vue->confDir); - FREE(conf->vue->userDir); - FREE(conf->vue->uselite); - FREE(conf->vue->resPath); - FREE(conf->vue->litePath); - FREE(conf->vue); - } - if (conf->alias) { - for (ap = conf->alias; *ap; ap++) { - FREE((*ap)->name); - FREE((*ap)->aliases); - } - FREE(conf->alias); - } - if (conf->xhp) { - for (i = 0; i < XHP_LANG_NUM; i++) - FREE(conf->xhp[i].locales); - FREE(conf->xhp); - } -# endif /* old_hpux */ } CLR(&Conf, CmdConf); cmdconf_initialized = False; @@ -803,11 +781,7 @@ void pr_ImsConf(ImsConf *conf, char *ims_name) (conf->protocols & ProtoBit(Proto_XIM)) ? "XIM," : NULL, (conf->protocols & ProtoBit(Proto_Ximp)) ? "Ximp," : NULL, (conf->protocols & ProtoBit(Proto_Xsi)) ? "Xsi," : NULL, -# ifdef old_hpux - (conf->protocols & ProtoBit(Proto_Xhp)) ? "Xhp," : NULL, -# else NULL, -# endif /* old_hpux */ (conf->protocols & ProtoBit(Proto_None)) ? "None," : NULL); fprintf(LogFp, "\tproperty=%s servername=%s (%s) class=%s\n", conf->property, conf->servername, @@ -903,9 +877,6 @@ void pr_CmdConf(void) { int i; CmdConf *conf = &Conf; -# ifdef old_hpux - LocaleAlias **ap; -# endif /* old_hpux */ char **p; fprintf(LogFp, "CmdConf:\n"); @@ -918,21 +889,12 @@ void pr_CmdConf(void) fprintf(LogFp, "\tuserTmpDir=%s\n", conf->userTmpDir); fprintf(LogFp, "\tuserAltDir=%s\n", conf->userAltDir); -# ifdef old_hpux - fprintf(LogFp, "\tImXmod:\tXIM=%s Ximp=%s Xsi=%s Xhp=%s None=%s\n", - conf->xmod[Proto_XIM], conf->xmod[Proto_Ximp], - conf->xmod[Proto_Xsi], conf->xmod[Proto_Xhp], conf->atom[Proto_None]); - fprintf(LogFp, "\tImAtom:\tXIM=%s Ximp=%s Xsi=%s Xhp=%s None=%s\n", - conf->atom[Proto_XIM], conf->atom[Proto_Ximp], - conf->atom[Proto_Xsi], conf->atom[Proto_Xhp], conf->atom[Proto_None]); -# else fprintf(LogFp, "\tImXmod:\tXIM=%s Ximp=%s Xsi=%s None=%s\n", conf->xmod[Proto_XIM], conf->xmod[Proto_Ximp], conf->xmod[Proto_Xsi], conf->atom[Proto_None]); fprintf(LogFp, "\tImAtom:\tXIM=%s Ximp=%s Xsi=%s None=%s\n", conf->atom[Proto_XIM], conf->atom[Proto_Ximp], conf->atom[Proto_Xsi], conf->atom[Proto_None]); -# endif /* old_hpux */ fprintf(LogFp, "\tAction[%d]:\t{ ", NUM_ACTIONS); for (i = 0; i < NUM_ACTIONS; i++) @@ -952,29 +914,6 @@ void pr_CmdConf(void) } else fprintf(LogFp, "\tDtEnv:\t\n"); -# ifdef old_hpux - if (conf->vue) { - fprintf(LogFp, "\tVueEnv:\tConfDir=%s UserDir=%s\n", - conf->vue->confDir, conf->vue->userDir); - fprintf(LogFp, "\t uselite=%s\n", conf->vue->uselite); - fprintf(LogFp, "\t resPath=\"%s\"\n", conf->vue->resPath); - fprintf(LogFp, "\t litePath=\"%s\"\n", conf->vue->litePath); - } else - fprintf(LogFp, "\tVueEnv:\t\n"); - - fprintf(LogFp, "\tlocaleAlias:\t%s\n", conf->alias ? NULL : "None"); - if (conf->alias) { - for (ap = conf->alias; *ap; ap++) - fprintf(LogFp, "\t [%s]\t%s\n", (*ap)->name, (*ap)->aliases); - } - - fprintf(LogFp, "\txhp:\t%s\n", conf->xhp ? NULL : "None"); - if (conf->xhp) { - for (i = 0; i < XHP_LANG_NUM; i++) - fprintf(LogFp, "\t [%c]\t%s\n", - conf->xhp[i].type, conf->xhp[i].locales); - } -# endif /* old_hpux */ } void pr_CmdOpt(void) @@ -1018,9 +957,6 @@ void pr_OpModeFlag(void) if (OpFlag & FLAG_REMOTERUN) fputs("RemoteRun, ", LogFp); if (OpFlag & FLAG_WINDOW) fputs("Window, ", LogFp); if (OpFlag & FLAG_DT) fputs("Dt, ", LogFp); -# ifdef old_hpux - if (OpFlag & FLAG_VUE) fputs("Vue, ", LogFp); -# endif /* old_hpux */ } putc('\n', LogFp); } @@ -1132,11 +1068,7 @@ char *error_name(ximsError error) static char *_proto_names[NUM_PROTOCOLS] = -# ifdef old_hpux - { "None", "XIM", "Ximp", "Xsi", "Xhp" }; -# else { "None", "XIM", "Ximp", "Xsi" }; -# endif /* old_hpux */ char *proto_name(int proto_idx) { diff --git a/cde/programs/dtimsstart/xims.h b/cde/programs/dtimsstart/xims.h index dcc9d53cb..ed3315225 100644 --- a/cde/programs/dtimsstart/xims.h +++ b/cde/programs/dtimsstart/xims.h @@ -72,16 +72,9 @@ #define FLAG_REMOTERUN (1<<9) /* -remoterun option */ #define FLAG_WINDOW (1<<10) /* -window option */ #define FLAG_DT (1<<11) /* -dt option */ -# ifdef old_hpux -#define FLAG_VUE (1<<12) /* -vue option */ -# endif /* old_hpux */ #define FLAG_DEFAULT (FLAG_DT) -# ifdef old_hpux -#define USE_WINDOW_MASK (FLAG_WINDOW|FLAG_VUE|FLAG_DT) -# else #define USE_WINDOW_MASK (FLAG_WINDOW|FLAG_DT) -# endif /* old_hpux */ #define MAXIMSENT 32 /* max # of ims for each locale */ @@ -122,12 +115,7 @@ #define Proto_XIM 1 #define Proto_Ximp 2 #define Proto_Xsi 3 -# ifdef old_hpux -#define Proto_Xhp 4 -#define NUM_PROTOCOLS 5 -# else #define NUM_PROTOCOLS 4 -# endif /* old_hpux */ /* protocol flag */ #define ProtoBit(i) (1<<(i)) @@ -167,15 +155,6 @@ #define HOST_REMOTE 1 #define HOST_UNKNOWN 2 -# ifdef old_hpux - /* index for XhpLocale */ -#define XHP_JPN 0 -#define XHP_KOR 1 -#define XHP_CHS 2 -#define XHP_CHT 3 -#define XHP_LANG_NUM 4 -# endif /* old_hpux */ - /* message type for put_msg_win() */ #define MSGTYP_INFO 0 #define MSGTYP_WARN 1 @@ -244,26 +223,6 @@ typedef struct { EnvEnt *unset; } OutEnv; -# ifdef old_hpux -typedef struct { - char *name; - char *aliases; -} LocaleAlias; - -typedef struct { - char type; - char *locales; -} XhpLocale; - -typedef struct { - char *confDir; /* override /etc/vue/config */ - char *userDir; /* override .vue */ - char *uselite; /* $HOME/.vue/sessions/usevuelite */ - char *resPath; /* path of session resource (colon separated) */ - char *litePath; -} VueEnv; -# endif /* old_hpux */ - typedef struct { char *confDir; /* override /usr/dt/config */ char *userDir; /* override .dt */ @@ -391,11 +350,6 @@ typedef struct { char *action[NUM_ACTIONS]; /* actions internally used */ DtEnv *dt; RemoteEnv *remote; -# ifdef old_hpux - VueEnv *vue; - XhpLocale *xhp; - LocaleAlias **alias; -# endif /* old_hpux */ } CmdConf; typedef struct { @@ -447,13 +401,8 @@ Extern int LastErrMsg; #undef Extern -# ifdef old_hpux -#define isXsession() ((OpFlag & (FLAG_VUE|FLAG_DT)) ? True : False) -#define isVUE() ((OpFlag & FLAG_VUE) ? True : False) -# else #define isXsession() ((OpFlag & FLAG_DT) ? True : False) #define isVUE() (False) -# endif /* old_hpux */ #define isDT() ((OpFlag & FLAG_DT) ? True : False) #define useWINDOW() \ (((OpFlag & USE_WINDOW_MASK) || window_env_ok()) ? True : False) diff --git a/cde/programs/dtimsstart/ximspath.h b/cde/programs/dtimsstart/ximspath.h index 23ad46a85..40ac7fbad 100644 --- a/cde/programs/dtimsstart/ximspath.h +++ b/cde/programs/dtimsstart/ximspath.h @@ -101,12 +101,6 @@ #define XRDB_PATH "/usr/bin/X11/xrdb" #define DTSESSION_RES_PATH "/usr/dt/bin/dtsession_res" -# ifdef old_hpux - /* VUE dirs */ -#define VUE_CONFDIR "/etc/vue/config" -#define VUE_USERDIR "%H/.vue" -# endif /* old_hpux */ - /* DT dirs */ #define DT_CONFDIR "/usr/dt/config" #define DT_USERDIR "%H/.dt" diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C index e2928cf57..b8252b283 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C @@ -99,7 +99,7 @@ int BookmarkEdit::g_modified_count = 0; #define THIS_CLASS BookmarkEdit #define ON_ACTIVATE(WOBJ,FUNC) \ (WOBJ).SetActivateCallback (this, (WWL_FUN) &THIS_CLASS::FUNC) -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) #define BUTTON(PARENT,NAME) \ WXmPushButtonGadget NAME (PARENT, #NAME, WAutoManage); \ ON_ACTIVATE (NAME, NAME) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh index 7c75f0983..2e1a6c408 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh @@ -93,9 +93,6 @@ protected: // variables WXmPushButtonGadget f_ok; bool f_modified; WCallback *f_wm_delete_callback; -#ifndef hpux static List g_editor_list; -#endif - static int g_modified_count; }; diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C index acc46e11e..c10ba3a35 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C @@ -247,16 +247,6 @@ GraphicAgent::create_ui() DECL (WXmForm, form, f_shell, "form" ); DECLMC(WXmMenuBar, menu_bar, form, "menu_bar" ); -#ifdef hpux - // - // rtp: hard-wire the menu bar's background, since - // it comes up a bogus color. Copied from swm's - // change in NodeWindowAgentMotif.C - // - Pixel bg = form.Background(); - menu_bar.Background(bg); - -#endif DECLM (WXmCascadeButton, file, menu_bar, "file" ); DECLMC(WXmPulldownMenu, file_menu, menu_bar, "file_menu" ); DECLM (WXmPushButton, attach, file_menu, "attach" ); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C index ef75f934e..4fb191b8e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C @@ -237,7 +237,7 @@ public: #define IS_CHANGED(X) (((Value *) (X).UserData())->changed) #define SET_CHANGED(X,V) ((Value *) (X).UserData())->changed = V -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) #define ATTACH_VALUE(X,T,V) (X).UserData ((void *) new T##Value(V)) #define SET_VALUE(X,T,V) ((T##Value *) (X).UserData())->set_value(V) #define ORIGINAL_VALUE(X,T) ((T##Value *) (X).UserData())->original diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh index 729c11398..4c6c2fc6d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh @@ -74,7 +74,7 @@ class WTopLevelShell; #endif // This belongs in f'ing config.h -#if defined(SVR4) || defined(hpux) +#if defined(SVR4) # define pid_type pid_t #else # define pid_type int diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh b/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh index aee1c62ab..09ac84305 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh @@ -46,7 +46,7 @@ * Campbell, CA 95008 * */ -#if defined(SVR4) || defined(hpux) || defined(__linux__) || defined(__NetBSD__) +#if defined(SVR4) || defined(__linux__) || defined(__NetBSD__) #include #else #include diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh index 64c57fc60..cd1ce6838 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh @@ -54,7 +54,7 @@ typedef void (FolioObject::* notify_handler_t) (FolioObject *object, u_int notify_type, void *call_data, void *client_data); -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) #define DEF_CLASS(C) \ virtual ClassType type() const; \ static ClassType C##Class diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/PrefMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/PrefMgr.C index ef95ac755..78c83c59b 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/PrefMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/PrefMgr.C @@ -80,7 +80,7 @@ pref_mgr() } #endif -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) # define DEFSYM(S) PrefSymbol PrefMgr::S = (PrefSymbol) #S #else # define DEFSYM(S) PrefSymbol PrefMgr::S = (PrefSymbol) "S" diff --git a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C index b621843a5..e70c885b8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C @@ -177,10 +177,6 @@ static unsigned char anno_double_bits[] = { #include #endif -#ifdef hpux -typedef void (*SIG_PF)(); -#endif - #include #include @@ -1599,7 +1595,7 @@ WindowSystem::interrupt_handler (int /* signal_number */) exit(1); } -#if defined(SVR4) || defined(hpux) || defined(_IBMR2) +#if defined(SVR4) || defined(_IBMR2) signal (SIGINT, (interrupt_handler_ptr)interrupt_handler); #endif } diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C b/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C index a5e104b24..8464aa805 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C @@ -63,7 +63,7 @@ #include #include #include -#if !defined(hpux) && !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun) +#if !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun) #include #endif #include diff --git a/cde/programs/dtinfo/dtinfo/src/Templates.C b/cde/programs/dtinfo/dtinfo/src/Templates.C index e03f05c61..b9d067efd 100644 --- a/cde/programs/dtinfo/dtinfo/src/Templates.C +++ b/cde/programs/dtinfo/dtinfo/src/Templates.C @@ -422,7 +422,7 @@ typedef CC_TPtrDlist _ccTPtrDLstCvSegmnt_; #endif -#if defined(sun) | defined(hpux) +#if defined(sun) typedef UAS_Pointer _ptrString_; typedef UAS_Pointer _ptrCommon_; diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Sender.hh b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Sender.hh index dc5764c80..2c573b81e 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Sender.hh +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Sender.hh @@ -27,7 +27,7 @@ # include "UAS_PtrList.hh" #ifndef CONCAT -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) #define CONCAT(A,B) A##B #define CONCAT3(A,B,C) A##B##C #else diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Test/UserPreference.C b/cde/programs/dtinfo/dtinfo/src/UAS/Test/UserPreference.C index 73a1d953f..6fc3b9e2f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Test/UserPreference.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Test/UserPreference.C @@ -60,9 +60,7 @@ #include #include #include -#ifndef hpux #include -#endif #include #include #include diff --git a/cde/programs/dtinfo/dtinfo/src/config.h b/cde/programs/dtinfo/dtinfo/src/config.h index 3d0c9b5f1..4f899d05a 100644 --- a/cde/programs/dtinfo/dtinfo/src/config.h +++ b/cde/programs/dtinfo/dtinfo/src/config.h @@ -109,7 +109,7 @@ typedef unsigned char u_char; #define self *this #ifndef STRINGIFY -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) #define STRINGIFY(S) #S #else #define STRINGIFY(S) "S" @@ -117,7 +117,7 @@ typedef unsigned char u_char; #endif #ifndef CONCAT -#if defined(__STDC__) || defined(hpux) +#if defined(__STDC__) #define CONCAT(A,B) A##B #define CONCAT3(A,B,C) A##B##C #else diff --git a/cde/programs/dtinfo/dtinfo/src/main.C b/cde/programs/dtinfo/dtinfo/src/main.C index 9ae141476..8d44d1d35 100644 --- a/cde/programs/dtinfo/dtinfo/src/main.C +++ b/cde/programs/dtinfo/dtinfo/src/main.C @@ -305,17 +305,3 @@ main(int argc, char **argv) return (0); } - -#ifdef hpux - -extern "C" { -void DosClose () { cerr << "DosClose\n"; } -void DosWrite () { cerr << "DosWrite\n"; } -void DosPeekNmPipe () { cerr << "DosPeekNmPipe\n"; } -void DosDisconnectNmPipe () { cerr << "DosDisconnectNmPipe\n"; } -void DosMakeNmPipe () { cerr << "DosMakeNmPipe\n"; } -void DosConnectNmPipe () { cerr << "DosConnectNmPipe\n"; } -void DosRead () { cerr << "DosRead\n"; } -} - -#endif diff --git a/cde/programs/dtlogin/account.c b/cde/programs/dtlogin/account.c index dc506c7bd..a9721c862 100644 --- a/cde/programs/dtlogin/account.c +++ b/cde/programs/dtlogin/account.c @@ -283,9 +283,6 @@ Account( struct display *d, char *user, char *line, pid_t pid, if (type == LOGIN_PROCESS && d->displayType.location != Local ) { #ifndef SVR4 snprintf(u->ut_host, sizeof(u->ut_host), "%s", d->name); -#endif -#ifdef __hpux - u->ut_addr = 0; #endif } diff --git a/cde/programs/dtlogin/auth.c b/cde/programs/dtlogin/auth.c index 64f807f40..ebbe51598 100644 --- a/cde/programs/dtlogin/auth.c +++ b/cde/programs/dtlogin/auth.c @@ -113,7 +113,7 @@ extern int errno; # include #endif -#if (defined(_POSIX_SOURCE) && !defined(AIXV3)) || defined(hpux) || defined(USG) || defined(SVR4) +#if (defined(_POSIX_SOURCE) && !defined(AIXV3)) || defined(SVR4) #define NEED_UTSNAME #include #endif @@ -747,7 +747,7 @@ DefineLocal (FILE *file, Xauth *auth) #ifdef NEED_UTSNAME - /* hpux: + /* * Why not use gethostname()? Well, at least on my system, I've had to * make an ugly kernel patch to get a name longer than 8 characters, and * uname() lets me access to the whole string (it smashes release, you @@ -760,9 +760,7 @@ DefineLocal (FILE *file, Xauth *auth) strcpy(displayname, name.nodename); } writeAddr (FamilyLocal, strlen (displayname), displayname, file, auth); -#endif - -#if (!defined(NEED_UTSNAME) || defined (hpux)) +#else /* AIXV3: * In AIXV3, _POSIX_SOURCE is defined, but uname gives only first * field of hostname. Thus, we use gethostname instead. @@ -952,7 +950,7 @@ DefineSelf (int fd, int file, int auth) struct sockaddr_in *inetaddr; - /* hpux: + /* * Why not use gethostname()? Well, at least on my system, I've had to * make an ugly kernel patch to get a name longer than 8 characters, and * uname() lets me access to the whole string (it smashes release, you diff --git a/cde/programs/dtlogin/bls/validate.c b/cde/programs/dtlogin/bls/validate.c index 028193416..26da467b8 100644 --- a/cde/programs/dtlogin/bls/validate.c +++ b/cde/programs/dtlogin/bls/validate.c @@ -45,7 +45,6 @@ ** ** BLS HP BLS B1 simple authentication. ** - ** __hpux HP-UX OS only ** **************************************************************************** ************************************<+>*************************************/ diff --git a/cde/programs/dtlogin/chooser.c b/cde/programs/dtlogin/chooser.c index 18084f2ec..4986e22f4 100644 --- a/cde/programs/dtlogin/chooser.c +++ b/cde/programs/dtlogin/chooser.c @@ -124,18 +124,12 @@ extern XtPointer _XmStringUngenerate ( #define ishexdigit(c) (isdigit(c) || 'a' <= (c) && (c) <= 'f') #endif -#ifdef hpux -# include -# ifdef HAS_IFREQ -# include -# endif -#else #ifdef __convex__ # include # include #endif -# include -#endif /* hpux */ + +#include #include diff --git a/cde/programs/dtlogin/config/Xconfig.src b/cde/programs/dtlogin/config/Xconfig.src index 75145925c..05294ba94 100644 --- a/cde/programs/dtlogin/config/Xconfig.src +++ b/cde/programs/dtlogin/config/Xconfig.src @@ -64,7 +64,7 @@ Dtlogin*startup: Xstartup Dtlogin*reset: Xreset Dtlogin*setup: Xsetup -#if defined (__hpux) || defined (_AIX) || defined (sun) || defined(CSRG_BASED) || defined(__linux__) +#if defined (_AIX) || defined (sun) || defined(CSRG_BASED) || defined(__linux__) Dtlogin*failsafeClient: Xfailsafe #else Dtlogin*failsafeClient: /usr/bin/X11/xterm diff --git a/cde/programs/dtlogin/config/Xresources.src b/cde/programs/dtlogin/config/Xresources.src index 2e1588e81..ca60991bf 100644 --- a/cde/programs/dtlogin/config/Xresources.src +++ b/cde/programs/dtlogin/config/Xresources.src @@ -326,72 +326,6 @@ Dtlogin*pt_BR.languageName : %|nls-246-##| #endif /* sun */ -#if defined (__hpux) -!!###################################################################### -!! -!! LANGUAGE MENU NAME MAPPINGS - -#undef C -XCOMM undef C -Dtlogin*C.languageName: %|nls-300-##| -Dtlogin*C.iso88591.languageName: %|nls-301-##| -Dtlogin*POSIX.languageName: %|nls-302-##| -Dtlogin*ar_DZ.arabic8.languageName: %|nls-303-##| -Dtlogin*ar_SA.arabic8.languageName: %|nls-304-##| -Dtlogin*ar_SA.iso88596.languageName: %|nls-305-##| -Dtlogin*bg_BG.iso88595.languageName: %|nls-306-##| -Dtlogin*cs_CZ.iso88592.languageName: %|nls-307-##| -Dtlogin*da_DK.iso88591.languageName: %|nls-308-##| -Dtlogin*da_DK.roman8.languageName: %|nls-309-##| -Dtlogin*de_DE.iso8859.languageName: %|nls-310-##| -Dtlogin*de_DE.roman8.languageName: %|nls-311-##| -Dtlogin*el_GR.greek8.languageName: %|nls-312-##| -Dtlogin*el_GR.iso88597.languageName: %|nls-313-##| -Dtlogin*en_GB.iso88591.languageName: %|nls-314-##| -Dtlogin*en_GB.roman8.languageName: %|nls-315-##| -Dtlogin*en_US.iso88591.languageName: %|nls-316-##| -Dtlogin*en_US.roman8.languageName: %|nls-317-##| -Dtlogin*es_ES.iso88591.languageName: %|nls-318-##| -Dtlogin*es_ES.roman8.languageName: %|nls-319-##| -Dtlogin*fi_FI.iso88591.languageName: %|nls-320-##| -Dtlogin*fi_FI.roman8.languageName: %|nls-321-##| -Dtlogin*fr_CA.iso88591.languageName: %|nls-322-##| -Dtlogin*fr_CA.roman8.languageName: %|nls-323-##| -Dtlogin*fr_FR.iso88591.languageName: %|nls-324-##| -Dtlogin*fr_FR.roman8.languageName: %|nls-325-##| -Dtlogin*hu_HU.iso88592.languageName: %|nls-327-##| -Dtlogin*is_IS.iso88591.languageName: %|nls-328-##| -Dtlogin*is_IS.roman8.languageName: %|nls-329-##| -Dtlogin*it_IT.iso88591.languageName: %|nls-330-##| -Dtlogin*it_IT.roman8.languageName: %|nls-331-##| -Dtlogin*iw_IL.hebrew8.languageName: %|nls-332-##| -Dtlogin*iw_IL.iso88598.languageName: %|nls-333-##| -Dtlogin*ja_JP.SJIS.languageName: %|nls-334-##| -Dtlogin*ja_JP.eucJP.languageName: %|nls-335-##| -Dtlogin*ja_JP.kana8.languageName: %|nls-336-##| -Dtlogin*ko_KR.eucKR.languageName: %|nls-337-##| -Dtlogin*nl_NL.iso88591.languageName: %|nls-338-##| -Dtlogin*nl_NL.roman8.languageName: %|nls-339-##| -Dtlogin*no_NO.iso88591.languageName: %|nls-340-##| -Dtlogin*no_NO.roman8.languageName: %|nls-341-##| -Dtlogin*pl_PL.iso88592.languageName: %|nls-342-##| -Dtlogin*pt_PT.iso88591.languageName: %|nls-343-##| -Dtlogin*pt_PT.roman8.languageName: %|nls-344-##| -Dtlogin*ro_RO.iso88592.languageName: %|nls-345-##| -Dtlogin*ru_RU.iso88595.languageName: %|nls-346-##| -Dtlogin*sh_HR.iso88592.languageName: %|nls-347-##| -Dtlogin*sl_SI.iso88592.languageName: %|nls-348-##| -Dtlogin*sv_SE.iso88591.languageName: %|nls-349-##| -Dtlogin*sv_SE.roman8.languageName: %|nls-350-##| -Dtlogin*th_TH.tis620.languageName: %|nls-351-##| -Dtlogin*tr_TR.iso88599.languageName: %|nls-352-##| -Dtlogin*tr_TR.turkish8.languageName: %|nls-353-##| -Dtlogin*zh_CN.hp15CN.languageName: %|nls-354-##| -Dtlogin*zh_TW.big5.languageName: %|nls-355-##| -Dtlogin*zh_TW.ccdc.languageName: %|nls-356-##| - -#endif /* __hpux */ - !!###################################################################### !! !! CHOOSER diff --git a/cde/programs/dtlogin/config/Xservers.src b/cde/programs/dtlogin/config/Xservers.src index 1ef3ef886..04fcb8199 100644 --- a/cde/programs/dtlogin/config/Xservers.src +++ b/cde/programs/dtlogin/config/Xservers.src @@ -97,8 +97,6 @@ XCOMM ########################################################################## :0 Local local@console /usr/bin/X11/X -T -force :0 #elif defined (sun) :0 Local local_uid@console root /usr/openwin/bin/X :0 -nobanner -#elif defined (__hpux) - * Local local@console /usr/bin/X11/X :0 #elif defined (_NO_CONSOLE) XCOMM * Local local@console /usr/bin/X11/X :0 #elif defined (__linux__) diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src index ae82c4750..1769926fe 100644 --- a/cde/programs/dtlogin/config/Xsession.src +++ b/cde/programs/dtlogin/config/Xsession.src @@ -54,8 +54,6 @@ XCOMM ########################################################################## #if defined (_AIX) # define cpp_XINITUSER "$HOME/.xinitrc" # define cpp_MAIL "/var/spool/mail/$USER" -#elif defined (__hpux) -# define cpp_XDMSYS "/usr/lib/X11/xdm/sys.xsession" #elif defined (sun) # define cpp_XINITUSER "$HOME/.xinitrc" # define cpp_MAIL "/var/mail/$USER" @@ -63,11 +61,6 @@ XCOMM ########################################################################## # define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &" #endif -#if defined (__hpux) && defined (BLS) -# undef cpp_HELLO -# define cpp_HELLO "$DT_BINPATH/dthello -file /etc/copyright -file $HOME/.dtlogininfo &" -#endif - #ifdef linux # define cpp_MAIL "/var/mail/$USER" # define cpp_XDIR "/usr/bin" @@ -240,29 +233,6 @@ then fi #endif -#if defined (__hpux) - HASH - HASH Set the keyboard language if necessary... - HASH - if [ ! -z "$LANG" ] - then - case $LANG in - bulgarian | czech | hebrew | hungarian | \ - japanese | korean | polish | rumanian | \ - russian | serbocroatian) - KBD_LANG=$LANG - export KBD_LANG;; - - chinese-t) KBD_LANG=t_chinese - export KBD_LANG;; - chinese-s) KBD_LANG=s_chinese - export KBD_LANG;; - - *);; - esac - fi -#endif - HASH HASH Locate configuration file directories HASH diff --git a/cde/programs/dtlogin/daemon.c b/cde/programs/dtlogin/daemon.c index d1ee27b8d..8c8ceeee6 100644 --- a/cde/programs/dtlogin/daemon.c +++ b/cde/programs/dtlogin/daemon.c @@ -48,9 +48,6 @@ #include #include -#ifdef hpux -#include -#endif #ifdef SVR4 #include diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c index aa2bbdb75..d81830a15 100644 --- a/cde/programs/dtlogin/dm.c +++ b/cde/programs/dtlogin/dm.c @@ -277,7 +277,7 @@ main( int argc, char **argv ) ScanServers (); StartDisplays (); (void) signal (SIGHUP, RescanNotify); -#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__linux__) +#if !defined(SYSV) || defined(_AIX) || defined(__linux__) (void) signal (SIGCHLD, ChildNotify); #endif while (AnyWellKnownSockets() || AnyDisplaysLeft ()) @@ -290,7 +290,7 @@ main( int argc, char **argv ) TrimErrorFile(); -#if defined(SYSV) && !defined(hpux) && !defined(_AIX) && !defined(__linux__) +#if defined(SYSV) && !defined(_AIX) && !defined(__linux__) WaitForChild (); #else WaitForSomething (); @@ -504,7 +504,7 @@ StopAll( int arg ) int ChildReady = 0; -#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__linux__) || defined(CSRG_BASED) +#if !defined(SYSV) || defined(_AIX) || defined(__linux__) || defined(CSRG_BASED) static SIGVAL ChildNotify( int arg ) { @@ -533,7 +533,7 @@ WaitForChild( void ) waitType status; int mask; -#if defined(SYSV) || defined(SVR4) || defined(hpux) || defined(__linux__) +#if defined(SYSV) || defined(SVR4) || defined(__linux__) if (AnyWellKnownSockets()) { while ( ChildReady ) { #if defined(SVR4) || defined(__linux__) diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index 5b589c506..3ae26e1e1 100644 --- a/cde/programs/dtlogin/dm.h +++ b/cde/programs/dtlogin/dm.h @@ -115,8 +115,6 @@ */ #if defined(_AIX) #define DEF_NLS_DIR "/usr/lib/nls/loc" -#elif defined(hpV4) - #define DEF_NLS_DIR "/usr/lib/nls/msg" #else #define DEF_NLS_DIR CDE_INSTALLATION_TOP "/lib/nls/msg" #endif @@ -195,14 +193,13 @@ * ***************************************************************************/ -/*#if defined(SYSV) && !defined(hpux)*/ #if defined(SYSV) || defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) # include # define waitCode(w) WEXITSTATUS(w) # define waitSig(w) WTERMSIG(w) #if defined(_AIX) /* - * hpux has a "WCOREDUMP" macro which is undefined in AIX. + * "WCOREDUMP" is undefined in AIX. * For AIX, the macro from hpux's is used. */ # define waitCore(w) ( ((int)(w)&0200) == 0 ? 0 : 1 ) diff --git a/cde/programs/dtlogin/genauth.c b/cde/programs/dtlogin/genauth.c index dbbc8f3b9..f3b192ddc 100644 --- a/cde/programs/dtlogin/genauth.c +++ b/cde/programs/dtlogin/genauth.c @@ -106,7 +106,7 @@ extern int errno; #endif #if !defined(DONT_USE_DES) && !defined(USE_CRYPT) -# if defined(AIXV3) || defined(hpux) || defined(__FreeBSD__) +# if defined(AIXV3) || defined(__FreeBSD__) # define USE_CRYPT # elif defined(__OpenBSD__) # define DONT_USE_DES diff --git a/cde/programs/dtlogin/netaddr.c b/cde/programs/dtlogin/netaddr.c index dc477b187..e20899e08 100644 --- a/cde/programs/dtlogin/netaddr.c +++ b/cde/programs/dtlogin/netaddr.c @@ -190,12 +190,10 @@ int ConvertAddr (XdmcpNetaddr saddr, int *len, char **addr) break; #endif #ifdef AF_UNIX -#ifndef hpux case AF_UNIX: retval = FamilyLocal; break; #endif -#endif #ifdef TCPCONN case AF_INET: retval = FamilyInternet; diff --git a/cde/programs/dtlogin/resource.c b/cde/programs/dtlogin/resource.c index f93fc7676..cfd70f19e 100644 --- a/cde/programs/dtlogin/resource.c +++ b/cde/programs/dtlogin/resource.c @@ -201,11 +201,7 @@ static char AppName[16] = DTLOGIN; #define DEF_TIMEZONE "MST7MDT" #endif #ifndef DEF_SYS_PARMS_FILE -# if defined( __hpux ) -# define DEF_SYS_PARMS_FILE "/etc/src.sh" -# else -# define DEF_SYS_PARMS_FILE "/etc/TIMEZONE" -# endif +# define DEF_SYS_PARMS_FILE "/etc/TIMEZONE" #endif #define DEF_UDP_PORT "177" /* registered XDMCP port, don't change */ diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index b195126f9..6311c7a30 100644 --- a/cde/programs/dtlogin/session.c +++ b/cde/programs/dtlogin/session.c @@ -1485,11 +1485,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp ) * the "setgroups()" call instead... */ -# if defined(__hpux) - initgroups(user, -1); -# else setgroups (verify->ngroups, verify->groups); -# endif /* setpenv() will set gid for AIX */ #if !defined (_AIX) @@ -1624,8 +1620,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp ) failsafeArgv[i++] = "/usr/bin/X11/aixterm"; #elif defined(sun) failsafeArgv[i++] = "/usr/openwin/bin/xterm"; -#elif defined(__hpux) - failsafeArgv[i++] = "/usr/bin/X11/hpterm"; #elif defined(__OpenBSD__) failsafeArgv[i++] = "/usr/X11R6/bin/xterm"; #elif defined(__NetBSD__) diff --git a/cde/programs/dtlogin/sysauth.c b/cde/programs/dtlogin/sysauth.c index 3ecd7f4e1..466aefda5 100644 --- a/cde/programs/dtlogin/sysauth.c +++ b/cde/programs/dtlogin/sysauth.c @@ -63,7 +63,6 @@ ** ** Platform identification: ** - ** __hpux HP-UX OS only ** sun SUN OS only ** SVR4 SUN OS et al. ** _AIX AIX only @@ -115,7 +114,7 @@ /* * Define as generic those without platform specific code. */ -#if !(defined(__hpux) || defined(_AIX) || defined(sun) || \ +#if !(defined(_AIX) || defined(sun) || \ defined(HAS_PAM_LIBRARY)) #define generic #endif @@ -124,945 +123,6 @@ # include #endif -#ifdef __hpux -/*************************************************************************** - * - * Start authentication routines (HPUX) - * - ***************************************************************************/ - -#include /* for MAXUID macro */ -#include -#include -#include -#include -#include - - -#ifdef AUDIT -# include -# include -# include -# define SECUREPASS "/.secure/etc/passwd" -#endif - -#ifdef BLS -# include -# include -#endif - -#ifdef __AFS -#include -#endif /* __AFS */ - -#ifdef __KERBEROS -# include -# define KRBLIFE 255 /* max lifetime */ -#endif /* __KERBEROS */ - -#ifdef __PASSWD_ETC -# include "rgy_base.h" -#endif - - - -#define how_to_count ut_exit.e_exit - -#ifdef __hp9000s300 - int num_users[] = { 2, 32767 }; -# define MIN_VERSION 'A' -# define UNLIMITED 'B' -#else - int num_users[] = { 2, 16, 32, 64 , 8 }; -# define MIN_VERSION 'A' -# define UNLIMITED 'U' -#endif - -/* Maximum number of users allowed with restricted license */ -#if OSMAJORVERSION < 8 -# define MAX_STRICT_USERS 2 -#else -# define MAX_STRICT_USERS 8 -#endif - -#define NUM_VERSIONS (sizeof(num_users)/sizeof(num_users[0])) - 1 - -extern char *globalDisplayName; - -/*************************************************************************** - * - * External declarations (HPUX) - * - ***************************************************************************/ - -extern long groups[NGROUPS]; - - -#ifdef __PASSWD_ETC -extern boolean rgy_$using_local_registry(); -extern struct passwd * getpwnam_full(); -extern boolean is_acct_expired(); -extern boolean is_passwd_expired(); -extern boolean is_passwd_invalid(); -extern boolean rgy_$is_des(); -#endif - - - -/*************************************************************************** - * - * Procedure declarations (HPUX) - * - ***************************************************************************/ - -static void Audit( struct passwd *p, char *msg, int errnum) ; -static int CheckPassword( char *name, char *passwd, struct passwd **ppwd ); -static int CountUsers( int added_users) ; -static int CountUsersStrict( char *new_user) ; -static int PasswordAged( struct passwd *pw) ; -static void WriteBtmp( char *name) ; - - - - -/*************************************************************************** - * - * Global variables (HPUX) - * - ***************************************************************************/ - -#ifdef AUDIT - struct s_passwd *s_pwd; - struct stat s_pfile; - int secure; /* flag to denote existence of secure passwd file */ - int selfAuditOn; -#endif - -#ifdef BLS - struct pr_passwd *b1_pwd; -#endif - -#ifdef __PASSWD_ETC -rgy_$acct_admin_t admin_part; -rgy_$policy_t policy; -rgy_$acct_user_t user_part; -#endif - - - -/*************************************************************************** - * - * Audit (HPUX) - * - * Construct self audit record for event and write to the audit trail. - * This routine assumes that the effective uid is currently 0. If auditing - * is not defined, this routine does nothing. - ***************************************************************************/ - -static void -Audit( struct passwd *p, char *msg, int errnum ) -{ - - -#ifdef AUDIT - char *txtptr; - struct self_audit_rec audrec; - int status; -#endif - - /* - * make sure program is back to super-user... - */ - - setresuid(0,0,0); - - -#ifdef AUDIT - if (selfAuditOn) { - txtptr = (char *)audrec.aud_body.text; - sprintf(txtptr, "User= %s uid=%ld audid=%ld%s", p->pw_name, - (long)p->pw_uid, (long)p->pw_audid, msg); - audrec.aud_head.ah_pid = getpid(); - audrec.aud_head.ah_error = errnum; - audrec.aud_head.ah_event = EN_LOGINS; - audrec.aud_head.ah_len = strlen (txtptr); - status = audwrite(&audrec); - - if ( status != 0 ) { - switch (errno) { - - case EPERM: - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_NOT_SUSER,MC_DEF_LOG_NOT_SUSER)); - break; - - case EINVAL: - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_INV_EVENT,MC_DEF_LOG_INV_EVENT)); - break; - - default: - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_ERR_ERRNO,MC_DEF_LOG_ERR_ERRNO), - errno); - break; - } - } - } - -#else - return; -#endif -} - - - - - - -/*************************************************************************** - * - * CountUsers (HPUX only) - * - * see if new user has exceeded the maximum. - ***************************************************************************/ - -#define NCOUNT 16 - -static int -CountUsers( int added_users ) -{ - int count[NCOUNT], nusers, i; - struct utmp *entry; - - for (i=0; iut_type == USER_PROCESS) { - i = entry->how_to_count; - if (i < 0 || i >= NCOUNT) - i = 1; /* if out of range, then count */ - /* as ordinary user */ - count[i]++; - } - } - endutent(); - - /* - * KEY: - * [0] does not count at all - * [1] counts as real user - * [2] logins via a pty which have not gone trough login. These - * collectively count as 1 user IF count[3] is 0, otherwise, - * they are not counted. Starting with HP-UX 8.0 they are - * no longer counted at all. - * [3] logins via a pty which have been logged through login (i.e. - * rlogin and telnet). these count as 1 "real" user per - * unique user name. - * [4-15] may be used for groups of users which collectively - * count as 1 - */ - nusers = count[1]; - -#if OSMAJORVERSION < 8 - for (i=2; i 0) - nusers++; - - return(nusers); -} - - - - -/*************************************************************************** - * - * CountUsersStrict (HPUX only) - * - * see if new user has exceeded the maximum. - ***************************************************************************/ - -static int -CountUsersStrict( char *new_user ) -{ - char pty_users[MAX_STRICT_USERS][8]; - int count[NCOUNT], nusers, i, cnt, pty_off = -1, uname_off; - struct utmp *entry; - - /* - * Initialize count array... - */ - for (i = 0; i < NCOUNT; i++) - count[i] = 0; - - /* - * Add in the new user (we know it's not a pty)... - */ - count[1]++; - - while ( (entry = getutent()) != NULL ) { - if (entry->ut_type == USER_PROCESS) { - i = entry->how_to_count; - - /* if out of range, then count as ordinary user logged in - via a tty */ - if (i == 1 || (i < 0 || i >= NCOUNT)) - count[1]++; - /* See if it is a pty login granted by login program */ - else if (i == 3) { - count[3]++; - /* See if user is already logged in via login pty */ - uname_off = -1; - for (cnt = 0; cnt <= pty_off; cnt++) - if (strncmp(pty_users[cnt], entry->ut_user, 8) == 0) - uname_off = cnt; - - if (uname_off == -1) { /* user is not logged in via pty yet */ - - if (pty_off >= MAX_STRICT_USERS) /* cannot add any - more users */ - return(MAX_STRICT_USERS + 1); - /* add the user name to the array of pty users */ - else - strncpy(pty_users[++pty_off], entry->ut_user, 8); - } - } /* end if (i == 3) */ - else - count[i]++; - } /* end if entry->ut_type == USER_PROCESS */ - } /* end while (entry = getutent()) */ - - endutent(); - /* - * KEY: - * [0] does not count at all - * [1] counts as "real" user - * [2] logins via a pty which have not gone trough login. These - * collectively count as 1 user IF count[3] is 0, otherwise, - * they are not counted. Starting with HP-UX 8.0 they are - * no longer counted at all. - * [3] logins via a pty which have been logged through login (i.e. - * rlogin and telnet). these count as 1 "real" user per - * unique user name. - * [4-15] may be used for groups of users which collectively count - * as 1 - */ - - nusers = pty_off + 1 + count[1]; /* Current number of users is sum of - users logged in via tty + the - number of unique users logged in - via pty which have gone through - login */ - -#if OSMAJORVERSION < 8 - if ((count[3] == 0) && (count[2] != 0)) - nusers++; /* Add 1 user for all pty logins IF - none of pty logins have been - granted by the login program */ -#else - /* - * Don't count any hpterm logins (exit status of 2). We already - * counted all pty logins granted by the login program. - */ -#endif - - for (i = 4; i < NCOUNT; i++) - if (count[i] > 0) - nusers++; - return(nusers); -} - - - - -/*************************************************************************** - * - * PasswordAged (HPUX) - * - * see if password has aged - ***************************************************************************/ -#define SECONDS_IN_WEEK 604800L - -static int -PasswordAged( struct passwd *pw ) -{ - long change_week; /* week password was changed (1/1/70 = Week 0) */ - long last_week; /* week after which password must change */ - long first_week; /* week before which password can't change */ - long this_week; /* this week derived from time() */ - - char *passwdAge; /* password aging time */ - -#ifdef __PASSWD_ETC - boolean lrgy; -#endif - - - passwdAge = pw->pw_age; - -#ifdef AUDIT - if (secure) - passwdAge = s_pwd->pw_age; -#endif - - -#ifdef __PASSWD_ETC - /* 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 ) != 0 ) { - return TRUE; - } - } - return FALSE; - -#else - - if (*passwdAge == NULL) - return(0); - - first_week = last_week = change_week = (long) a64l(passwdAge); - last_week &= 0x3f; /* first six bits */ - first_week = (first_week >> 6) & 0x3f; /* next six bits */ - change_week >>= 12; /* everything else */ - - this_week = (long) time((long *) 0) / SECONDS_IN_WEEK; - -/* -** Password aging conditions: -** * if the last week is less than the first week (e.g., the aging -** field looks like "./"), only the superuser can change the -** password. We don't request a new password. -** * if the week the password was last changed is after this week, -** we have a problem, and request a new password. -** * if this week is after the specified aging time, we request -** a new password. -*/ - if (last_week < first_week) - return(0); - - if (change_week <= this_week && this_week <= (change_week + last_week)) - return(0); - - return(1); - -#endif -} - - - -/*************************************************************************** - * - * CheckPassword (HPUX only) - * - * Check validity of user password. One of several authentication schemes - * can be used, including Kerberos, AFS 3, HP BLS and traditional - * /etc/passwd. These are selectable via a resource in Dtlogin. - * - * Domain registry authentication (PasswdEtc) can also be compiled in as - * the only authentication scheme used. - * - ***************************************************************************/ - -static int -CheckPassword( char *name, char *passwd, struct passwd **ppwd ) -{ - - char *crypt(); - struct passwd *p; - - char *reason; - -#ifdef __KERBEROS - char realm[REALM_SZ]; - int kerno; -#endif /* __KERBEROS */ - - -#ifdef AUDIT - /* - * validate that user has an entry in the shadow password file on an - * HP-UX C2 trusted system. Keep info in a global structure. - */ - if (secure) { - setspwent(); - s_pwd = getspwnam(name); - endspwent(); - - if (s_pwd == NULL) - return(FALSE); - } -#endif - - - /* - * look up user's regular account information... - */ - -#ifdef __PASSWD_ETC - /* - * 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); -#else - p = getpwnam(name); -#endif - - endpwent(); - *ppwd = p; - - if ( p == NULL || strlen(name) == 0 ) - return(FALSE); - - -#ifdef __AFS - - /* - * AFS password authentication... - */ - - if ( vg_IsVerifyName(VN_AFS) ) { - - if ( ka_UserAuthenticateGeneral( - KA_USERAUTH_VERSION + KA_USERAUTH_DOSETPAG, - p->pw_name, /* kerberos name */ - (char *)0, /* instance */ - (char *)0, /* realm */ - passwd, /* password */ - 0, /* default lifetime */ - 0, /* spare 1 */ - 0, /* spare 2 */ - &reason) == 0 ) { /* error string */ - - if (strcmp(p->pw_passwd, "*") == 0) - return(FALSE); - else - return(TRUE); - } - - else { - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_AFS_FAILATH,MC_DEF_LOG_AFS_FAILATH),reason); - } - } -#endif /* __AFS */ - - -#ifdef __KERBEROS - - /* - * Kerberos password authentication... - */ - - if ( vg_IsVerifyName(VN_KRB) ) { - - (void)krb_get_lrealm(realm, 1); - - setresuid(p->pw_uid, p->pw_uid, -1); - kerno = krb_get_pw_in_tkt(p->pw_name, - "", - realm, - "krbtgt", - realm, - KRBLIFE, - passwd); - - setresuid(0, 0, -1); - - if (kerno == KSUCCESS) - if (strcmp(p->pw_passwd, "*") == 0) - return(FALSE); - else - return(TRUE); - - } -#endif /* __KERBEROS */ - - - - /* - * traditional password verification... - */ - - if (strcmp (crypt (passwd, p->pw_passwd), p->pw_passwd) == 0) - return(TRUE); - - -#ifdef __PASSWD_ETC - /* - * If regular passwd check fails, try old-style SR - */ - - if (rgy_$is_des(passwd, strlen(passwd), p->pw_passwd) == TRUE) - return (TRUE); -#endif - - - /* - * all password checks failed... - */ - - return (FALSE); - -} - - - - -/*************************************************************************** - * - * Authenticate (HPUX) - * - * verify the user - * - * return codes indicate authentication results. - ***************************************************************************/ - -#define MAXATTEMPTS 3 - -struct passwd nouser = {"", "nope"}; /* invalid user password struct */ - -int -Authenticate( struct display *d, char *name, char *passwd, char **msg ) -{ - - static int login_attempts = 0; /* # failed authentications */ - - struct passwd *p = NULL; /* password structure */ - - struct utsname utsnam; - int n; - - char *origpw; - - /* - * Nothing to do if no name provided. - */ - if (!name) - return(VF_INVALID); - -#ifdef SIA - - if (strlen(name) == 0) - return(VF_INVALID); - - if (!passwd) - return(VF_CHALLENGE); - - return(VF_OK); - -#endif - - /* - * Save provided password. - */ - origpw = passwd; - if (!passwd) passwd = ""; - -#ifdef AUDIT - /* - * turn on self auditing... - */ - - if (audswitch(AUD_SUSPEND) == -1) - selfAuditOn = FALSE; - else - selfAuditOn = TRUE; - - /* - * set the secure flag if SECUREPASS exists. If so, we - * are using it for authentication instead of /etc/passwd... - */ - - secure = (stat(SECUREPASS, &s_pfile) < 0) ? 0:1; - - - /* - * set the audit process flag unconditionally on since we want - * to log all logins regardless of whether the user's audit - * flag is set... - */ - - if (secure) - setaudproc(AUD_PROC); - -#endif /* AUDIT */ - - - /* - * validate password... - */ - - if ( CheckPassword(name, passwd, &p) == FALSE) { - - WriteBtmp(name); - - if ((++login_attempts % MAXATTEMPTS) == 0 ) { - - if (p == NULL ) - p = &nouser; - - Audit(p, " Failed login (bailout)", 1); - - } - - return(origpw ? VF_INVALID : VF_CHALLENGE); - } - - - /* - * check restricted license... - * - * Note: This only applies to local displays. Foreign displays - * (i.e. X-terminals) apparently do not count. - */ - - /* Get the version info via uname. If it doesn't look right, - * assume the smallest user configuration - */ - - if (uname(&utsnam) < 0) - utsnam.version[0] = MIN_VERSION; - - /* - * Mappings: - * 834 -> 834 - * 844 -> 844 - * 836 -> 635 - * 846 -> 645 - * 843 -> 642 - * 853 -> 652 - */ - - if ((!strncmp(utsnam.machine, "9000/834", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/844", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/836", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/846", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/843", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/853", UTSLEN))) { - -/* strict_count = 1;*/ - if (CountUsersStrict(name) > MAX_STRICT_USERS) { - Audit(p, - " attempted to login - too many users on the system", - 20); - - return(VF_MAX_USERS); - } - } - else { - if (utsnam.version[0] != UNLIMITED) { - if ((utsnam.version[0]-'A' < 0) || - (utsnam.version[0]-'A' > NUM_VERSIONS)) - utsnam.version[0] = MIN_VERSION; - - n = (int) utsnam.version[0] - 'A'; - if (CountUsers(1) > num_users[n]) { - Audit(p, - " attempted to login - too many users on the system", - 20); - - return(VF_MAX_USERS); - } - } - } - - -#ifdef __PASSWD_ETC - /* - * Check for account validity. Unfortunately, we have no graphical - * dialog for this at this time so the best we can do is log an - * error message and hope the system administrator sees it. - */ - - if ( !rgy_$using_local_registry() ) { - if (rgy_$is_acct_expired(&admin_part) != 0 ) { - LogError(ReadCatalog(MC_LOG_SET,MC_LOG_ACC_EXP,MC_DEF_LOG_ACC_EXP), - name); - return(VF_INVALID); - } - } -#endif - - /* - * check password aging... - */ - - if ( PasswordAged(p) ) return(VF_PASSWD_AGED); - - - /* - * verify home directory exists... - */ - - if(chdir(p->pw_dir) < 0) { - Audit(p, " attempted to login - no home directory", 1); - return(VF_HOME); - } - - -#ifdef AUDIT - /* - * check audit flag and id... - */ - - setresuid(0,0,0); - - if (secure && (p->pw_audflg > 1 || p->pw_audflg < 0)) { - Audit(p, " attempted to login - bad audit flag", 1); - return(VF_BAD_AFLAG); - } - - if (secure && (setaudid(p->pw_audid) == -1 )) { - Audit(p, " attempted to login - bad audit id", 1); - return(VF_BAD_AID); - } -#endif /* AUDIT */ - - - /* - * validate uid and gid... - */ - - if ((p->pw_gid < 0) || - (p->pw_gid > MAXUID) || - (setgid(p->pw_gid) == -1)) { - - Audit(p, " attempted to login - bad group id", 1); - return(VF_BAD_GID); - } - - -#ifdef __AFS - /* - * ka_UserAuthenticateGeneral() sets the group access of this process - * to the proper PAG. Pick up these values and pass them back to - * Dtlogin to be put into the user's environment... - */ - - if ( vg_IsVerifyName(VN_AFS) ) { - groups[0] = groups[1] = 0; - getgroups(NGROUPS, groups); - } - -#endif /* __AFS */ - - - if ((p->pw_uid < 0) || - (p->pw_uid > MAXUID) || - (setresuid(p->pw_uid, p->pw_uid, 0) == -1)) { - - Audit(p, " attempted to login - bad user id", 1); - return(VF_BAD_UID); - } - - - - - /* - * verify ok... - */ - - Audit(p, " Successful login", 0); - return(VF_OK); -} - - - - -/*************************************************************************** - * - * WriteBtmp (HPUX) - * - * log bad login attempts - * - ***************************************************************************/ - -static void -WriteBtmp( char *name ) -{ - int fd; - struct utmp utmp, *u; - - int found=FALSE; - - bzero(&utmp, sizeof(struct utmp)); - - utmp.ut_pid = getppid(); - while ((u = getutent()) != NULL) { - if ( (u->ut_type == INIT_PROCESS || - u->ut_type == LOGIN_PROCESS || - u->ut_type == USER_PROCESS) && - u->ut_pid == utmp.ut_pid ) { - - found = TRUE; - break; - } - } - - - /* - * if no utmp entry, this may be an X-terminal. Construct a utmp - * entry for it... - */ - - if ( ! found ) { - strncpy(utmp.ut_id, "??", sizeof(utmp.ut_id)); - strncpy(utmp.ut_line, globalDisplayName, sizeof(utmp.ut_line)); - utmp.ut_type = LOGIN_PROCESS; -#ifndef SVR4 - strncpy(utmp.ut_host, globalDisplayName, sizeof(utmp.ut_host)); -#endif - u = &utmp; - } - - - /* - * If btmp exists, then record the bad attempt - */ - if ( (fd = open(BTMP_FILE,O_WRONLY|O_APPEND)) >= 0) { - strncpy(u->ut_user, name, sizeof(u->ut_user)); - (void) time(&u->ut_time); - write(fd, (char *)u, sizeof(utmp)); - (void) close(fd); - } - - endutent(); /* Close utmp file */ -} - -/*************************************************************************** - * - * End authentication routines (HPUX) - * - ***************************************************************************/ -#endif /* __hpux */ - - -/*************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - ***************************************************************************/ - - #if defined(sun) || defined(HAS_PAM_LIBRARY) /*************************************************************************** diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c index e42d7a99b..26f11a162 100644 --- a/cde/programs/dtlogin/util.c +++ b/cde/programs/dtlogin/util.c @@ -579,107 +579,7 @@ ScanNLSDir(char *dirname) } } -#elif defined(hpV4) - -#define LOCALE "locale.inf" -#define LOCALEOLD "locale.def" -#define COLLATE8 "collate8" -#define MAILX "mailx" -#define ELM "elm" -#define MSGCAT ".cat" -#define DOT "." -#define DOTDOT ".." - -/* - * Scan for installed locales on HP platform. - */ -{ - /*************************************************************************** - * Scan supplied NLS directory structure to see if it contains an - * installed language. If so, the name of the language is appended - * to a global list of languages. - * - * This routine is recursively called as a directory structure is - * traversed. - * - *************************************************************************/ - - DIR *dirp; - struct dirent *dp; - struct stat statb; - - char buf[1024]; - - /* - * Scan input directory, looking for a LOCALE file. If a sub-directory - * is found, recurse down into it... - */ - if ( (dirp = opendir(dirname)) != NULL ) - { - while ( (dp = readdir(dirp)) != NULL ) - { - /* - * ignore files that are known not to be candidates... - */ - if ( MatchesFileSuffix(dp->d_name, MSGCAT) || - (strcmp (dp->d_name, COLLATE8) == 0 ) || - (strcmp (dp->d_name, MAILX) == 0 ) || - (strcmp (dp->d_name, ELM) == 0 ) || - (strcmp (dp->d_name, DOT) == 0 ) || - (strcmp (dp->d_name, DOTDOT) == 0 ) ) - continue; - - - /* - * check to see if this is the locale file... - */ - if ( (strcmp(dp->d_name, LOCALEOLD) == 0 ) || - (strcmp(dp->d_name, LOCALE) == 0 ) ) - { - char *p, *s; - - /* - * Convert directory name to language name... - */ - if ( (p = strstr(dirname, DEF_NLS_DIR)) != NULL ) - { - p += strlen(DEF_NLS_DIR); - if ( *p == '/' ) - p++; - - s = p; - while ( (p = strchr(s,'/')) != NULL ) - *p = '.'; - - /* - * append to global list of languages... - */ - if ((int) (strlen(languageList)+strlen(s)+2) < LANGLISTSIZE) - { - strcat(languageList, " "); - strcat(languageList, s); - } - } - - continue; - } - - /* - * if this file is a directory, scan it also... - */ - strcpy(buf, dirname); - strcat(buf, "/"); - strcat(buf, dp->d_name); - - if (stat(buf, &statb) == 0 && S_ISDIR(statb.st_mode)) - ScanNLSDir(buf); - } - - closedir(dirp); - } -} - -#else /* !_AIX && !hpV4 */ +#else /* !_AIX */ /* * Scan for installed locales on generic platform */ diff --git a/cde/programs/dtlogin/verify.c b/cde/programs/dtlogin/verify.c index d9f70fe3a..fa2abb30a 100644 --- a/cde/programs/dtlogin/verify.c +++ b/cde/programs/dtlogin/verify.c @@ -569,12 +569,6 @@ systemEnv( struct display *d, char *user, char *home ) #ifdef NGROUPS -#ifndef __hpux - -/* - * groupMember() not used in HP-UX - */ - int groupMember( char *name, @@ -587,8 +581,6 @@ groupMember( } return 0; } -#endif /* ! __hpux */ - void getGroups( @@ -609,7 +601,6 @@ getGroups( * this code... */ -#if !(defined(__hpux)) while ( (g = getgrent()) != NULL ) { /* * make the list unique @@ -628,7 +619,6 @@ getGroups( verify->groups[ngroups++] = g->gr_gid; } } -#endif verify->ngroups = ngroups; endgrent (); } diff --git a/cde/programs/dtlogin/vgauth.c b/cde/programs/dtlogin/vgauth.c index 41dc6f9ce..56521c9a4 100644 --- a/cde/programs/dtlogin/vgauth.c +++ b/cde/programs/dtlogin/vgauth.c @@ -63,7 +63,6 @@ ** ** Platform identification: ** - ** __hpux HP-UX OS only ** sun SUN OS only ** SVR4 SUN OS et al. ** _AIX AIX only @@ -97,937 +96,10 @@ /* * Define as generic those without platform specific code. */ -#if !(defined(__hpux) || defined(_AIX) || defined(sun)) +#if !(defined(_AIX) || defined(sun)) #define generic #endif -#ifdef __hpux -/*************************************************************************** - * - * Start authentication routines (HPUX) - * - ***************************************************************************/ - -#include /* for MAXUID macro */ -#include -#include -#include -#include -#include - - -#ifdef AUDIT -# include -# include -# include -# define SECUREPASS "/.secure/etc/passwd" -#endif - -#ifdef BLS -# include -# include -#endif - -#ifdef __AFS -#include -#endif /* __AFS */ - -#ifdef __KERBEROS -# include -# define KRBLIFE 255 /* max lifetime */ -#endif /* __KERBEROS */ - -#ifdef __PASSWD_ETC -# include "rgy_base.h" -#endif - - - -#define how_to_count ut_exit.e_exit - -#ifdef __hp9000s300 - int num_users[] = { 2, 32767 }; -# define MIN_VERSION 'A' -# define UNLIMITED 'B' -#else - int num_users[] = { 2, 16, 32, 64 , 8 }; -# define MIN_VERSION 'A' -# define UNLIMITED 'U' -#endif - -/* Maximum number of users allowed with restricted license */ -#if OSMAJORVERSION < 8 -# define MAX_STRICT_USERS 2 -#else -# define MAX_STRICT_USERS 8 -#endif - -#define NUM_VERSIONS (sizeof(num_users)/sizeof(num_users[0])) - 1 - - - -/*************************************************************************** - * - * External declarations (HPUX) - * - ***************************************************************************/ - -extern Widget focusWidget; /* login or password text field */ - -extern long groups[NGROUPS]; - - -#ifdef __PASSWD_ETC -extern boolean rgy_$using_local_registry(); -extern struct passwd * getpwnam_full(); -extern boolean is_acct_expired(); -extern boolean is_passwd_expired(); -extern boolean is_passwd_invalid(); -extern boolean rgy_$is_des(); -#endif - - - -/*************************************************************************** - * - * Procedure declarations (HPUX) - * - ***************************************************************************/ - -static void Audit( struct passwd *p, char *msg, int errnum) ; -static int CheckPassword( char *name, char *passwd, struct passwd **ppwd ); -static int CountUsers( int added_users) ; -static int CountUsersStrict( char *new_user) ; -static int PasswordAged( struct passwd *pw) ; -static void WriteBtmp( char *name) ; - - - - -/*************************************************************************** - * - * Global variables (HPUX) - * - ***************************************************************************/ - -#ifdef AUDIT - struct s_passwd *s_pwd; - struct stat s_pfile; - int secure; /* flag to denote existence of secure passwd file */ - Boolean selfAuditOn; -#endif - -#ifdef BLS - struct pr_passwd *b1_pwd; -#endif - -#ifdef __PASSWD_ETC -rgy_$acct_admin_t admin_part; -rgy_$policy_t policy; -rgy_$acct_user_t user_part; -#endif - - - -/*************************************************************************** - * - * Audit (HPUX) - * - * Construct self audit record for event and write to the audit trail. - * This routine assumes that the effective uid is currently 0. If auditing - * is not defined, this routine does nothing. - ***************************************************************************/ - -static void -Audit( struct passwd *p, char *msg, int errnum ) -{ - - -#ifdef AUDIT - char *txtptr; - struct self_audit_rec audrec; - int status; -#endif - - /* - * make sure program is back to super-user... - */ - - setresuid(0,0,0); - - -#ifdef AUDIT - if (selfAuditOn) { - txtptr = (char *)audrec.aud_body.text; - sprintf(txtptr, "User= %s uid=%ld audid=%ld%s", p->pw_name, - (long)p->pw_uid, (long)p->pw_audid, msg); - audrec.aud_head.ah_pid = getpid(); - audrec.aud_head.ah_error = errnum; - audrec.aud_head.ah_event = EN_LOGINS; - audrec.aud_head.ah_len = strlen (txtptr); - status = audwrite(&audrec); - - if ( status != 0 ) { - switch (errno) { - - case EPERM: - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_NOT_SUSER,MC_DEF_LOG_NOT_SUSER)); - break; - - case EINVAL: - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_INV_EVENT,MC_DEF_LOG_INV_EVENT)); - break; - - default: - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_ERR_ERRNO,MC_DEF_LOG_ERR_ERRNO), - errno); - break; - } - } - } - -#else - return; -#endif -} - - - - - - -/*************************************************************************** - * - * CountUsers (HPUX only) - * - * see if new user has exceeded the maximum. - ***************************************************************************/ - -#define NCOUNT 16 - -static int -CountUsers( int added_users ) -{ - int count[NCOUNT], nusers, i; - struct utmp *entry; - - for (i=0; iut_type == USER_PROCESS) { - i = entry->how_to_count; - if (i < 0 || i >= NCOUNT) - i = 1; /* if out of range, then count */ - /* as ordinary user */ - count[i]++; - } - } - endutent(); - - /* - * KEY: - * [0] does not count at all - * [1] counts as real user - * [2] logins via a pty which have not gone trough login. These - * collectively count as 1 user IF count[3] is 0, otherwise, - * they are not counted. Starting with HP-UX 8.0 they are - * no longer counted at all. - * [3] logins via a pty which have been logged through login (i.e. - * rlogin and telnet). these count as 1 "real" user per - * unique user name. - * [4-15] may be used for groups of users which collectively - * count as 1 - */ - nusers = count[1]; - -#if OSMAJORVERSION < 8 - for (i=2; i 0) - nusers++; - - return(nusers); -} - - - - -/*************************************************************************** - * - * CountUsersStrict (HPUX only) - * - * see if new user has exceeded the maximum. - ***************************************************************************/ - -static int -CountUsersStrict( char *new_user ) -{ - char pty_users[MAX_STRICT_USERS][8]; - int count[NCOUNT], nusers, i, cnt, pty_off = -1, uname_off; - struct utmp *entry; - - /* - * Initialize count array... - */ - for (i = 0; i < NCOUNT; i++) - count[i] = 0; - - /* - * Add in the new user (we know it's not a pty)... - */ - count[1]++; - - while ( (entry = getutent()) != NULL ) { - if (entry->ut_type == USER_PROCESS) { - i = entry->how_to_count; - - /* if out of range, then count as ordinary user logged in - via a tty */ - if (i == 1 || (i < 0 || i >= NCOUNT)) - count[1]++; - /* See if it is a pty login granted by login program */ - else if (i == 3) { - count[3]++; - /* See if user is already logged in via login pty */ - uname_off = -1; - for (cnt = 0; cnt <= pty_off; cnt++) - if (strncmp(pty_users[cnt], entry->ut_user, 8) == 0) - uname_off = cnt; - - if (uname_off == -1) { /* user is not logged in via pty yet */ - - if (pty_off >= MAX_STRICT_USERS) /* cannot add any - more users */ - return(MAX_STRICT_USERS + 1); - /* add the user name to the array of pty users */ - else - strncpy(pty_users[++pty_off], entry->ut_user, 8); - } - } /* end if (i == 3) */ - else - count[i]++; - } /* end if entry->ut_type == USER_PROCESS */ - } /* end while (entry = getutent()) */ - - endutent(); - /* - * KEY: - * [0] does not count at all - * [1] counts as "real" user - * [2] logins via a pty which have not gone trough login. These - * collectively count as 1 user IF count[3] is 0, otherwise, - * they are not counted. Starting with HP-UX 8.0 they are - * no longer counted at all. - * [3] logins via a pty which have been logged through login (i.e. - * rlogin and telnet). these count as 1 "real" user per - * unique user name. - * [4-15] may be used for groups of users which collectively count - * as 1 - */ - - nusers = pty_off + 1 + count[1]; /* Current number of users is sum of - users logged in via tty + the - number of unique users logged in - via pty which have gone through - login */ - -#if OSMAJORVERSION < 8 - if ((count[3] == 0) && (count[2] != 0)) - nusers++; /* Add 1 user for all pty logins IF - none of pty logins have been - granted by the login program */ -#else - /* - * Don't count any hpterm logins (exit status of 2). We already - * counted all pty logins granted by the login program. - */ -#endif - - for (i = 4; i < NCOUNT; i++) - if (count[i] > 0) - nusers++; - return(nusers); -} - - - - -/*************************************************************************** - * - * PasswordAged (HPUX) - * - * see if password has aged - ***************************************************************************/ -#define SECONDS_IN_WEEK 604800L - -static int -PasswordAged( struct passwd *pw ) -{ - long change_week; /* week password was changed (1/1/70 = Week 0) */ - long last_week; /* week after which password must change */ - long first_week; /* week before which password can't change */ - long this_week; /* this week derived from time() */ - - char *passwdAge; /* password aging time */ - -#ifdef __PASSWD_ETC - boolean lrgy; -#endif - - - passwdAge = pw->pw_age; - -#ifdef AUDIT - if (secure) - passwdAge = s_pwd->pw_age; -#endif - - -#ifdef __PASSWD_ETC - /* 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 ) != 0 ) { - return TRUE; - } - } - return FALSE; - -#else - - if (*passwdAge == NULL) - return(0); - - first_week = last_week = change_week = (long) a64l(passwdAge); - last_week &= 0x3f; /* first six bits */ - first_week = (first_week >> 6) & 0x3f; /* next six bits */ - change_week >>= 12; /* everything else */ - - this_week = (long) time((long *) 0) / SECONDS_IN_WEEK; - -/* -** Password aging conditions: -** * if the last week is less than the first week (e.g., the aging -** field looks like "./"), only the superuser can change the -** password. We don't request a new password. -** * if the week the password was last changed is after this week, -** we have a problem, and request a new password. -** * if this week is after the specified aging time, we request -** a new password. -*/ - if (last_week < first_week) - return(0); - - if (change_week <= this_week && this_week <= (change_week + last_week)) - return(0); - - return(1); - -#endif -} - - - -/*************************************************************************** - * - * CheckPassword (HPUX only) - * - * Check validity of user password. One of several authentication schemes - * can be used, including Kerberos, AFS 3, HP BLS and traditional - * /etc/passwd. These are selectable via a resource in Dtlogin. - * - * Domain registry authentication (PasswdEtc) can also be compiled in as - * the only authentication scheme used. - * - ***************************************************************************/ - -static int -CheckPassword( char *name, char *passwd, struct passwd **ppwd ) -{ - - char *crypt(); - struct passwd *p; - - char *reason; - -#ifdef __KERBEROS - char realm[REALM_SZ]; - int kerno; -#endif /* __KERBEROS */ - - -#ifdef AUDIT - /* - * validate that user has an entry in the shadow password file on an - * HP-UX C2 trusted system. Keep info in a global structure. - */ - if (secure) { - setspwent(); - s_pwd = getspwnam(name); - endspwent(); - - if (s_pwd == NULL) - return(FALSE); - } -#endif - - - /* - * look up user's regular account information... - */ - -#ifdef __PASSWD_ETC - /* - * 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); -#else - p = getpwnam(name); -#endif - - endpwent(); - *ppwd = p; - - if ( p == NULL || strlen(name) == 0 ) - return(FALSE); - - -#ifdef __AFS - - /* - * AFS password authentication... - */ - - if ( IsVerifyName(VN_AFS) ) { - - if (focusWidget == login_text) - return(FALSE); - - if ( ka_UserAuthenticateGeneral( - KA_USERAUTH_VERSION + KA_USERAUTH_DOSETPAG, - p->pw_name, /* kerberos name */ - (char *)0, /* instance */ - (char *)0, /* realm */ - passwd, /* password */ - 0, /* default lifetime */ - 0, /* spare 1 */ - 0, /* spare 2 */ - &reason) == 0 ) { /* error string */ - - if (strcmp(p->pw_passwd, "*") == 0) - return(FALSE); - else - return(TRUE); - } - - else { - LogError(ReadCatalog( - MC_LOG_SET,MC_LOG_AFS_FAILATH,MC_DEF_LOG_AFS_FAILATH),reason); - } - } -#endif /* __AFS */ - - -#ifdef __KERBEROS - - /* - * Kerberos password authentication... - */ - - if ( IsVerifyName(VN_KRB) ) { - - if (focusWidget == login_text) - return(FALSE); - - (void)krb_get_lrealm(realm, 1); - - setresuid(p->pw_uid, p->pw_uid, -1); - kerno = krb_get_pw_in_tkt(p->pw_name, - "", - realm, - "krbtgt", - realm, - KRBLIFE, - passwd); - - setresuid(0, 0, -1); - - if (kerno == KSUCCESS) - if (strcmp(p->pw_passwd, "*") == 0) - return(FALSE); - else - return(TRUE); - - } -#endif /* __KERBEROS */ - - - - /* - * traditional password verification... - */ - - if (strcmp (crypt (passwd, p->pw_passwd), p->pw_passwd) == 0) - return(TRUE); - - -#ifdef __PASSWD_ETC - /* - * If regular passwd check fails, try old-style SR - */ - - if (rgy_$is_des(passwd, strlen(passwd), p->pw_passwd) == TRUE) - return (TRUE); -#endif - - - /* - * all password checks failed... - */ - - return (FALSE); - -} - - - - -/*************************************************************************** - * - * Verify (HPUX) - * - * verify the user - * - * return codes indicate authentication results. - ***************************************************************************/ - -#define MAXATTEMPTS 3 - -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 */ - - struct utsname utsnam; - int n; - - - -#ifdef AUDIT - /* - * turn on self auditing... - */ - - if (audswitch(AUD_SUSPEND) == -1) - selfAuditOn = FALSE; - else - selfAuditOn = TRUE; - - /* - * set the secure flag if SECUREPASS exists. If so, we - * are using it for authentication instead of /etc/passwd... - */ - - secure = (stat(SECUREPASS, &s_pfile) < 0) ? 0:1; - - - /* - * set the audit process flag unconditionally on since we want - * to log all logins regardless of whether the user's audit - * flag is set... - */ - - if (secure) - setaudproc(AUD_PROC); - -#endif /* AUDIT */ - - - /* - * validate password... - */ - - if ( CheckPassword(name, passwd, &p) == FALSE) { - if ( focusWidget == passwd_text ) { - - WriteBtmp(name); - - if ((++login_attempts % MAXATTEMPTS) == 0 ) { - - if (p->pw_name == NULL ) - p = &nouser; - - Audit(p, " Failed login (bailout)", 1); - - } - } - - return(VF_INVALID); - } - - - /* - * check restricted license... - * - * Note: This only applies to local displays. Foreign displays - * (i.e. X-terminals) apparently do not count. - */ - - /* Get the version info via uname. If it doesn't look right, - * assume the smallest user configuration - */ - - if (getenv(LOCATION) != NULL) { - if (uname(&utsnam) < 0) - utsnam.version[0] = MIN_VERSION; - - /* - * Mappings: - * 834 -> 834 - * 844 -> 844 - * 836 -> 635 - * 846 -> 645 - * 843 -> 642 - * 853 -> 652 - */ - - if ((!strncmp(utsnam.machine, "9000/834", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/844", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/836", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/846", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/843", UTSLEN)) || - (!strncmp(utsnam.machine, "9000/853", UTSLEN))) { - -/* strict_count = 1;*/ - if (CountUsersStrict(name) > MAX_STRICT_USERS) { - Audit(p, - " attempted to login - too many users on the system", - 20); - - return(VF_MAX_USERS); - } - } - else { - if (utsnam.version[0] != UNLIMITED) { - if ((utsnam.version[0]-'A' < 0) || - (utsnam.version[0]-'A' > NUM_VERSIONS)) - utsnam.version[0] = MIN_VERSION; - - n = (int) utsnam.version[0] - 'A'; - if (CountUsers(1) > num_users[n]) { - Audit(p, - " attempted to login - too many users on the system", - 20); - - return(VF_MAX_USERS); - } - } - } - } - -#ifdef __PASSWD_ETC - /* - * Check for account validity. Unfortunately, we have no graphical - * dialog for this at this time so the best we can do is log an - * error message and hope the system administrator sees it. - */ - - if ( !rgy_$using_local_registry() ) { - if (rgy_$is_acct_expired(&admin_part) != 0 ) { - LogError(ReadCatalog(MC_LOG_SET,MC_LOG_ACC_EXP,MC_DEF_LOG_ACC_EXP), - name); - return(VF_INVALID); - } - } -#endif - - /* - * check password aging... - */ - - if ( PasswordAged(p) ) return(VF_PASSWD_AGED); - - - /* - * verify home directory exists... - */ - - if(chdir(p->pw_dir) < 0) { - Audit(p, " attempted to login - no home directory", 1); - return(VF_HOME); - } - - -#ifdef AUDIT - /* - * check audit flag and id... - */ - - setresuid(0,0,0); - - if (secure && (p->pw_audflg > 1 || p->pw_audflg < 0)) { - Audit(p, " attempted to login - bad audit flag", 1); - return(VF_BAD_AFLAG); - } - - if (secure && (setaudid(p->pw_audid) == -1 )) { - Audit(p, " attempted to login - bad audit id", 1); - return(VF_BAD_AID); - } -#endif /* AUDIT */ - - - /* - * validate uid and gid... - */ - - if ((p->pw_gid < 0) || - (p->pw_gid > MAXUID) || - (setgid(p->pw_gid) == -1)) { - - Audit(p, " attempted to login - bad group id", 1); - return(VF_BAD_GID); - } - - -#ifdef __AFS - /* - * ka_UserAuthenticateGeneral() sets the group access of this process - * to the proper PAG. Pick up these values and pass them back to - * Dtlogin to be put into the user's environment... - */ - - if ( IsVerifyName(VN_AFS) ) { - groups[0] = groups[1] = 0; - getgroups(NGROUPS, groups); - } - -#endif /* __AFS */ - - - if ((p->pw_uid < 0) || - (p->pw_uid > MAXUID) || - (setresuid(p->pw_uid, p->pw_uid, 0) == -1)) { - - Audit(p, " attempted to login - bad user id", 1); - return(VF_BAD_UID); - } - - - - - /* - * verify ok... - */ - - Audit(p, " Successful login", 0); - return(VF_OK); -} - - - - -/*************************************************************************** - * - * WriteBtmp (HPUX) - * - * log bad login attempts - * - ***************************************************************************/ - -static void -WriteBtmp( char *name ) -{ - int fd; - struct utmp utmp, *u; - - Boolean found=FALSE; - - bzero(&utmp, sizeof(struct utmp)); - - utmp.ut_pid = getppid(); - while ((u = getutent()) != NULL) { - if ( (u->ut_type == INIT_PROCESS || - u->ut_type == LOGIN_PROCESS || - u->ut_type == USER_PROCESS) && - u->ut_pid == utmp.ut_pid ) { - - found = TRUE; - break; - } - } - - - /* - * if no utmp entry, this may be an X-terminal. Construct a utmp - * entry for it... - */ - - if ( ! found ) { - strncpy(utmp.ut_id, "??", sizeof(utmp.ut_id)); - strncpy(utmp.ut_line, dpyinfo.name, sizeof(utmp.ut_line)); - utmp.ut_type = LOGIN_PROCESS; -#ifndef SVR4 - strncpy(utmp.ut_host, dpyinfo.name, sizeof(utmp.ut_host)); -#endif - u = &utmp; - } - - - /* - * If btmp exists, then record the bad attempt - */ - if ( (fd = open(BTMP_FILE,O_WRONLY|O_APPEND)) >= 0) { - strncpy(u->ut_user, name, sizeof(u->ut_user)); - (void) time(&u->ut_time); - write(fd, (char *)u, sizeof(utmp)); - (void) close(fd); - } - - endutent(); /* Close utmp file */ -} - -/*************************************************************************** - * - * End authentication routines (HPUX) - * - ***************************************************************************/ -#endif /* __hpux */ - - - -/*************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - *************************************************************************** - ***************************************************************************/ - - #ifdef sun /*************************************************************************** * diff --git a/cde/programs/dtlogin/vgcallback.c b/cde/programs/dtlogin/vgcallback.c index d0571fe50..9ff1a48bb 100644 --- a/cde/programs/dtlogin/vgcallback.c +++ b/cde/programs/dtlogin/vgcallback.c @@ -1097,7 +1097,6 @@ ProcessTraversal( Widget w, int direction ) i = XmProcessTraversal(w, direction); -#ifndef __hpux /* * Versions of Motif other than HP do not support the XmfocusCallback * on the TextField widget. We simulate it here by manually invoking the @@ -1105,7 +1104,6 @@ ProcessTraversal( Widget w, int direction ) */ TextFocusCB(w, NULL, NULL); -#endif } diff --git a/cde/programs/dtlogin/vgmain.c b/cde/programs/dtlogin/vgmain.c index 07e1e77fc..33bb00fd0 100644 --- a/cde/programs/dtlogin/vgmain.c +++ b/cde/programs/dtlogin/vgmain.c @@ -454,14 +454,10 @@ main( int argc, char **argv ) vg_TRACE_EXECUTION("main: after options."); #endif /* VG_TRACE */ #ifdef VG_DEBUG - #ifdef __hpux - while (1) {} - #else LogError((unsigned char *) "main: sleeping %d seconds.\n", debug); if (debug) { sleep(debug); } - #endif /* __hpux */ #endif /* VG_DEBUG */ /* @@ -478,15 +474,6 @@ main( int argc, char **argv ) XtSetWarningHandler(xtWarningHandler); } -#ifdef __hpux - /* - * prevent the toolkit from starting the NLIO server... - */ -#ifdef VG_TRACE - vg_TRACE_EXECUTION("main: exited _XHPNlioctl ..."); -#endif /* VG_TRACE */ -#endif - /* * get information about the display... */ @@ -1740,9 +1727,6 @@ MakeLogin( void ) Ctrl Tab: next-tab-group() ")); XtManageChild(login_text); -#ifdef __hpux - XtAddCallback(login_text, XmNfocusCallback, TextFocusCB, NULL); -#endif XtAddActions(textActions, 2); @@ -1761,9 +1745,6 @@ MakeLogin( void ) textdata->text[1] = login_text; XtManageChild(passwd_text); -#ifdef __hpux - XtAddCallback(passwd_text, XmNfocusCallback, TextFocusCB, NULL); -#endif XtAddCallback(passwd_text, XmNmodifyVerifyCallback, EditPasswdCB, NULL); /* diff --git a/cde/programs/dtlogin/xdmcp.c b/cde/programs/dtlogin/xdmcp.c index c562eec21..84b489df9 100644 --- a/cde/programs/dtlogin/xdmcp.c +++ b/cde/programs/dtlogin/xdmcp.c @@ -394,11 +394,7 @@ void WaitForSomething (void) else ptimeout = NULL; -#ifdef __hpux - nready = select (WellKnownSocketsMax + 1, (int *) &reads, 0, 0, ptimeout); -#else nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, ptimeout); -#endif Debug ("select returns %d. Rescan: %d ChildReady: %d\n", nready, Rescan, ChildReady); if (nready > 0) diff --git a/cde/programs/dtmail/MotifApp/Application.C b/cde/programs/dtmail/MotifApp/Application.C index b1bc02814..f2c9790d3 100644 --- a/cde/programs/dtmail/MotifApp/Application.C +++ b/cde/programs/dtmail/MotifApp/Application.C @@ -226,11 +226,7 @@ Application::~Application() delete []_windows; #ifdef CDExc21492 - #if defined(__hpux) - this->BasicComponent::~BasicComponent(); - #else BasicComponent::~BasicComponent(); - #endif #endif CATCLOSE(catd); diff --git a/cde/programs/dtmail/dtmail/RoamApp.C b/cde/programs/dtmail/dtmail/RoamApp.C index 049742f31..10ba126fe 100644 --- a/cde/programs/dtmail/dtmail/RoamApp.C +++ b/cde/programs/dtmail/dtmail/RoamApp.C @@ -981,11 +981,7 @@ void RoamApp::initialize(int *argcp, char **argv) int opt; char *helpId; -#ifdef hpV4 - signal(SIGUSR1, (void(*)(int ...))SigUsr1); -#else signal(SIGUSR1, SigUsr1); -#endif #ifdef _AIX (void)signal( SIGDANGER, pspace_signal ); diff --git a/cde/programs/dtmail/include/DtMail/HashTable.hh b/cde/programs/dtmail/include/DtMail/HashTable.hh index a91b70074..f12f930d6 100644 --- a/cde/programs/dtmail/include/DtMail/HashTable.hh +++ b/cde/programs/dtmail/include/DtMail/HashTable.hh @@ -55,17 +55,11 @@ class HashTableImpl : public DtCPlusPlusAllocator { virtual void set(ObjectKey & key, void * value); virtual void * remove(ObjectKey & key); -// HP can not support this construct. -// -#if !defined(HPUX) -// #define HASHTABLE_HASFOREACH typedef int (*HashImplIterator)(ObjectKey &, void * value, void * client_data); virtual void forEach(HashImplIterator, void * client_data); -#endif - protected: struct HashEntry : public DtCPlusPlusAllocator { ObjectKey * key; @@ -90,12 +84,10 @@ class HashTable : public DtCPlusPlusAllocator { Object remove(ObjectKey & key) { return( (Object)((long)_table.remove(key)) ); } -#if !defined(HPUX) typedef int (*HashIterator)(ObjectKey &, Object, void * client_data); void forEach(HashTableImpl::HashImplIterator iterator, void * client_data) { _table.forEach((HashTableImpl::HashImplIterator)iterator, client_data); } -#endif protected: HashTableImpl _table; diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailError.C b/cde/programs/dtmail/libDtMail/Common/DtMailError.C index 6ff659800..180a32ea2 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailError.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailError.C @@ -49,16 +49,7 @@ #include #include #include
- #include - -#if defined(HPUX) && !defined(hpV4) -// HP-UX 9.* syslog.h does not define these. -// -extern "C" int syslog(int, const char *, ...); -extern "C" int openlog(const char *, int, int); -#endif - #include // Provide interface to the DtSvc function DtSimpleError diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C index b4732147b..153290b9e 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C @@ -147,8 +147,6 @@ struct cmd cmdtab[] = { #define SYSTEM_MAILRC "/etc/mail/mail.rc" #elif defined(_AIX) || defined(__linux__) #define SYSTEM_MAILRC "/usr/share/lib/Mail.rc" -#elif defined(__hpux) -#define SYSTEM_MAILRC "/usr/share/lib/mailx.rc" #elif defined(CSRG_BASED) #define SYSTEM_MAILRC "/etc/mail.rc" #endif diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C index 973c96bdf..eec5e87ab 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C @@ -331,11 +331,7 @@ DtMailServer::do_send(char *fmt, ... ) // // Assemble command in printf(3) style, send to server, accept a response. // -#if defined(__hpux) -#define DTMAS_COMMAND_TERMINATOR "\n" -#else #define DTMAS_COMMAND_TERMINATOR "\r\n" -#endif DTMailError_t DtMailServer::do_transaction(char *fmt, ... ) { @@ -829,11 +825,7 @@ restoreSignal: // // Reset the nonresponse-timeout // -#if defined(__hpux) -#define TV_USEC_TYPE long -#else #define TV_USEC_TYPE int -#endif void DtMailServer::vtalarm_setitimer(int timeout_seconds) { diff --git a/cde/programs/dtmail/libDtMail/Common/HashTable.C b/cde/programs/dtmail/libDtMail/Common/HashTable.C index 4bc575a2c..913f6a028 100644 --- a/cde/programs/dtmail/libDtMail/Common/HashTable.C +++ b/cde/programs/dtmail/libDtMail/Common/HashTable.C @@ -189,7 +189,6 @@ HashTableImpl::remove(ObjectKey & key) return(removed_val); } -#if !defined(HPUX) void HashTableImpl::forEach(HashImplIterator iterator, void * client_data) { @@ -210,4 +209,3 @@ HashTableImpl::forEach(HashImplIterator iterator, void * client_data) } } } -#endif diff --git a/cde/programs/dtmail/libDtMail/Common/Process.C b/cde/programs/dtmail/libDtMail/Common/Process.C index 623e5f131..56611bb7a 100644 --- a/cde/programs/dtmail/libDtMail/Common/Process.C +++ b/cde/programs/dtmail/libDtMail/Common/Process.C @@ -53,8 +53,6 @@ */ #if defined(SunOS) #include -#elif defined(HPUX) -#include #elif defined(_AIX) || defined(__linux__) #define INFTIM (-1) /* Infinite timeout */ #endif diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C index 8e91838b6..498f360e7 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C @@ -63,7 +63,7 @@ #include #include #include -#if !defined(__aix) && !defined(__hpux) && !defined(__linux__) && !defined(CSRG_BASED) +#if !defined(__aix) && !defined(__linux__) && !defined(CSRG_BASED) #include #endif #include @@ -95,9 +95,7 @@ extern "C" { #if defined(sun) #define LCL_SIG_HANDLER_SIGNATURE -#elif defined(__hpux) -#define LCL_SIG_HANDLER_SIGNATURE __harg -#elif defined(__aix) || defined(__alpha) || defined(__linux__) || defined(CSRG_BASED) +#elif defined(__aix) || defined(__linux__) || defined(CSRG_BASED) #define LCL_SIG_HANDLER_SIGNATURE int #endif diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C index 0b14d72c4..00ddf4633 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C @@ -975,7 +975,7 @@ RFCTransport::signalRegister(void) if (initialized) return; initialized = 1; -#if defined(hpux) || defined(_aix) || defined(__linux__) || \ +#if defined(_aix) || defined(__linux__) || \ (defined(sun) && OSMAJORVERSION>=5 && OSMINORVERSION>4) || defined(CSRG_BASED) // SunOS 5.5 and above defined prototype for signal handler act.sa_handler = (void (*)(int))&RFCTransport::childHandler; diff --git a/cde/programs/dtmail/libDtMail/RFC/SunV3.C b/cde/programs/dtmail/libDtMail/RFC/SunV3.C index 38b9a303f..8353b7a92 100644 --- a/cde/programs/dtmail/libDtMail/RFC/SunV3.C +++ b/cde/programs/dtmail/libDtMail/RFC/SunV3.C @@ -57,8 +57,6 @@ */ #if defined(SunOS) #include -#elif defined(HPUX) -#include #elif defined(_AIX) || defined(__linux__) #define INFTIM (-1) /* Infinite timeout */ #endif diff --git a/cde/programs/dtpad/printSetup.c b/cde/programs/dtpad/printSetup.c index 4ae105e7e..26ad6c73c 100644 --- a/cde/programs/dtpad/printSetup.c +++ b/cde/programs/dtpad/printSetup.c @@ -421,9 +421,6 @@ _psGetResourceFileName(PrintSetup *pSetup) static char *dtpadrc = NULL; char *savePath, *saveFile; -#ifdef hpV4 - return XtNewString("/tmp/dtpadrc"); -#else if (dtpadrc != NULL) return XtNewString(dtpadrc); savePath = NULL; @@ -440,7 +437,6 @@ _psGetResourceFileName(PrintSetup *pSetup) dtpadrc = XtNewString(savePath); return XtNewString(dtpadrc); -#endif } /************************************************************************ diff --git a/cde/programs/dtpad/ttMsgSupport.c b/cde/programs/dtpad/ttMsgSupport.c index 54e8e857c..43148a602 100644 --- a/cde/programs/dtpad/ttMsgSupport.c +++ b/cde/programs/dtpad/ttMsgSupport.c @@ -871,17 +871,11 @@ TTdesktopOpen( int *ttFd, Editor *pPad, Boolean sendStarted ) #ifdef sun vendor = "Sun Microsystems"; -#else -#ifdef _AIX +#elif defined(_AIX) vendor = "IBM"; -#else -#ifdef hpux - vendor = "Hewlett-Packard"; #else vendor = "Unknown"; -#endif /* hpux */ #endif /* _AIX */ -#endif /* sun */ procId = ttdt_open( ttFd, "dtpad", vendor, "2.1", sendStarted ); if ( (status = tt_ptr_error( procId )) != TT_OK ) diff --git a/cde/programs/dtprintinfo/DtPrintinfo.C b/cde/programs/dtprintinfo/DtPrintinfo.C index 8e4c92b7b..4294acec8 100644 --- a/cde/programs/dtprintinfo/DtPrintinfo.C +++ b/cde/programs/dtprintinfo/DtPrintinfo.C @@ -49,25 +49,6 @@ nl_catd dtprintinfo_cat = NULL; extern "C" { extern int seteuid(uid_t); } #endif -#ifdef hpux -static char **msg_strings = NULL; - -// Cannot use multiple catgets parameter calls in functions because the -// previous catgets returned value is overwritten by later catgets calls -// Example: this would fail on HP systems -// sprintf(buf, "%s %s" catgets(...), catgets(...)) - -char *Catgets(nl_catd catd, int set_num, int msg_num, char *s) -{ - if (!msg_strings) - return s; - - if (!msg_strings[msg_num]) - msg_strings[msg_num] = strdup(CATGETS(catd, set_num, msg_num, s)); - return msg_strings[msg_num]; -} -#endif - int main(int argc, char **argv) { #ifndef NO_CDE @@ -75,11 +56,7 @@ int main(int argc, char **argv) #endif // run as user's UID -#ifdef hpux - setresuid(getuid(), getuid(), (uid_t)0); -#else seteuid(getuid()); -#endif setlocale(LC_ALL, ""); @@ -96,10 +73,6 @@ int main(int argc, char **argv) if ((nl_catd) errno) dtprintinfo_cat = (nl_catd) -1; -#ifdef hpux - else - msg_strings = (char **)calloc(LAST_MSG_NO, sizeof(char *)); -#endif } if (dtprintinfo_cat == NULL) { diff --git a/cde/programs/dtprintinfo/libUI/BaseUI.C b/cde/programs/dtprintinfo/libUI/BaseUI.C index 872945b33..933954990 100644 --- a/cde/programs/dtprintinfo/libUI/BaseUI.C +++ b/cde/programs/dtprintinfo/libUI/BaseUI.C @@ -42,13 +42,11 @@ #include #include #include -#ifdef hpux - #include -#elif defined(__linux__) +#if defined(__linux__) #include #else #include -#endif /* hpux */ +#endif /* linux */ #ifdef _AIX #include /* need to get bzero defined */ #endif /* _AIX */ diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C b/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C index 0407ed727..fd865c6b7 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C +++ b/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C @@ -276,7 +276,6 @@ void DtDND::GetDragPixmaps() XSetForeground(icon->display, gc_mask, 1); if (icon_size == LARGE_ICON) { -#ifndef hpux if (tmp_mask && tmp_mask != XmUNSPECIFIED_PIXMAP) { XSetClipOrigin(icon->display, gc_mask, p_x, p_y); @@ -286,7 +285,6 @@ void DtDND::GetDragPixmaps() XSetClipOrigin(icon->display, gc_mask, 0, 0); } else -#endif XFillRectangle(icon->display, mask, gc_mask, p_x, p_y, p_w, p_h); } else diff --git a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C index 0eff7c7ce..484925c48 100644 --- a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C +++ b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C @@ -70,14 +70,10 @@ extern "C" in_addr_t inet_addr(const char *); extern "C" { int rresvport(int *); } #endif -#ifdef hpux - #define SETEUID(id) setresuid(getuid(), (uid_t)id, (uid_t)0); -#else - #if defined(aix) - extern "C" { extern int seteuid(uid_t); } - #endif - #define SETEUID(id) seteuid((uid_t)id) +#if defined(aix) + extern "C" { extern int seteuid(uid_t); } #endif +#define SETEUID(id) seteuid((uid_t)id) #include "ParseJobs.h" #include "Invoke.h" @@ -693,106 +689,6 @@ static int SortJobs(const void *_first, const void *_second) #endif // SUN LOCAL PARSER -#ifdef hpux - -/* HP LOCAL PARSER - have to parse the following - - Need to parse the following 2 forms of output: - - coseps-28 guest priority 0 Aug 9 12:54 on coseps - test.ps 31160 bytes - - OR - - coseps-29 guest priority 0 Aug 9 12:56 on hostname - (standard input) 31160 bytes -*/ - -void LocalPrintJobs(char *printer, char **return_job_list, int *return_n_jobs) -{ - char *buf = new char[300]; - char *s, *s1, *c; - char *qname; - char *jname; - char *jnumber; - char *owner; - char *month; - char *day; - char *stime; - char *jsize; - char *hostname; - int current_size; - int len; - char *output; - - static char *job_list = NULL; - static int prev_buf_size = 0; - - sprintf(buf, "LANG=C lpstat -i -o%s", printer); - Invoke *_thread = new Invoke(buf, &output); - - if (prev_buf_size == 0) - { - prev_buf_size = BUFSIZ; - job_list = (char *)malloc(prev_buf_size); - } - - current_size = 0; - *job_list = '\0'; - *return_n_jobs = 0; - s = output; - if (s1 = strchr(s, '\n')) - *s1++ = '\0'; - while (s && *s) - { - qname = strtok(s, "-"); - jnumber = strtok(NULL, " "); - owner = strtok(NULL, " "); - strtok(NULL, " "); - strtok(NULL, " "); - month = strtok(NULL, " "); - day = strtok(NULL, " "); - stime = strtok(NULL, " \n"); - strtok(NULL, " "); - hostname = strtok(NULL, " \n"); - s = s1; - if (s1 = strchr(s, '\n')) - *s1++ = '\0'; - for (jname = s; *jname == '\t' || *jname == ' '; jname++) - ; - jsize = strrchr(s, ' '); - *jsize = '\0'; - jsize = strrchr(s, ' ') + 1; - for (c = jsize - 1; *c == ' '; c--) - ; - *(c + 1) = '\0'; - if (hostname && strcmp(qname, hostname)) - sprintf(buf, "%s|%s|%s|%s@%s|%s %s|%s|%s\n", qname, jname, jnumber, - owner, hostname, month, day, stime, jsize); - else - sprintf(buf, "%s|%s|%s|%s|%s %s|%s|%s\n", qname, jname, jnumber, - owner, month, day, stime, jsize); - - len = strlen(buf); - if (prev_buf_size < (current_size + len + 1)) - job_list = (char *) realloc(job_list, (current_size + len + 1) * - sizeof(char *)); - memcpy(job_list + current_size, buf, len); - current_size += len; - (*return_n_jobs)++; - s = s1; - if (s1 = strchr(s, '\n')) - *s1++ = '\0'; - } - *(job_list + current_size) = '\0'; - prev_buf_size = prev_buf_size > current_size ? prev_buf_size : current_size; - *return_job_list = job_list; - delete [] buf; - delete output; - delete _thread; -} -#endif // HP LOCAL PARSER - #if defined(__linux__) || defined(CSRG_BASED) //Linux local parser diff --git a/cde/programs/dtprintinfo/objects/PrintObj/PrintSubSys.C b/cde/programs/dtprintinfo/objects/PrintObj/PrintSubSys.C index 1d7a65938..76f67e53b 100644 --- a/cde/programs/dtprintinfo/objects/PrintObj/PrintSubSys.C +++ b/cde/programs/dtprintinfo/objects/PrintObj/PrintSubSys.C @@ -36,15 +36,6 @@ #ifdef aix const char *LIST_QUEUES = "lsallq | grep -v '^bsh$' | sort"; #else -#ifdef hpux -const char *LIST_QUEUES = "LANG=C lpstat -v | " - "awk '" - " $2 == \"for\" " - " { " - " x = match($3, /:/); " - " print substr($3, 1, x-1)" - " }' | sort"; -#else const char *LIST_QUEUES = "LANG=C lpstat -v | " "nawk '" " $2 == \"for\" " @@ -53,7 +44,6 @@ const char *LIST_QUEUES = "LANG=C lpstat -v | " " print substr($3, 1, x-1)" " }' | sort"; #endif -#endif // Object Class Name const char *PRINTSUBSYSTEM = "PrintSubSystem"; diff --git a/cde/programs/dtprintinfo/objects/PrintObj/Queue.C b/cde/programs/dtprintinfo/objects/PrintObj/Queue.C index c1c3ae58c..21f845839 100644 --- a/cde/programs/dtprintinfo/objects/PrintObj/Queue.C +++ b/cde/programs/dtprintinfo/objects/PrintObj/Queue.C @@ -46,21 +46,6 @@ const char *GET_DEVICE_STATUS = "LANG=C enq -As -P%s | " const char *START_QUEUE_CMD = "enq -U -P%s"; const char *STOP_QUEUE_CMD = "enq -D -P%s"; #else -#ifdef hpux -const char *GET_ATTRS = "LANG=C lpstat -v%s 2>&1 | awk '" - "BEGIN { device=\"\"; rhost=\"\"; rp=\"\" } " - "/device for/ { device = $4 } " - "/remote to/ { rhost = $5; rp = $3 } " - "END { print device,rhost,rp }' OFS=:"; -const char *GET_QUEUE_STATUS = "LANG=C lpstat -i -a%s | awk '" - "{if ($2 == \"not\") {exit 1} else {exit 0}}'"; -const char *GET_DEVICE_STATUS = "LANG=C lpstat -i -p%s | " - "awk '/disabled/ {exit 1}'"; -const char *START_QUEUE_CMD = "/usr/lib/accept %s"; -const char *STOP_QUEUE_CMD = "/usr/lib/reject %s"; -const char *START_PRINTING_CMD = "enable %s"; -const char *STOP_PRINTING_CMD = "disable %s"; -#else const char *GET_ATTRS = "LANG=C lpstat -v %s 2>&1 | nawk '" "BEGIN { device=\"\"; rhost=\"\"; rp=\"\" } " "/device for/ { device = $4 } " @@ -79,7 +64,6 @@ const char *STOP_QUEUE_CMD = "/usr/sbin/reject %s"; const char *START_PRINTING_CMD = "enable %s"; const char *STOP_PRINTING_CMD = "disable %s"; #endif -#endif // Object Class Name const char *QUEUE = "Queue"; diff --git a/cde/programs/dtscreen/dtscreen.h b/cde/programs/dtscreen/dtscreen.h index 1a44aafd3..4c7b4cce9 100644 --- a/cde/programs/dtscreen/dtscreen.h +++ b/cde/programs/dtscreen/dtscreen.h @@ -92,7 +92,7 @@ extern void unhide_hft_ring(); #include #define passwd spwd #define pw_passwd sp_pwdp -#if defined(AIXV3) || defined(hpux) +#if defined(AIXV3) #undef NULL #define NULL 0 #include @@ -111,7 +111,7 @@ struct passwd { #include #define getpwnam getspnam #endif -#if !(defined(_AIX) || defined(hpux) || defined(sun)) +#if !(defined(_AIX) || defined(sun)) # define srandom srand # define random rand # define MAXRAND (32767.0) diff --git a/cde/programs/dtscreen/usleep.c b/cde/programs/dtscreen/usleep.c index 82470bfda..834c41ab2 100644 --- a/cde/programs/dtscreen/usleep.c +++ b/cde/programs/dtscreen/usleep.c @@ -41,7 +41,7 @@ #include "dtscreen.h" -#if !defined(_AIX) && !defined(hpV4) && !defined(__linux__) && !defined(sun) && !defined(CSRG_BASED) +#if !defined(_AIX) && !defined(__linux__) && !defined(sun) && !defined(CSRG_BASED) int usleep(unsigned long usec) { @@ -55,7 +55,7 @@ usleep(unsigned long usec) #endif return 0; } -#endif /* !_AIX && !hpV4*/ +#endif /* !_AIX && */ /* * returns the number of seconds since 01-Jan-70. diff --git a/cde/programs/dtsearchpath/dtsp/HelpSearchPath.C b/cde/programs/dtsearchpath/dtsp/HelpSearchPath.C index 25d8136c1..fbbd39769 100644 --- a/cde/programs/dtsearchpath/dtsp/HelpSearchPath.C +++ b/cde/programs/dtsearchpath/dtsp/HelpSearchPath.C @@ -114,20 +114,6 @@ HelpSearchPath::HelpSearchPath NormalizePath(); TraversePath(); -#if defined(hpux) - AddToPath ("/etc/vhelp/%T/%L/%H"); - AddToPath ("/etc/vhelp/%T/%H"); - AddToPath ("/etc/vhelp/%T/%L/%H.hv"); - AddToPath ("/etc/vhelp/%T/%H.hv"); - AddToPath ("/etc/vhelp/%T/C/%H"); - AddToPath ("/etc/vhelp/%T/C/%H.hv"); - AddToPath ("/usr/vhelp/%T/%L/%H"); - AddToPath ("/usr/vhelp/%T/%H"); - AddToPath ("/usr/vhelp/%T/%L/%H.hv"); - AddToPath ("/usr/vhelp/%T/%H.hv"); - AddToPath ("/usr/vhelp/%T/C/%H"); - AddToPath ("/usr/vhelp/%T/C/%H.hv"); -#endif } diff --git a/cde/programs/dtsearchpath/dtsp/Options.C b/cde/programs/dtsearchpath/dtsp/Options.C index b6d0af64f..1edfcc3f9 100644 --- a/cde/programs/dtsearchpath/dtsp/Options.C +++ b/cde/programs/dtsearchpath/dtsp/Options.C @@ -99,9 +99,6 @@ CString Usage ("Usage: dtsearchpath [ -v | -T | -o | -a | -csh | -ksh ] " } } } -#if defined(hpux) || defined(hpV4) - flags |= 16; -#endif } diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C index 1c634ff10..f3bd8d631 100644 --- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C +++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C @@ -71,8 +71,6 @@ UnixEnvironment::UnixEnvironment() manpath = "/usr/share/man"; #elif defined(_AIX) manpath = "/usr/share/man:/usr/lpp/info"; -#elif defined(hpux) - manpath = "/usr/man:/usr/contrib/man:/usr/local/man"; #elif defined(__linux__) manpath = "/usr/share/man/%L:/usr/share/man:/usr/contrib/man/%L:/usr/contrib/man:/usr/local/man/%L:/usr/local/man"; #elif defined(__OpenBSD__) diff --git a/cde/programs/dtsession/Sm.h b/cde/programs/dtsession/Sm.h index f1d8014ec..e76be5b78 100644 --- a/cde/programs/dtsession/Sm.h +++ b/cde/programs/dtsession/Sm.h @@ -80,10 +80,6 @@ #define SM_FREE(PTR) XtFree(PTR) #define SM_EXIT(STATUS) SmExit(STATUS) -#ifdef __hpux -#define SM_SETEUID(EUID) setresuid(-1, EUID, -1) -#define SM_SETESUID(UID) setresuid(-1, UID, UID) -#else #ifndef SVR4 #define SM_SETEUID(EUID) seteuid(EUID) #define SM_SETESUID(UID) setreuid(UID, UID) @@ -91,7 +87,6 @@ #define SM_SETEUID(EUID) seteuid(EUID) #define SM_SETESUID(UID) (setuid(UID), seteuid(UID)) #endif -#endif /* * Types of states the session manager can be in diff --git a/cde/programs/dtsession/SmConMgmt.c b/cde/programs/dtsession/SmConMgmt.c index 237625425..5ffd31a5a 100644 --- a/cde/programs/dtsession/SmConMgmt.c +++ b/cde/programs/dtsession/SmConMgmt.c @@ -87,13 +87,6 @@ #ifdef mips #define GPGSLIM "gpgslim" #define FREEMEM "freemem" -#else /* not mips */ -# ifdef __hpux -# ifdef __hp9000s800 -# define GPGSLIM "gpgslim" -# define FREEMEM "freemem" -# endif /* __hp9000s800 */ -# endif /* __hpux */ #endif /* mips */ #ifndef GPGSLIM @@ -163,21 +156,17 @@ GetMemoryUtilization(void) #if !defined(__linux__) static int init = 0; static int kmem; -#if !defined(SVR4) && !defined(hpV4) && !defined(_POWER) && !defined(CSRG_BASED) +#if !defined(SVR4) && !defined(_AIX) && !defined(CSRG_BASED) extern void nlist(); #endif int i; -#ifdef __hpux - setresgid(-1, smGD.conMgmtGID, -1); -#else #ifndef SVR4 setregid(smGD.runningGID, smGD.conMgmtGID); #else setgid(smGD.runningGID); setegid(smGD.conMgmtGID); -#endif #endif if(!init) @@ -191,15 +180,11 @@ GetMemoryUtilization(void) if (namelist[i].n_type == 0 || namelist[i].n_value == 0) { -#ifdef __hpux - setresgid(-1, smGD.runningGID, -1); -#else #ifndef SVR4 setregid(smGD.conMgmtGID, smGD.runningGID); #else setgid(smGD.conMgmtGID); setegid(smGD.runningGID); -#endif #endif return(MEM_NOT_AVAILABLE); } @@ -211,15 +196,11 @@ GetMemoryUtilization(void) kmem = open(KMEM_FILE, O_RDONLY); if (kmem < 0) { -#ifdef __hpux - setresgid(-1, smGD.runningGID, -1); -#else #ifndef SVR4 setregid(smGD.conMgmtGID, smGD.runningGID); #else setgid(smGD.conMgmtGID); setegid(smGD.runningGID); -#endif #endif return(MEM_NOT_AVAILABLE); } @@ -247,15 +228,11 @@ GetMemoryUtilization(void) (void) read(kmem, (char *)&freemem, sizeof(int)); #endif /* mips */ -#ifdef __hpux - setresgid(-1, smGD.runningGID, -1); -#else #ifndef SVR4 setregid(smGD.conMgmtGID, smGD.runningGID); #else setgid(smGD.conMgmtGID); setegid(smGD.runningGID); -#endif #endif if(freemem >= gpgslim) diff --git a/cde/programs/dtsession/SmGlobals.c b/cde/programs/dtsession/SmGlobals.c index 0bb24e7ed..f6817da7a 100644 --- a/cde/programs/dtsession/SmGlobals.c +++ b/cde/programs/dtsession/SmGlobals.c @@ -266,13 +266,6 @@ static XtResource saverResources[]= machineDefault[] = { { 0, 20, 60}, /* Machine independent default */ -#ifdef __hpux - {300, 10, 60}, /* HP s300 */ - {400, 10, 60}, /* HP s400 */ - {600, 5, 60}, /* HP s600 */ - {700, 5, 60}, /* HP s700 */ - {800, 5, 60}, /* HP s800 */ -#endif /* __hpux */ }; #define MACHINEDEFAULTS (sizeof(machineDefault) / sizeof(machineDefault[0])) @@ -420,38 +413,6 @@ InitSMGlobals( void ) smGD.userSetWaitWmTimeout = True; /* assume it is */ -#ifdef __hpux - if (uname(&nameRec) == 0) - { - keyNum = nameRec.machine; - if (firstSlash = strchr(keyNum, '/')) - { - keyNum = ++firstSlash; - - if ( keyNum[0] == '3') - { - machineType = 300; - } - else if (keyNum[0] == '4') - { - machineType = 400; - } - else if (keyNum[0] == '6') - { - machineType = 600; - } - else if (keyNum[0] == '7') - { - machineType = 700; - } - else if (keyNum[0] == '8') - { - machineType = 800; - } - } - } -#endif /* __hpux */ - /* * Get application specific resource values */ @@ -1385,13 +1346,11 @@ RemoveFiles( /* * Set the gid of the process back from bin */ -#ifndef __hpux #ifndef SVR4 setregid(smGD.runningGID, smGD.runningGID); #else setgid(smGD.runningGID); setegid(smGD.runningGID); -#endif #endif _DtEnvControl(DT_ENV_RESTORE_PRE_DT); @@ -1490,13 +1449,11 @@ MoveDirectory( /* * Set the gid of the process back from bin */ -#ifndef __hpux #ifndef SVR4 setregid(smGD.runningGID, smGD.runningGID); #else setgid(smGD.runningGID); setegid(smGD.runningGID); -#endif #endif _DtEnvControl(DT_ENV_RESTORE_PRE_DT); diff --git a/cde/programs/dtsession/SmMain.c b/cde/programs/dtsession/SmMain.c index 5d7b6a97b..30366e1c5 100644 --- a/cde/programs/dtsession/SmMain.c +++ b/cde/programs/dtsession/SmMain.c @@ -89,9 +89,6 @@ static int RegisterX11ScreenSaver(Display *display, int *ssEventType); /* * Internal Defines */ -#ifdef __hpux -#define SECURE_SYS_PATH "/.secure/etc/passwd" -#endif #ifdef _AIX #define SECURE_SYS_PATH "/etc/security/passwd" #endif @@ -218,16 +215,12 @@ main (int argc, char **argv) (void) putenv (lang); } -#ifdef __hpux - setresgid(-1, smGD.runningGID, -1); -#else /* _AIX or any other system */ #ifndef SVR4 setregid(smGD.conMgmtGID, smGD.runningGID); #else setgid(smGD.conMgmtGID); setegid(smGD.runningGID); -#endif -#endif /* !hpux */ +#endif /* !SVR4 */ /* * Set up POSIX sigaction structs diff --git a/cde/programs/dtsession/SmRestore.c b/cde/programs/dtsession/SmRestore.c index 5b1dfd526..9b1225196 100644 --- a/cde/programs/dtsession/SmRestore.c +++ b/cde/programs/dtsession/SmRestore.c @@ -890,7 +890,6 @@ RestoreResources( Boolean errorHandlerInstalled, ... ) { SetSIGPIPEToDefault (); -#ifndef __hpux /* * Set the gid of the process back from bin */ @@ -900,7 +899,7 @@ RestoreResources( Boolean errorHandlerInstalled, ... ) setgid(smGD.runningGID); setegid(smGD.runningGID); #endif -#endif + #if defined(CSRG_BASED) setsid(); #else @@ -3611,7 +3610,6 @@ StartLocalClient ( putenv (strdup (*ppchar)); } -#ifndef __hpux /* * Set the gid of the process back from bin */ @@ -3620,7 +3618,6 @@ StartLocalClient ( #else setgid(smGD.runningGID); setegid(smGD.runningGID); -#endif #endif _DtEnvControl(DT_ENV_RESTORE_PRE_DT); @@ -3765,67 +3762,7 @@ ForkWM( void ) pid_t clientFork; int execStatus, i; -#ifdef __hpux - /* - * These lines were added to support the builtin - * panacomm dtwm. - */ - char *homeDir; - char *hostName; - char *displayName,*dpy; - - hostName = SM_MALLOC(MAXPATHSM); - displayName = SM_MALLOC(MAXPATHSM); - - if( gethostname(hostName, (sizeof(hostName) - 1) ) == 0) - { - hostName[MAXPATHSM - 1] = '\0'; - dpy = getenv(DISPLAY_NAME); - homeDir = getenv("HOME"); - if (dpy && homeDir) - { - strcpy(displayName, dpy); - dpy = strchr(displayName, ':'); - if (dpy) - { - *dpy = '\0'; - } - sprintf(tmpExecWmFile, "%s/.dt/bin/%s/%s/dtwm", homeDir, - hostName,displayName); - if (access(tmpExecWmFile,X_OK) != 0) - { - strcpy(tmpExecWmFile,CDE_INSTALLATION_TOP "/bin/dtwm"); - } - else - { - localWmLaunched = True; - if (!smGD.userSetWaitWmTimeout) - { - smRes.waitWmTimeout = 60000; - } - } - } - else - { - strcpy(tmpExecWmFile,CDE_INSTALLATION_TOP "/bin/dtwm"); - } - } - else - { - strcpy(tmpExecWmFile,CDE_INSTALLATION_TOP "/bin/dtwm"); - } - - SM_FREE(hostName); - SM_FREE(displayName); - /* - * ^^^^^ ^^^^^ ^^^^^ ^^^^^ ^^^^^ ^^^^^ - * End of lines were added to support the builtin - * panacomm dtwm. - */ -#else strcpy(tmpExecWmFile,CDE_INSTALLATION_TOP "/bin/dtwm"); -#endif /* __hpux */ - /* * Fork and exec the client process @@ -3848,7 +3785,6 @@ ForkWM( void ) { SetSIGPIPEToDefault (); -#ifndef __hpux /* * Set the gid of the process back from bin */ @@ -3857,7 +3793,6 @@ ForkWM( void ) #else setgid(smGD.runningGID); setegid(smGD.runningGID); -#endif #endif _DtEnvControl(DT_ENV_RESTORE_PRE_DT); diff --git a/cde/programs/dtsession/sys.resources.src b/cde/programs/dtsession/sys.resources.src index b97fdc014..0756f7931 100644 --- a/cde/programs/dtsession/sys.resources.src +++ b/cde/programs/dtsession/sys.resources.src @@ -80,11 +80,6 @@ XCOMM endif *ttyModes: erase ^H intr ^C kill ^U start ^Q stop ^S swtch ^@ susp ^Z *promptDialog.bboard.frame.form.text.columns: %|nls-3-#45#| -#ifdef __hpux -Hpterm*backgroundIsSelect: True -Hpterm*makeColors: shadow -#endif - dtsession*saverTimeout: 10 dtsession*lockTimeout: 30 dtsession*cycleTimeout: 3 @@ -160,44 +155,6 @@ XCOMM endif *enableDragIcon: True *enableCDEColorFactors: True -#ifdef __hpux -!################################################################# -!# -!# CDE translations for the text widget and text field widget -!# -!# - provides more intuitive "clear line", "insert line" and -!# "delete line" behavior -!# - provides basic EMACS editor functionality -!# -!################################################################# -*XmText*Translations:#override\n\ - hpClearLine: delete-to-end-of-line()\n\ - ~m ~a osfPrimaryPaste:beginning-of-line()\ - newline-and-backup()\n\ - osfQuickPaste: beginning-of-line()\ - insert-string(\" \")\ - beginning-of-line()\ - delete-to-end-of-line()\ - delete-next-character()\n\ - Ctrlu:delete-to-start-of-line()\n\ - Ctrlk:delete-to-end-of-line()\n\ - Ctrla:beginning-of-line()\n\ - Ctrle:end-of-line()\n\ - Ctrlp:process-up()\n\ - Ctrlb:backward-character()\n\ - Ctrln:process-down()\n\ - Ctrlf:forward-character() -*XmTextField*Translations:#override\n\ - hpClearLine: delete-to-end-of-line()\n\ - osfQuickPaste: beginning-of-line()\ - delete-to-end-of-line()\n\ - Ctrlu:delete-to-start-of-line()\n\ - Ctrlk:delete-to-end-of-line()\n\ - Ctrla:beginning-of-line()\n\ - Ctrle:end-of-line()\n\ - Ctrlb:backward-character()\n\ - Ctrlf:forward-character() -#else !################################################################# !# !# CDE translations for the text widget and text field widget @@ -221,7 +178,6 @@ XCOMM endif Ctrle:end-of-line()\n\ Ctrlb:backward-character()\n\ Ctrlf:forward-character() -#endif !################################################################# !# diff --git a/cde/programs/dtspcd/main.c b/cde/programs/dtspcd/main.c index c48a51ac4..7b02b79bc 100644 --- a/cde/programs/dtspcd/main.c +++ b/cde/programs/dtspcd/main.c @@ -91,7 +91,6 @@ int Client_Environ_Reset(protocol_request_ptr prot); int Client_Reply_Devices(protocol_request_ptr prot); int Client_Reply_Logfile(protocol_request_ptr prot); int Client_Delete_Logfile(protocol_request_ptr prot); -int Client_Reset_Termio(protocol_request_ptr prot); int Client_Reset_Termios(protocol_request_ptr prot); int Client_Protocol_Version(protocol_request_ptr prot); int Client_Reply_Protocol(protocol_request_ptr prot); @@ -140,7 +139,6 @@ protocol_request_handler spcd_protocol_dispatch_table[NREQS]={ Client_Reply_Logfile, /* QUERY_LOGFILE */ NULL, /* LOGFILE_REPLY */ Client_Delete_Logfile, /* DELETE_LOGFILE */ - Client_Reset_Termio, /* RESET_TERMIO (obsolete) */ Client_Reset_Termios, /* RESET_TERMIOS */ Client_Send_EOF, /* CHANNEL_SEND_EOF */ Client_Channel_Termios, /* CHANNEL_TERMIOS */ @@ -1117,19 +1115,6 @@ int Client_Delete_Logfile(protocol_request_ptr prot) return(XeSPCRemoveLogfile(channel)); } -/*----------------------------------------------------------------------+*/ -int Client_Reset_Termio(protocol_request_ptr prot) -/*----------------------------------------------------------------------+*/ -{ - /* This handles old 1.0 versions of the SPC code. We used to send */ - /* an hp-ux version of the termio struct in a non-portable manner */ - /* We need to be able to "eat" such an request if we get one. */ - - print_protocol_request((XeString)"--> RESET_TERMIO", prot); - - return(SPC_Get_Termio(prot)); -} - /*----------------------------------------------------------------------+*/ int Client_Reset_Termios(protocol_request_ptr prot) /*----------------------------------------------------------------------+*/ diff --git a/cde/programs/dtspcd/spcd_event.c b/cde/programs/dtspcd/spcd_event.c index 2f388da7f..33f0fd010 100644 --- a/cde/programs/dtspcd/spcd_event.c +++ b/cde/programs/dtspcd/spcd_event.c @@ -40,11 +40,7 @@ #include /* for fd_set, FD_SET macros, et. al. */ #include -#ifndef __hpux # define FD_SET_CAST(x) (x) -#else -# define FD_SET_CAST(x) ((int *)(x)) -#endif /* __hpux */ struct {SbInputCallbackProc handler; void* data; } SPCD_input_handlers [FD_SETSIZE], diff --git a/cde/programs/dtstyle/Backdrop.c b/cde/programs/dtstyle/Backdrop.c index 1e0ee803d..98a4689fa 100644 --- a/cde/programs/dtstyle/Backdrop.c +++ b/cde/programs/dtstyle/Backdrop.c @@ -399,35 +399,6 @@ CreateBackdropDialog( /* from that locale's description file from the system location */ lang = setlocale (LC_CTYPE,NULL); -#ifdef hpux /* hpux-specific parsing of the locale string */ - /* The following code is identical to the - ExtractLocaleName function in WmResParse.c - from dtwm - */ -#define MAXLOCALE 64 /* buffer size of locale name */ - -{ char *start; - char *end; - int len; - static char buf[MAXLOCALE]; - - /* If lang has a substring ":;", extract - * from the first such occurrence as the locale name. - */ - - start = lang; - if (start = strchr (lang, ':')) { - start++; - if (end = strchr (start, ';')) { - len = end - start; - strncpy(buf, start, len); - *(buf + len) = '\0'; - lang = buf; - } - } -} -#endif /* hpux */ - bd_desc = (char *)XtMalloc(strlen("/usr/dt/backdrops/desc.") + strlen(lang) + 1); strcpy (bd_desc,"/usr/dt/backdrops/desc."); strcat (bd_desc, lang); diff --git a/cde/programs/dtstyle/ColorFile.c b/cde/programs/dtstyle/ColorFile.c index b638f5045..8ae8724cd 100644 --- a/cde/programs/dtstyle/ColorFile.c +++ b/cde/programs/dtstyle/ColorFile.c @@ -48,9 +48,7 @@ #include -#ifdef __hpux -#include /* opendir(), directory(3C) */ -#elif defined(SVR4) || defined(CSRG_BASED) +#if defined(SVR4) || defined(CSRG_BASED) #include /* opendir(), directory(3C) */ #else #include @@ -137,11 +135,7 @@ static char *home_palette_dir; static int loopcount = 0; static DIR *dirp; -#ifdef __hpux -static struct direct *file_descpt; -#else static struct dirent *file_descpt; -#endif /* __hpux */ static Boolean open_dir = False; extern XrmDatabase hm_pl_DB; @@ -761,11 +755,7 @@ AddDirectories( char *text ) ********************************************************************/ void CheckForDeletedFile( -#ifdef __hpux - struct direct *file_descpt ) -#else struct dirent *file_descpt ) -#endif /* __hpux */ { char *filename; int i; diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c index f60cf91ea..589cfd021 100644 --- a/cde/programs/dtstyle/ColorMain.c +++ b/cde/programs/dtstyle/ColorMain.c @@ -319,35 +319,6 @@ loadDatabase(void) lang = setlocale (LC_CTYPE,NULL); -#ifdef hpux /* hpux-specific parsing of the locale string */ - /* The following code is identical to the - ExtractLocaleName function in WmResParse.c - from dtwm - */ -#define MAXLOCALE 64 /* buffer size of locale name */ - -{ char *start; - char *end; - int len; - static char buf[MAXLOCALE]; - - /* If lang has a substring ":;", extract - * from the first such occurrence as the locale name. - */ - - start = lang; - if (start = strchr (lang, ':')) { - start++; - if (end = strchr (start, ';')) { - len = end - start; - strncpy(buf, start, len); - *(buf + len) = '\0'; - lang = buf; - } - } -} -#endif /* hpux */ - pl_desc = (char *)XtMalloc(strlen("/usr/dt/palettes/desc.") + strlen(lang) + 1); strcpy (pl_desc,"/usr/dt/palettes/desc."); strcat (pl_desc, lang); diff --git a/cde/programs/dtterm/tests/shared/include_files.h b/cde/programs/dtterm/tests/shared/include_files.h index 99aee68ca..2b8f0ae9d 100644 --- a/cde/programs/dtterm/tests/shared/include_files.h +++ b/cde/programs/dtterm/tests/shared/include_files.h @@ -25,10 +25,6 @@ #define DO_NOT_NEED_NOW #endif -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#endif - #include #include #include diff --git a/cde/programs/dtterm/tests/shared/p2c.h b/cde/programs/dtterm/tests/shared/p2c.h index 5a4eb7fea..1c084967f 100644 --- a/cde/programs/dtterm/tests/shared/p2c.h +++ b/cde/programs/dtterm/tests/shared/p2c.h @@ -40,10 +40,6 @@ /* If the following heuristic fails, compile -DBSD=0 for non-BSD systems, or -DBSD=1 for BSD systems. */ -#ifdef M_XENIX -# define BSD 0 -#endif - #ifdef FILE /* a #define in BSD, a typedef in SYSV (hp-ux, at least) */ # ifndef BSD /* (a convenient, but horrible kludge!) */ # define BSD 1 @@ -115,12 +111,6 @@ typedef struct __p2c_jmp_buf { -#ifdef M_XENIX /* avoid compiler bug */ -# define SHORT_MAX (32767) -# define SHORT_MIN (-32768) -#endif - - /* The following definitions work only on twos-complement machines */ #ifndef SHORT_MAX # define SHORT_MAX (((unsigned short) -1) >> 1) diff --git a/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h b/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h index 4a7b6f713..e1c41f25b 100644 --- a/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h +++ b/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h @@ -87,13 +87,6 @@ typedef struct _TempFont { # define DEFAULTBYTEORDER MSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ -#elif defined(hpux) - -# 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(mips) # ifdef MIPSEL diff --git a/cde/programs/dtudcfonted/libfal/_falSetLocale.c b/cde/programs/dtudcfonted/libfal/_falSetLocale.c index 958b9d08e..16cdc909c 100644 --- a/cde/programs/dtudcfonted/libfal/_falSetLocale.c +++ b/cde/programs/dtudcfonted/libfal/_falSetLocale.c @@ -143,13 +143,9 @@ _falsetlocale(int category, const char *name) char * _fallcMapOSLocaleName(char *osname, char *siname) { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) +#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) -#ifdef hpux -#define SKIPCOUNT 2 -#define STARTCHAR ':' -#define ENDCHAR ';' -#elif !defined(sun) || defined(SVR4) +#if !defined(sun) || defined(SVR4) #define STARTCHAR '/' #define ENDCHAR '/' #endif diff --git a/cde/programs/dtwm/Dtwm.defs.src b/cde/programs/dtwm/Dtwm.defs.src index adc127b43..b13e0a5f4 100644 --- a/cde/programs/dtwm/Dtwm.defs.src +++ b/cde/programs/dtwm/Dtwm.defs.src @@ -30,9 +30,6 @@ Dtwm*useFrontPanel: True !### Dtwm*Dtmail*iconImage: DtMail Dtwm*Dtterm*iconImage: Fpterm -#ifdef __hpux -Dtwm*HPterm*iconImage: Fpterm -#endif /* __hpux */ !# XTerm icon setting commented out - icon does not exist. !# Dtwm*XTerm*iconImage: Dtxterm.l diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c index 164c059b6..99304bc2f 100644 --- a/cde/programs/dtwm/WmResParse.c +++ b/cde/programs/dtwm/WmResParse.c @@ -1757,31 +1757,6 @@ void ProcessWmFile (WmScreenData *pSD, Boolean bNested) static char *ExtractLocaleName(String lang) { - -#ifdef hpux /* hpux-specific parsing of the locale string */ -#define MAXLOCALE 64 /* buffer size of locale name */ - - char *start; - char *end; - int len; - static char buf[MAXLOCALE]; - - /* If lang has a substring ":;", extract - * from the first such occurrence as the locale name. - */ - - start = lang; - if (start = strchr (lang, ':')) { - start++; - if (end = strchr (start, ';')) { - len = end - start; - strncpy(buf, start, len); - *(buf + len) = '\0'; - lang = buf; - } - } -#endif /* hpux */ - return lang; } diff --git a/cde/programs/dtwm/examples/occupy/Makefile.hp b/cde/programs/dtwm/examples/occupy/Makefile.hp deleted file mode 100644 index d0822d7f1..000000000 --- a/cde/programs/dtwm/examples/occupy/Makefile.hp +++ /dev/null @@ -1,48 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:33:03 drk $ -########################################################################## -# -# Makefile for occupy.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = occupy -SOURCES = occupy.c -OBJECTS = occupy.o - -CFLAGS = +Obb2000 -Aa -D_HPUX_SOURCE -CDEBUGFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/include/X11R5 -EXTRA_INCLUDES = -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) $(EXTRA_INCLUDES) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L/usr/lib/X11R5 -lXt -X11LIB = -L/usr/lib/X11R5 -lX11 - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) $(X11LIB) -LDFLAGS = - -.c.o: - cc -c $(CFLAGS) $(CDEBUGFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/dtwm/examples/wsinfo/Makefile.hp b/cde/programs/dtwm/examples/wsinfo/Makefile.hp deleted file mode 100644 index 0aa506eba..000000000 --- a/cde/programs/dtwm/examples/wsinfo/Makefile.hp +++ /dev/null @@ -1,48 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:34:13 drk $ -########################################################################## -# -# Makefile for wsinfo.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = wsinfo -SOURCES = wsinfo.c -OBJECTS = wsinfo.o - -CFLAGS = +Obb2000 -Aa -D_HPUX_SOURCE -CDEBUGFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/include/X11R5 -EXTRA_INCLUDES = -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) $(EXTRA_INCLUDES) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L/usr/lib/X11R5 -lXt -X11LIB = -L/usr/lib/X11R5 -lX11 - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) $(X11LIB) -LDFLAGS = - -.c.o: - cc -c $(CFLAGS) $(CDEBUGFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/localized/de_DE.UTF-8/msg/dtfile.msg b/cde/programs/localized/de_DE.UTF-8/msg/dtfile.msg index b743ae7e6..0b55d2635 100644 --- a/cde/programs/localized/de_DE.UTF-8/msg/dtfile.msg +++ b/cde/programs/localized/de_DE.UTF-8/msg/dtfile.msg @@ -1059,13 +1059,6 @@ Die ausgewählte Datei ist nicht mehr vorhanden." 31 "Datei- oder Ordnername:" 32 "Inhalt der Datei:" -$ Messages 33-35 are used on hpux systems - -33 "Ein" - -34 "Aus" - -35 "Verweisen folgen: " 36 "Neues Fenster öffnen" diff --git a/cde/programs/localized/el_GR.UTF-8/msg/dtfile.msg b/cde/programs/localized/el_GR.UTF-8/msg/dtfile.msg index 6f1b21089..31cec958a 100644 --- a/cde/programs/localized/el_GR.UTF-8/msg/dtfile.msg +++ b/cde/programs/localized/el_GR.UTF-8/msg/dtfile.msg @@ -822,11 +822,6 @@ $ 31 Όνομα αρχείου ή φακέλου: 32 Περιεχόμενα αρχείου: -$ Messages 33-35 are used on hpux systems -33 Ανοιχτό -34 Κλειστό -35 Ακολούθησε τους δεσμούς: - 36 Άνοιγμα νέας εμφάνισης 37 Τοποθέτησε στον χώρο εργασίας 38 Βρέθηκαν αρχεία (με βάση το περιεχόενο): diff --git a/cde/programs/localized/sv_SE.UTF-8/msg/dtfile.msg b/cde/programs/localized/sv_SE.UTF-8/msg/dtfile.msg index 32c8827ec..de8de5086 100644 --- a/cde/programs/localized/sv_SE.UTF-8/msg/dtfile.msg +++ b/cde/programs/localized/sv_SE.UTF-8/msg/dtfile.msg @@ -849,11 +849,6 @@ Den markerade filen finns inte längre. 31 Namn på fil eller mapp: 32 Filinnehåll: -$ Messages 33-35 are used on hpux systems -33 På -34 Av -35 Följ länkar: - 36 Öppna i nytt fönster 37 Lägg på arbetsytan 38 Hittade filer (efter Innehåll): diff --git a/cde/programs/localized/util/mkcatdefs.c b/cde/programs/localized/util/mkcatdefs.c index a9877e6cb..52e415270 100644 --- a/cde/programs/localized/util/mkcatdefs.c +++ b/cde/programs/localized/util/mkcatdefs.c @@ -54,12 +54,6 @@ #include #endif -#ifdef hpux -#ifndef _XPG2 -#define _XPG2 -#endif -#endif - #include #include diff --git a/cde/programs/ttsnoop/Makefile.am b/cde/programs/ttsnoop/Makefile.am index bbb52594a..7448c2223 100644 --- a/cde/programs/ttsnoop/Makefile.am +++ b/cde/programs/ttsnoop/Makefile.am @@ -6,7 +6,6 @@ dist_appdefaults_DATA = Ttsnoop AB_MAKEFILES = \ Makefile.aix \ - Makefile.hpux \ Makefile.sunos \ Makefile.linux \ Makefile.freebsd \ diff --git a/cde/programs/ttsnoop/ttsnoop.C.src b/cde/programs/ttsnoop/ttsnoop.C.src index 60b4a3928..f9a590241 100644 --- a/cde/programs/ttsnoop/ttsnoop.C.src +++ b/cde/programs/ttsnoop/ttsnoop.C.src @@ -190,7 +190,7 @@ signalHandler( } } -#if defined(SVR4) || defined(aix) || defined(hpux) || defined(__linux__) || defined(CSRG_BASED) +#if defined(SVR4) || defined(aix) || defined(__linux__) || defined(CSRG_BASED) #if !defined(SIG_PF) typedef void (*sig_pf_t)(int); #define SIG_PF sig_pf_t @@ -202,7 +202,7 @@ _tt_sigset( int sig, SIG_PF handler ) { -#if defined(hpux) || defined(__linux__) || defined(CSRG_BASED) +#if defined(__linux__) || defined(CSRG_BASED) struct sigaction act; act.sa_handler = handler; sigemptyset(&act.sa_mask); diff --git a/cde/programs/types/demo/Makefile.hp b/cde/programs/types/demo/Makefile.hp deleted file mode 100644 index 763f8e23a..000000000 --- a/cde/programs/types/demo/Makefile.hp +++ /dev/null @@ -1,48 +0,0 @@ -# $XConsortium: Makefile.hp /main/2 1996/05/13 11:35:25 drk $ -########################################################################## -# -# Makefile for datatyping.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = datatyping -SOURCES = datatyping.c -OBJECTS = datatyping.o - -CFLAGS = +Obb2000 -Aa -CDEBUGFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/include/X11R5 -EXTRA_INCLUDES = -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) $(EXTRA_INCLUDES) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L/usr/lib/X11R5 -lXt -X11LIB = -L/usr/lib/X11R5 -lX11 - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) $(X11LIB) -LDFLAGS = - -.c.o: - cc -c $(CFLAGS) $(CDEBUGFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/types/unsupported.dt.src b/cde/programs/types/unsupported.dt.src index 01865585c..1e73358f9 100644 --- a/cde/programs/types/unsupported.dt.src +++ b/cde/programs/types/unsupported.dt.src @@ -25,20 +25,13 @@ XCOMM ########################################################################## #if defined(__aix) #define XBIN /usr/lpp/X11/bin #define XBIN_CONTRIB /usr/lpp/X11/bin -#else -#if defined(__sun) +#elif defined(__sun) #define XBIN /usr/openwin/bin #define XBIN_CONTRIB /usr/openwin/bin #else -#if defined(__hpux) -#define XBIN /usr/bin/X11 -#define XBIN_CONTRIB /usr/contrib/bin/X11 -#else #define XBIN /usr/bin/X11 #define XBIN_CONTRIB /usr/local/bin/X11 #endif -#endif -#endif ACTION DtTypes { @@ -68,64 +61,6 @@ ACTION Clipboard DESCRIPTION %|nls-9003-#The#| } -#ifdef __hpux -ACTION DisplayFont -{ - LABEL %|nls-29-#DisplayFont#| - TYPE COMMAND - WINDOW_TYPE NO_STDIO - EXEC_STRING sh -c '/usr/contrib/bin/X11/xfd -fn \ - `basename "%(File)Arg_1"%|nls-9012-#Font#|"%" | sed /[.].*/s///`;\ - if [ \$? -eq 1 ] ; then \ - /usr/dt/bin/dterror.ds \ - "%|nls-9014-#The Font#|" \ - "%|nls-9015-#Invalid#|" \ - "%|nls-21002-#OK#|" ; \ - fi' - DESCRIPTION %|nls-9004-#The#| -} - -%|nls-9016-#The ListWinInfo ...#| -ACTION ListWinInfo -{ - LABEL %|nls-33-#ListWinInfo#| - ARG_COUNT 0 - TYPE COMMAND - WINDOW_TYPE PERM_TERMINAL - EXEC_STRING \ - sh -c ' \ - /usr/contrib/bin/X11/xwininfo; \ - echo "%|nls-9011-#Select#|"' - DESCRIPTION %|nls-9005-#The#| -} - -ACTION ListWinProps -{ - LABEL %|nls-34-#ListWinProps#| - ARG_COUNT 0 - TYPE COMMAND - WINDOW_TYPE PERM_TERMINAL - EXEC_STRING \ - sh -c ' \ - echo "%|nls-9013-#[When#|"; \ - /usr/contrib/bin/X11/xprop | \${PAGER:-more}; \ - echo "%|nls-9011-#Select#|"' - DESCRIPTION %|nls-9006-#The#| -} - -ACTION XserverInfo -{ - LABEL %|nls-35-#XserverInfo#| - ARG_COUNT 0 - TYPE COMMAND - WINDOW_TYPE PERM_TERMINAL - EXEC_STRING \ - sh -c ' \ - /usr/contrib/bin/X11/xdpyinfo | \${PAGER:-more}; \ - echo "%|nls-9011-#Select#|"' - DESCRIPTION %|nls-9007-#The#| -} -#endif #ifdef __aix ACTION DisplayFont { diff --git a/cde/programs/types/uxstd.dt.src b/cde/programs/types/uxstd.dt.src index 85ba07dce..05c39dbfe 100644 --- a/cde/programs/types/uxstd.dt.src +++ b/cde/programs/types/uxstd.dt.src @@ -638,20 +638,6 @@ ACTION Spell XCOMM ###### -#ifdef __hpux -ACTION Df -{ - LABEL %|nls-10070-#Disk Usage#| - ARG_COUNT 0 - TYPE COMMAND - WINDOW_TYPE PERM_TERMINAL - EXEC_STRING \ - sh -c ' \ - bdf 2>&1 | \${PAGER:-more}; \ - echo "%|nls-7-#Select#|"' - DESCRIPTION %|nls-10071-#The#| -} -#else ACTION Df { LABEL %|nls-10070-#Disk Usage#| @@ -664,7 +650,6 @@ ACTION Df echo "%|nls-7-#Select#|"' DESCRIPTION %|nls-10071-#The#| } -#endif XCOMM ######