external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into autotools-conversion

Browse source
This commit is contained in:
Jon Trulson 2020-11-24 16:53:24 -07:00
commit 90e61dda5f
56 changed files with 307 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/Makefile.imake
View file

@ -1,5 +1,5 @@
# $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $
RELEASE = Release 2.3.1a
RELEASE = Release 2.3.2a
PRODUCT = CDE
SHELL = /bin/sh
RM = rm -f

13
cde/config/imake/imake.c
View file

@ -242,19 +242,6 @@ extern int errno;
#include <stdarg.h>
#include "imakemdep.h"
/*
* This define of strerror is copied from (and should be identical to)
* Xos.h, which we don't want to include here for bootstrapping reasons.
*/
#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
# ifndef strerror
extern char *sys_errlist[];
extern int sys_nerr;
# define strerror(n) \
(((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
# endif
#endif
#define TRUE 1
#define FALSE 0

4
cde/copyright
View file

@ -1,10 +1,10 @@
Common Desktop Environment Version 2.3.1a (devel)
Common Desktop Environment Version 2.3.2a (devel)
(c) Copyright 1993-2012 The Open Group
(c) Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details
(c) Copyright 2012-2021 CDE Project contributors, see CONTRIBUTORS for details
Project Website: http://cdesktopenv.sourceforge.net/

2
cde/doc/common/help/HELPEnt.sgm
View file

@ -1,5 +1,5 @@
<!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ -->
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.1a</GlossTerm>,
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.2a</GlossTerm>,
&copy; Copyright 1993-2012 The Open Group
&copy; Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details

4
cde/include/Dt/Dt.h
View file

@ -52,13 +52,13 @@ extern "C" {
#define DtVERSION 2
#define DtREVISION 3
#define DtUPDATE_LEVEL 1
#define DtUPDATE_LEVEL 2
#define DtVERSION_NUMBER (DtVERSION * 10000 + \
DtREVISION * 100 + \
DtUPDATE_LEVEL)
#define DtVERSION_STRING "CDE Version 2.3.1a"
#define DtVERSION_STRING "CDE Version 2.3.2a"
/*

6
cde/include/Dt/dbtype.h
View file

@ -405,7 +405,11 @@ typedef struct {struct CNTRY_TBL_S *ptr; LOCK_DESC} CNTRY_TBL_P;
struct sk {
INT sk_fld;
CHAR_P sk_val;
} __SK__;
};
/* PJH 20201124 unused struct variable declaration in header causing issues
struct sk __SK__;
*/
typedef struct { struct sk *ptr; LOCK_DESC } SK_P;
/* node key search path stack entry: one per level per key field */

8
cde/lib/tt/bin/dbck/spec.C
View file

@ -44,14 +44,6 @@
#include "ttdbck.h"
#include "tt_db_server_consts.h"
#if !defined(OPT_STRERROR)
// No strerror(), fake it
char *
strerror(int e)
{
return ((e<sys_nerr) ? sys_errlist[e] : "unknown");
}
#endif
Spec::
Spec()

2
cde/lib/tt/bin/ttauth/ttauth.man
View file

@ -18,7 +18,7 @@
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.TH TTAUTH 1 "Release 2.3.1a" "CDE"
.TH TTAUTH 1 "Release 2.3.2a" "CDE"
.SH NAME
ttauth \- ToolTalk authority file utility
.SH SYNOPSIS

12
cde/lib/tt/lib/tt_options.h
View file

@ -107,10 +107,6 @@
* OPT_CPP_OPTIONS - string, options to pass to cpp. For example, on
* some platforms -B is used so C++ comments are processed by cpp.
*
*
* OPT_STRERROR - set if strerror() is available, otherwise we assume
* global symbol sys_errlist is defined in errno.h.
*
* OPT_SVR4_GETMNTENT - set to use new SVR4 flavor of getmntent.
*
* OPT_LOCKF_MNTTAB - set to hold a lockf lock on MNTTAB while doing
@ -242,7 +238,6 @@
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_DEFINE_SIG_PF
@ -273,7 +268,6 @@
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/lib/cpp"
# define OPT_CPP_OPTIONS "-B"
# undef OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_42
@ -302,7 +296,6 @@
# define OPT_CATGETS
# undef OPT_GETDTABLESIZE
# define OPT_SYSINFO
# define OPT_STRERROR
# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS "-B"
# define OPT_SVR4_GETMNTENT
@ -389,7 +382,6 @@
# define OPT_CPP_PATH "/opt/langtools/lbin/cpp"
# endif
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_HFS
@ -415,7 +407,6 @@
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/bin/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE "ext2fs"
@ -446,7 +437,6 @@
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/libexec/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
@ -479,7 +469,6 @@
# define OPT_CPP_PATH "/usr/libexec/cpp"
# endif
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
@ -509,7 +498,6 @@
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/bin/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS

2
cde/lib/tt/tooltalk.tmpl
View file

@ -6,7 +6,7 @@
/* TT_VERSION defines the version string which is imbedded in all the */
/* binaries and shipped libraries. */
TT_VERSION = "CDE Version 2.3.1a"
TT_VERSION = "CDE Version 2.3.2a"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"

2
cde/programs/dtappbuilder/src/ab/ab_bil.c
View file

@ -89,7 +89,7 @@ static int print_load_stats(
ABProfiledInterval configTime
);
char Buf[MAXPATHLEN]; /* Work buffer */
extern char Buf[MAXPATHLEN]; /* Work buffer */
/*
* Loads in a new project, replacing the current project.

2
cde/programs/dtappbuilder/src/ab/cgen_utils.c
View file

@ -109,7 +109,7 @@ typedef enum
} CG_STATUS;
CGenOptions CodeGenOptions;
extern CGenOptions CodeGenOptions;
StringList user_env_vars = NULL;
StringList module_list = NULL;
static CG_GOAL user_goal = CG_GOAL_UNDEF;

2
cde/programs/dtappbuilder/src/ab/proj.c
View file

@ -229,7 +229,7 @@ static XtTranslations proj_transtbl = NULL;
static XRectangle *rband_rect = NULL;
static Boolean mselect_adjust = False;
char Buf[MAXPATHLEN]; /* Work buffer */
extern char Buf[MAXPATHLEN]; /* Work buffer */
/*************************************************************************
**

2
cde/programs/dtappbuilder/src/ab/projP_utils.c
View file

@ -94,7 +94,7 @@ static void mult_module_selected(
** **
**************************************************************************/
char Buf[MAXPATHLEN]; /* Work buffer */
extern char Buf[MAXPATHLEN]; /* Work buffer */
/*************************************************************************
** **

2
cde/programs/dtappbuilder/src/ab/proj_utils.c
View file

@ -80,7 +80,7 @@
const char mod_path[] = "*proj_mod_path";
const char proj_path[] = "*proj_proj_path";
char Buf[MAXPATHLEN]; /* Work buffer */
extern char Buf[MAXPATHLEN]; /* Work buffer */
/* Whether we are to export a module as BIL (default) or UIL */
static BOOL ExportAsUIL = FALSE;

2
cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
View file

@ -60,7 +60,7 @@
#include "bilP.h"
BIL_LOAD_INFO bilP_load;
char Buf[MAXPATHLEN];
static char Buf[MAXPATHLEN];
/*
* Read a BIL file into memory. Returns a project node.

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

@ -552,7 +552,9 @@ struct calcVars { /* Calctool variables and options. */
#ifdef hpux
int keybdID;
#endif
} CalcVars ;
};
extern struct calcVars CalcVars;
typedef struct calcVars *Vars ;
@ -568,7 +570,7 @@ typedef struct
char *session;
} ApplicationArgs, *ApplicationArgsPtr;
ApplicationArgs application_args;
extern ApplicationArgs application_args;
/* MP definitions. */

3
cde/programs/dtcalc/motif.c
View file

@ -112,6 +112,9 @@ extern XmWidgetExtData _XmGetWidgetExtData(
#include "ds_popup.h"
#include "ds_xlib.h"
ApplicationArgs application_args;
XVars X;
Boolean colorSrv;
static XtResource resources[] =

2
cde/programs/dtcalc/motif.h
View file

@ -87,7 +87,7 @@ typedef struct Xobject { /* Motif/Xlib graphics object. */
typedef struct Xobject *XVars ;
XVars X ;
extern XVars X ;
#ifndef CDE_INSTALLATION_TOP
#define CDE_INSTALLATION_TOP "/usr/dt"

4
cde/programs/dtcm/dtcm/dnd.c
View file

@ -72,10 +72,6 @@
static Bool lookForButton(Display *, XEvent *, XPointer);
#if !defined(__linux__) && !defined(CSRG_BASED)
extern char *sys_errlist[];
#endif
extern int drag_load_proc(char*, Calendar *);
static char dnd_filename[20];

5
cde/programs/dtcm/libDtCmP/util.c
View file

@ -306,10 +306,7 @@ syserr(char *msg, int a1, int a2, int a3)
#if 0
/* print the error, if any */
if (saveerr != 0) {
if (saveerr < 0 || saveerr > sys_nerr)
(void) fprintf(stderr, ":Unknown error %d", saveerr);
else
(void) fprintf(stderr, ":%s", sys_errlist[saveerr]);
(void) fprintf(stderr, ":%s", strerror(saveerr));
}
#endif

2
cde/programs/dtcreate/AddFiletype.c
View file

@ -71,7 +71,7 @@ Widget Licon2;
extern int do_which;
enum icon_size_range filetype_icon_size = None_Selected;
*/
enum icon_size_range filetype_icon_size;
enum icon_size_range filetype_icon_size = None_Selected;
/*******************************************************************************

5
cde/programs/dtcreate/dtcreate.h
View file

@ -287,7 +287,7 @@ STORAGECLASS Widget FC_EndByteTextField;
*/
STORAGECLASS Widget FC_NameOrPathText;
STORAGECLASS Widget FC_AndLabel1;
STORAGECLASS Widget FC_PermissionForm;
extern Widget FC_PermissionForm;
STORAGECLASS Widget FC_ReadToggle;
STORAGECLASS Widget FC_WriteToggle;
STORAGECLASS Widget FC_ExecuteToggle;
@ -324,7 +324,7 @@ STORAGECLASS SessionData sessiondata;
#ifdef NOEXTERN
STORAGECLASS enum icon_size_range action_icon_size = None_Selected;
STORAGECLASS enum icon_size_range filetype_icon_size = None_Selected;
STORAGECLASS extern enum icon_size_range filetype_icon_size;
STORAGECLASS int pidIconEditor = 0;
STORAGECLASS Boolean bShowPixmaps = TRUE;
STORAGECLASS Widget IconSelector = (Widget)NULL;
@ -353,7 +353,6 @@ STORAGECLASS const char *af_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtda
#else /* NOEXTERN */
STORAGECLASS enum icon_size_range action_icon_size;
STORAGECLASS enum icon_size_range filetype_icon_size;
STORAGECLASS int pidIconEditor;
STORAGECLASS Boolean bShowPixmaps;

7
cde/programs/dthelp/dthelpdemo/Main.c
View file

@ -68,6 +68,13 @@
#include "HelpCacheI.h"
#include "HourGlassI.h"
/* Global Variables Used by our helpCache */
CacheListStruct *pCacheListHead;
CacheListStruct *pCacheListTale;
int totalCacheNodes;
/* Internal Static Functions */
static Widget BuildMenus(Widget parent);
static void CreateMainWindow(Widget parent);

6
cde/programs/dthelp/dthelpdemo/Main.h
View file

@ -64,9 +64,9 @@
/* Global Variables Used by our helpCache */
CacheListStruct *pCacheListHead;
CacheListStruct *pCacheListTale;
int totalCacheNodes;
extern CacheListStruct *pCacheListHead;
extern CacheListStruct *pCacheListTale;
extern int totalCacheNodes;
/* Globally referenced widget variables */
extern Widget topLevel;

21
cde/programs/dthelp/dthelpview/Main.c
View file

@ -80,6 +80,27 @@
#include "UtilI.h"
#include "ManPageI.h"
/* Global Variables Used to maintain our cache list of help dialogs */
CacheListStruct *pCacheListHead;
CacheListStruct *pCacheListTale;
int totalCacheNodes;
/* Global Variables */
Widget topLevel;
Widget viewWidget;
Widget manWidget;
Widget manBtn;
Widget manText;
Widget manForm;
Widget closeBtn;
/* General global variables */
int runMode;
char *helpClass;
Display *appDisplay;
char *startCommand;
/* Application resource list definition */
static XrmOptionDescRec option_list[] =

28
cde/programs/dthelp/dthelpview/Main.h
View file

@ -66,25 +66,25 @@
/* Global Variables Used to maintain our cache list of help dialogs */
CacheListStruct *pCacheListHead;
CacheListStruct *pCacheListTale;
int totalCacheNodes;
extern CacheListStruct *pCacheListHead;
extern CacheListStruct *pCacheListTale;
extern int totalCacheNodes;
/* Global Variables */
Widget topLevel;
Widget viewWidget;
Widget manWidget;
Widget manBtn;
Widget manText;
Widget manForm;
Widget closeBtn;
extern Widget topLevel;
extern Widget viewWidget;
extern Widget manWidget;
extern Widget manBtn;
extern Widget manText;
extern Widget manForm;
extern Widget closeBtn;
/* General global variables */
int runMode;
char *helpClass;
Display *appDisplay;
char *startCommand;
extern int runMode;
extern char *helpClass;
extern Display *appDisplay;
extern char *startCommand;

1
cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
View file

@ -56,7 +56,6 @@
typedef int Boolean;
/* extern int errno; */
/* extern char *sys_errlist[]; */
/* extern int sys_nerr; */
static void GenTopicList (

4
cde/programs/dthelp/parser/canon1/helptag/Imakefile
View file

@ -44,10 +44,10 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \
../parser/pval.h ../parser/globdec.h ../parser/signonx.h \
../parser/userinc.h
SRCS = custom.c default.c help.c make.c option.c out.c special.c xref.c \
SRCS = custom.c default.c global.c help.c make.c option.c out.c special.c xref.c \
$(XLATESRCS)
OBJS = custom.o default.o help.o make.o option.o out.o special.o xref.o \
OBJS = custom.o default.o global.o help.o make.o option.o out.o special.o xref.o \
$(XLATEOBJS)
LOCAL_LIBRARIES = $(HELPUTILLIB)

47
cde/programs/dthelp/parser/canon1/helptag/global.c Normal file
View file

@ -0,0 +1,47 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
#include "basic.h"
#include "trie.h"
#include "common.h"
#include "global.h"
/* global variables */
PBLOCK blockinfo INIT(NULL);
LOGICAL inParText INIT(FALSE);
LOGICAL inSdlP INIT(FALSE);
/* Save these ids and reuse them on the current virpage.
* We need two of each (except for the first) so we can alternate to
* avoid <form> thinking it is supposed to span them. The bullet id
* indexes will flip back and forth between 0 and 1 to pick an id.
*/
int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
int bulletIdIndex INIT(1);
int looseBulletIdIndex INIT(1);
/* Should we use these BASENAME_LIMIT on the size of file names? */
LOGICAL usingshortnames INIT(FALSE);

17
cde/programs/dthelp/parser/canon1/helptag/global.h
View file

@ -227,20 +227,21 @@ struct _block {
char *pclass;
char *pssi;
PBLOCK pprev;
} block, *pblock;
PBLOCK blockinfo INIT(NULL);
};
/*block, *pblock;*/
extern PBLOCK blockinfo;
LOGICAL inParText INIT(FALSE);
LOGICAL inSdlP INIT(FALSE);
extern LOGICAL inParText;
extern LOGICAL inSdlP;
/* Save these ids and reuse them on the current virpage.
* We need two of each (except for the first) so we can alternate to
* avoid <form> thinking it is supposed to span them. The bullet id
* indexes will flip back and forth between 0 and 1 to pick an id.
*/
int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
int bulletIdIndex INIT(1);
int looseBulletIdIndex INIT(1);
extern int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
extern int bulletIdIndex;
extern int looseBulletIdIndex;
/* indent for p, image, ex, vex, based on plain list */
#define LISTFIRSTINDENT 2
@ -289,7 +290,7 @@ EXTERN char *helpext;
EXTERN char helptmpbuf[2] INIT("0");
/* Should we use these BASENAME_LIMIT on the size of file names? */
LOGICAL usingshortnames INIT(FALSE);
extern LOGICAL usingshortnames;
/* Limit on how long the basename can be for a .ht file */
#define BASENAME_LIMIT 6
/* limit on how many additional character are allowed before the ext */

1
cde/programs/dthelp/parser/canon1/parser/Imakefile
View file

@ -44,6 +44,7 @@ XLATEOBJECTS = $(HELPTAGSRC)/LocaleXlate.o $(HELPTAGSRC)/XlationSvc.o
APPLOBJECTS = \
$(HELPTAGSRC)/custom.o \
$(HELPTAGSRC)/default.o \
$(HELPTAGSRC)/global.o \
$(HELPTAGSRC)/help.o \
$(HELPTAGSRC)/make.o \
$(HELPTAGSRC)/option.o \

2
cde/programs/dthelp/parser/canon1/parser/parser.c
View file

@ -35,6 +35,8 @@
#include "if.h"
#include "entext.h"
char *user_defined_entities M_PARINIT("USER-DEFINED-ENTITIES");
static void scanloop(LOGICAL prolog);
/* Main procedure */

2
cde/programs/dthelp/parser/canon1/parser/parser.h
View file

@ -301,7 +301,7 @@ M_PAREXTERN int m_prevcon ;
M_PAREXTERN int m_token ;
M_PAREXTERN int m_scanval ;
char *user_defined_entities M_PARINIT("USER-DEFINED-ENTITIES");
extern char *user_defined_entities;
/* Declarations for tentative list of omitted tags when checking for tag
MINimization */

4
cde/programs/dthelp/parser/pass1/helptag/Imakefile
View file

@ -44,10 +44,10 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \
../parser/pval.h ../parser/globdec.h ../parser/signonx.h \
../parser/userinc.h
SRCS = custom.c default.c help.c make.c option.c out.c special.c xref.c \
SRCS = custom.c default.c global.c help.c make.c option.c out.c special.c xref.c \
$(XLATESRCS)
OBJS = custom.o default.o help.o make.o option.o out.o special.o xref.o \
OBJS = custom.o default.o global.o help.o make.o option.o out.o special.o xref.o \
$(XLATEOBJS)
LOCAL_LIBRARIES = $(HELPUTILLIB)

43
cde/programs/dthelp/parser/pass1/helptag/global.c Normal file
View file

@ -0,0 +1,43 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
#include "basic.h"
#include "trie.h"
#include "common.h"
#include "global.h"
/* Save these ids and reuse them on the current virpage.
* We need two of each (except for the first) so we can alternate to
* avoid <form> thinking it is supposed to span them. The bullet id
* indexes will flip back and forth between 0 and 1 to pick an id.
*/
int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
int bulletIdIndex = 1;
int looseBulletIdIndex = 1;
LOGICAL inParText = FALSE;
LOGICAL inSdlP = FALSE;
/* Should we use these BASENAME_LIMIT on the size of file names? */
LOGICAL usingshortnames = FALSE;

12
cde/programs/dthelp/parser/pass1/helptag/global.h
View file

@ -170,17 +170,17 @@ EXTERN M_WCHAR *imageghyperlinkp;
EXTERN M_WCHAR *imageglinktypep;
EXTERN M_WCHAR *imagegdescription;
LOGICAL inParText INIT(FALSE);
LOGICAL inSdlP INIT(FALSE);
extern LOGICAL inParText;
extern LOGICAL inSdlP;
/* Save these ids and reuse them on the current virpage.
* We need two of each (except for the first) so we can alternate to
* avoid <form> thinking it is supposed to span them. The bullet id
* indexes will flip back and forth between 0 and 1 to pick an id.
*/
int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
int bulletIdIndex INIT(1);
int looseBulletIdIndex INIT(1);
extern int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
extern int bulletIdIndex;
extern int looseBulletIdIndex;
/* save the textsize to emit it on the <p> tag; this allows us to have
* a single ssi= for the "ex" <block> and modify the text size individually
@ -213,7 +213,7 @@ EXTERN char *helpbase INIT(NULL);
EXTERN char *helpext;
/* Should we use these BASENAME_LIMIT on the size of file names? */
LOGICAL usingshortnames INIT(FALSE);
extern LOGICAL usingshortnames;
/* Limit on how long the basename can be for a .ht file */
#define BASENAME_LIMIT 6
/* limit on how many additional character are allowed before the ext */

1
cde/programs/dthelp/parser/pass1/parser/Imakefile
View file

@ -44,6 +44,7 @@ XLATEOBJECTS = $(HELPTAGSRC)/LocaleXlate.o $(HELPTAGSRC)/XlationSvc.o
APPLOBJECTS = \
$(HELPTAGSRC)/custom.o \
$(HELPTAGSRC)/default.o \
$(HELPTAGSRC)/global.o \
$(HELPTAGSRC)/help.o \
$(HELPTAGSRC)/make.o \
$(HELPTAGSRC)/option.o \

4
cde/programs/dthelp/parser/pass2/htag2/Imakefile
View file

@ -38,9 +38,9 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \
../parser/pval.h ../parser/globdec.h ../parser/signonx.h \
../parser/userinc.h
SRCS = custom.c sdl.c option.c out.c $(XLATESRCS)
SRCS = custom.c global.c sdl.c option.c out.c $(XLATESRCS)
OBJS = custom.o sdl.o option.o out.o $(XLATEOBJS)
OBJS = custom.o global.o sdl.o option.o out.o $(XLATEOBJS)
LOCAL_LIBRARIES = $(SDLUTILLIB)

48
cde/programs/dthelp/parser/pass2/htag2/global.c Normal file
View file

@ -0,0 +1,48 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
#include "basic.h"
#include "trie.h"
#include "common.h"
#include "global.h"
/*
* Names for all the input, output and intermediate files we'll need.
*/
char *inFileName;
char *outFileName;
char *errFileName;
char *idxFileName;
char *snbFileName;
char *sortedIdxFileName;
char *tossFileName;
char *vstructFileName;
char *tempFileName;
char *compFileName;
char *compZFileName;
FILE *inFile;
FILE *outFile;

26
cde/programs/dthelp/parser/pass2/htag2/global.h
View file

@ -128,20 +128,20 @@ EXTERN char *progName INIT(NULL);
/*
* Names for all the input, output and intermediate files we'll need.
*/
char *inFileName;
char *outFileName;
char *errFileName;
char *idxFileName;
char *snbFileName;
char *sortedIdxFileName;
char *tossFileName;
char *vstructFileName;
char *tempFileName;
char *compFileName;
char *compZFileName;
extern char *inFileName;
extern char *outFileName;
extern char *errFileName;
extern char *idxFileName;
extern char *snbFileName;
extern char *sortedIdxFileName;
extern char *tossFileName;
extern char *vstructFileName;
extern char *tempFileName;
extern char *compFileName;
extern char *compZFileName;
FILE *inFile;
FILE *outFile;
extern FILE *inFile;
extern FILE *outFile;
typedef struct _loidsRec *LoidsPtr;
typedef struct _loidsRec {

1
cde/programs/dthelp/parser/pass2/parser/Imakefile
View file

@ -37,6 +37,7 @@ XLATEOBJECTS = $(HTAG2SRC)/LocaleXlate.o $(HTAG2SRC)/XlationSvc.o
APPLOBJECTS = \
$(HTAG2SRC)/custom.o \
$(HTAG2SRC)/global.o \
$(HTAG2SRC)/sdl.o \
$(HTAG2SRC)/option.o \
$(HTAG2SRC)/out.o \

10
cde/programs/dticon/graphics.c
View file

@ -60,11 +60,11 @@
extern GC scratch_gc;
Widget editMenu_cut_pb;
Widget editMenu_copy_pb;
Widget editMenu_rotate_pb;
Widget editMenu_flip_pb;
Widget editMenu_scale_pb;
extern Widget editMenu_cut_pb;
extern Widget editMenu_copy_pb;
extern Widget editMenu_rotate_pb;
extern Widget editMenu_flip_pb;
extern Widget editMenu_scale_pb;
extern void Stop_HotBox(void);

14
cde/programs/dticon/process.c
View file

@ -101,13 +101,13 @@ static void Do_DropCheckOp(DtDndTransferCallback);
static void Do_DropOp(void);
extern Widget optionsMenu_grid;
Widget editMenu_paste_pb;
Widget editMenu_cut_pb;
Widget editMenu_copy_pb;
Widget editMenu_rotate_pb;
Widget editMenu_flip_pb;
Widget editMenu_scale_pb;
Widget editMenu_undo_pb;
extern Widget editMenu_paste_pb;
extern Widget editMenu_cut_pb;
extern Widget editMenu_copy_pb;
extern Widget editMenu_rotate_pb;
extern Widget editMenu_flip_pb;
extern Widget editMenu_scale_pb;
extern Widget editMenu_undo_pb;
extern Widget newWidthText, newHeightText;
extern GC scratch_gc;

2
cde/programs/dticon/utils.c
View file

@ -138,7 +138,7 @@ extern Window tablet_win;
static int jskXerrorDebug();
static int jskXerrorIODebug();
Widget editMenu_undo_pb;
extern Widget editMenu_undo_pb;
void GetSessionInfo( void );
void Set_Gfx_Labels( Boolean );

4
cde/programs/dtimsstart/remote.c
View file

@ -37,10 +37,6 @@
#include <X11/Xproto.h> /* for X_ChangeHosts */
#include <X11/Xatom.h> /* for XA_STRING */
#if !defined(__linux__) && !defined(CSRG_BASED)
extern char *sys_errlist[];
#endif
static char *conf_msg_id = STR_CONFDATA;
#define CONF_MSG_ID_LEN strlen(conf_msg_id)

12
cde/programs/dtimsstart/start.c
View file

@ -28,14 +28,10 @@
#include <setjmp.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE)
#define _NFILE FOPEN_MAX
#endif
#if !defined(__linux__) && !defined(CSRG_BASED)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
/* local functions */
@ -600,8 +596,7 @@ static int invoke_ims(UserSelection *sel)
pid = fork();
if (pid == (pid_t) -1) {
put_xims_log("fork failed [%s]",
(errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0);
put_xims_log("fork failed [%s]", strerror(errno), 0, 0);
#ifdef DEBUG
perror("fork");
#endif
@ -618,8 +613,7 @@ static int invoke_ims(UserSelection *sel)
#endif
execl(SH_PATH, "sh", "-c", renv->cmdbuf, NULL);
put_xims_log("%s: exec failed [%s]", SH_PATH,
(errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0);
put_xims_log("%s: exec failed [%s]", SH_PATH, strerror(errno) , 0, 0);
/* perror(SH_PATH); */
sleep(1);
_exit(1);

5
cde/programs/dtinfo/dtinfo/src/external-api/comm.c
View file

@ -53,9 +53,6 @@
#include <sys/select.h>
#endif
extern char *sys_errlist[];
static OliasEvent *current_event;
static int reply_status;
#define NO_REPLY 0
@ -332,7 +329,7 @@ wait_for_reply (Widget toplevel)
XtAppWarningMsg (XtWidgetToApplicationContext (toplevel),
"communicationsError", "select",
"Olias API", "Select failed: %s",
&sys_errlist[errno], &num_params);
strerror(errno), &num_params);
continue;
}
continue;

9
cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
View file

@ -92,14 +92,7 @@
#endif
#include <ast.h>
extern __MANGLE__ int sys_nerr;
extern __MANGLE__ char* sys_errlist[];
char*
fmterror __PARAM__((int err), (err)) __OTORP__(int err;){
static char msg[28];
if (err > 0 && err <= sys_nerr) return(sys_errlist[err]);
sfsprintf(msg, sizeof(msg), "Error %d", err);
return(msg);
return strerror(err);
}

8
cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
View file

@ -108,18 +108,12 @@ NoN(strerror)
#include <ast.h>
extern __MANGLE__ int sys_nerr;
extern __MANGLE__ char* sys_errlist[];
char*
strerror __PARAM__((int err), (err)) __OTORP__(int err;)
#line 25
{
static char msg[28];
if (err > 0 && err <= sys_nerr) return(sys_errlist[err]);
sfsprintf(msg, sizeof(msg), "Error %d", err);
return(msg);
return strerror(err);
}
#endif

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

@ -68,8 +68,7 @@
# include <pwd.h> /* for passwd structure */
# include <stdio.h>
# include <stdlib.h> /* for exit(), malloc(), abort() */
# include <string.h> /* for string functions, bcopy(),
sys_errlist */
# include <string.h> /* for string functions, bcopy() */
# include <sys/param.h> /* for NGROUPS */
# include <sys/types.h> /* for fd_set */
# include <netinet/in.h> /* for Internet socket stuff */
@ -475,10 +474,6 @@ struct verify_info {
*
***************************************************************************/
#if !defined(__linux__) && !defined(CSRG_BASED)
extern char *sys_errlist[]; /* system error msgs */
extern int sys_nerr; /* system error msgs */
#endif
extern XrmDatabase XresourceDB;

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

@ -125,8 +125,6 @@ static void InitializeBW(
/*+++++++++++++++++++++++++++++++++++++++*/
/* Internal Variables */
/*+++++++++++++++++++++++++++++++++++++++*/
int NumOfPalettes = 0;
static char *PALETTE_DIR = CDE_INSTALLATION_TOP "/palettes/";
static char *PALETTE_DIR_ADM = "/etc/dt/palettes/";
static char *DEFAULT_FILENAME = "palette.dt";

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

@ -246,7 +246,7 @@ Widget paletteList;
Widget deleteButton;
char *defaultName;
Bool WaitSelection;
int NumOfPalettes;
int NumOfPalettes = 0;
/*+++++++++++++++++++++++++++++++++++++++*/
/* Internal Variables */

6
cde/programs/dtudcfonted/mtfgui.c
View file

@ -66,9 +66,9 @@ extern FalCodeRegion CodeArea[16];
structure of widgets
********************************************************************/
extern Widget toplevel;
Widget editPopW,
wgeScro,
wgeBulB_edit;
extern Widget wgeScro;
extern Widget editPopW;
Widget wgeBulB_edit;
static Widget wgeStaT_form[EDLIST_MAX],
wgeStaT_disp[EDLIST_MAX],
wgeStaT_list[EDLIST_MAX],

15
cde/programs/dtudcfonted/ufont.c
View file

@ -56,6 +56,21 @@ GetMessage(int set, int number, char *string)
* Widgets *
***************************************************************/
Widget toplevel;
Widget editPtnW;
Widget cpyPtnW;
Widget mngPtnW;
EditChar edg;
EditList edlist;
EditPane edpane;
XlibInf xl;
DelInf dn;
DelPtnInf dl[D_MAX] ;
DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */
int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */
EditPtnInf em;
CopyPtnInf cpm;
static Widget dnPopW;
Widget wgeScro, editPopW;

28
cde/programs/dtudcfonted/xoakufont.h
View file

@ -255,23 +255,23 @@ typedef struct _FontInf {
**********************************************************************/
Widget toplevel;
extern Widget toplevel;
Widget editPtnW;
Widget cpyPtnW;
Widget mngPtnW;
extern Widget editPtnW;
extern Widget cpyPtnW;
extern Widget mngPtnW;
EditChar edg;
EditList edlist;
EditPane edpane;
XlibInf xl;
DelInf dn;
DelPtnInf dl[D_MAX] ;
DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */
int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */
extern EditChar edg;
extern EditList edlist;
extern EditPane edpane;
extern XlibInf xl;
extern DelInf dn;
extern DelPtnInf dl[D_MAX] ;
extern DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */
extern int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */
EditPtnInf em;
CopyPtnInf cpm;
extern EditPtnInf em;
extern CopyPtnInf cpm;
/*