mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-13 03:32:24 +00:00
Merge branch 'master' into dtdocbook
This commit is contained in:
Liang Chang
commit
b4ffb694bd
285 changed files with 778 additions and 838 deletions
11
cde/.gitignore
vendored
11
cde/.gitignore
vendored
|
|
@ -2284,8 +2284,8 @@ ylwrap
|
|||
.deps
|
||||
.objs
|
||||
.dirstamp
|
||||
autotools_config.h
|
||||
autotools_config.h.in
|
||||
cde_config.h
|
||||
cde_config.h.in
|
||||
lib/DtTerm/util/lineToData
|
||||
lib/csa/y.tab.c
|
||||
lib/csa/y.tab.h
|
||||
|
|
@ -2307,3 +2307,10 @@ programs/localized/util/MsgCat.c
|
|||
programs/fontaliases/linux/en_US.UTF-8/fonts.alias
|
||||
programs/fontaliases/linux/en_US.UTF-8/mk_fonts_alias
|
||||
programs/fontaliases/linux/en_US.UTF-8/test_fonts_alias
|
||||
|
||||
# files that are modified by configure for version information
|
||||
copyright
|
||||
doc/common/help/HELPEnt.sgm
|
||||
include/Dt/Dt.h
|
||||
lib/tt/bin/ttauth/ttauth.man
|
||||
lib/tt/tooltalk.inc
|
||||
|
|
|
|||
|
|
@ -1,7 +1,33 @@
|
|||
AC_INIT([cde-desktop], [2.4.0a], [https://sourceforge.net/projects/cdesktopenv])
|
||||
AC_CONFIG_HEADERS([include/autotools_config.h])
|
||||
dnl When changing the version below, also change the CDE_VERSION_* macros
|
||||
dnl to match further below
|
||||
AC_INIT([Common Desktop Environment],
|
||||
[2.4.0c],
|
||||
[https://sourceforge.net/projects/cdesktopenv],
|
||||
[cde],
|
||||
[https://sourceforge.net/projects/cdesktopenv])
|
||||
AC_CONFIG_HEADERS([include/cde_config.h])
|
||||
AC_CONFIG_MACRO_DIRS([m4])
|
||||
AM_INIT_AUTOMAKE([foreign subdir-objects])
|
||||
AM_INIT_AUTOMAKE([foreign subdir-objects no-define])
|
||||
|
||||
dnl global CDE versioning
|
||||
|
||||
CDE_VERSION_MAJOR=2
|
||||
CDE_VERSION_MINOR=4
|
||||
CDE_VERSION_MICRO=0
|
||||
dnl this is blank for a release, or contains an alpha character to indicate a
|
||||
dnl dev release.
|
||||
CDE_VERSION_DEV=c
|
||||
|
||||
AC_SUBST(CDE_VERSION_MAJOR)
|
||||
AC_SUBST(CDE_VERSION_MINOR)
|
||||
AC_SUBST(CDE_VERSION_MICRO)
|
||||
AC_SUBST(CDE_VERSION_DEV)
|
||||
|
||||
dnl released in 2012, this should be sufficient
|
||||
AC_PREREQ([2.69])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_BUILD
|
||||
|
||||
dnl These must be up here for the compiler search list to actually work
|
||||
AC_PROG_CC([cc gcc clang])
|
||||
|
|
@ -10,26 +36,9 @@ AC_PROG_CXX([c++ g++ clang++])
|
|||
LT_INIT
|
||||
AC_PREFIX_DEFAULT(/usr/dt)
|
||||
|
||||
AC_ENABLE_STATIC([no])
|
||||
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
dnl todo: determine what version of autoconf we depend on
|
||||
dnl AC_PREREQ()
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_BUILD
|
||||
|
||||
dnl global CDE versioning
|
||||
|
||||
CDE_VERSION_MAJOR=2
|
||||
CDE_VERSION_MINOR=3
|
||||
CDE_VERSION_MICRO=0
|
||||
|
||||
AC_SUBST(CDE_VERSION_MAJOR)
|
||||
AC_SUBST(CDE_VERSION_MINOR)
|
||||
AC_SUBST(CDE_VERSION_MICRO)
|
||||
|
||||
dnl SOURCE_DEFINES - start with CDE project default
|
||||
SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16"
|
||||
|
||||
|
|
@ -70,13 +79,17 @@ dnl other things as we go along.
|
|||
EXTRA_LIBS=""
|
||||
EXTRA_INCS=""
|
||||
|
||||
case "${host_os}" in
|
||||
# pam currently only works on netbsd (9.2 tested) and linux
|
||||
supports_pam=no
|
||||
|
||||
case "${build_os}" in
|
||||
linux*)
|
||||
build_linux=yes
|
||||
OSMAJORVERSION=4
|
||||
OSMINORVERSION=15
|
||||
SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -D_POSIX_SOURCE \
|
||||
-D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE"
|
||||
supports_pam=yes
|
||||
;;
|
||||
freebsd*)
|
||||
build_freebsd=yes
|
||||
|
|
@ -98,6 +111,7 @@ case "${host_os}" in
|
|||
bsd=yes
|
||||
OSMAJORVERSION=8
|
||||
OSMINORVERSION=0
|
||||
supports_pam=yes
|
||||
;;
|
||||
solaris*|sun*)
|
||||
build_solaris=yes
|
||||
|
|
@ -272,7 +286,7 @@ dnl do. This is not a replacement for cpp, used at runtime by
|
|||
dnl software such as tt_type_comp.
|
||||
AC_SUBST(GENCPP, '$(top_builddir)/util/tradcpp/tradcpp')
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
LT_INIT
|
||||
|
||||
dnl make sure it's installed
|
||||
AC_PROG_YACC
|
||||
|
|
@ -280,7 +294,7 @@ if test -z "$ac_cv_prog_YACC"; then
|
|||
MISSING_PROGS="[bison or byacc] ${MISSING_PROGS}"
|
||||
fi
|
||||
|
||||
AM_PROG_LEX
|
||||
AC_PROG_LEX(noyywrap)
|
||||
if test -z "$ac_cv_prog_LEX"; then
|
||||
MISSING_PROGS="[flex or lex] ${MISSING_PROGS}"
|
||||
fi
|
||||
|
|
@ -299,14 +313,11 @@ AC_C_CONST
|
|||
AC_C_BIGENDIAN
|
||||
AC_C_INLINE
|
||||
AC_C_CHAR_UNSIGNED
|
||||
AC_C_STRINGIZE
|
||||
AC_C_FLEXIBLE_ARRAY_MEMBER
|
||||
AC_SYS_POSIX_TERMIOS
|
||||
|
||||
AX_PTHREAD
|
||||
|
||||
AC_PROG_CC_C99
|
||||
|
||||
AC_PATH_X
|
||||
AC_PATH_XTRA
|
||||
|
||||
|
|
@ -401,7 +412,6 @@ dnl Used to check if program 'tic' is available to install terminfo files
|
|||
AC_CHECK_PROGS(TIC, tic, :)
|
||||
|
||||
dnl headers
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS([locale.h security/pam_appl.h utempter.h])
|
||||
|
||||
dnl libraries
|
||||
|
|
@ -419,6 +429,15 @@ AC_CHECK_LIB(tirpc, svc_register,
|
|||
TIRPCLIB=-ltirpc])
|
||||
AC_SUBST(TIRPCLIB)
|
||||
|
||||
dnl see if the rpc_inline_t type exists
|
||||
AC_CHECK_TYPE(rpc_inline_t, [],
|
||||
[AC_DEFINE_UNQUOTED([rpc_inline_t], [int32_t],
|
||||
[Define to int32_t if not defined by including rpc/rpc.h])],
|
||||
[
|
||||
AC_INCLUDES_DEFAULT
|
||||
#include <rpc/rpc.h>
|
||||
])
|
||||
|
||||
dnl check sizeof time_t for RPC
|
||||
AC_CHECK_SIZEOF([int])
|
||||
AC_CHECK_SIZEOF([long])
|
||||
|
|
@ -442,12 +461,16 @@ dnl issues
|
|||
XTOOLLIB=""
|
||||
AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(Xext, XextFindDisplay, [XTOOLLIB="-lXext ${XTOOLLIB}"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(Xau, XauReadAuth, [XTOOLLIB="-lXau ${XTOOLLIB}"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(Xpm, XpmLibraryVersion, [XTOOLLIB="-lXpm ${XTOOLLIB}"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(Xmu, XmuMakeAtom, [XTOOLLIB="-lXmu ${XTOOLLIB}"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"], ,
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"], ,
|
||||
|
|
@ -457,13 +480,23 @@ AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"], ,
|
|||
XTOOLLIB="${EXTRA_INCS} ${EXTRA_LIBS} ${X_EXTRA_LIBS} ${XTOOLLIB}"
|
||||
AC_SUBST([XTOOLLIB])
|
||||
|
||||
dnl only needed by dtlogin
|
||||
AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""],
|
||||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_SUBST(XDMCPLIB)
|
||||
|
||||
dnl iconv
|
||||
AM_ICONV
|
||||
|
||||
dnl figure out pam support
|
||||
|
||||
AC_CHECK_LIB(pam, pam_start,
|
||||
dnl Right now this only works on linux and netbsd (9.2 tested)
|
||||
if test "$supports_pam" = "yes"
|
||||
then
|
||||
AC_CHECK_LIB(pam, pam_start,
|
||||
[SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DHAS_PAM_LIBRARY"])
|
||||
else
|
||||
AC_CHECK_LIB(pam, NOTSUPPORTED)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([HAS_PAM_LIBRARY], [test "x$ac_cv_lib_pam_pam_start" = "xyes"])
|
||||
|
||||
|
|
@ -588,7 +621,6 @@ programs/dsdm/Makefile
|
|||
programs/dthelp/Makefile
|
||||
programs/dthelp/dthelpview/Makefile
|
||||
programs/dthelp/dthelpgen/Makefile
|
||||
programs/dthelp/dthelpdemo/Makefile
|
||||
programs/dthelp/dthelpprint/Makefile
|
||||
programs/dthelp/parser/Makefile
|
||||
programs/dthelp/parser/pass1/Makefile
|
||||
|
|
@ -866,6 +898,10 @@ doc/ja_JP.UTF-8/help/common/DesktopIntro.hf
|
|||
|
||||
include/Makefile
|
||||
|
||||
copyright
|
||||
doc/common/help/HELPEnt.sgm
|
||||
include/Dt/Dt.h
|
||||
lib/tt/bin/ttauth/ttauth.man
|
||||
])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
|
||||
|
||||
Common Desktop Environment Version 2.4.0a
|
||||
Common Desktop Environment Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@
|
||||
|
||||
(c) Copyright 1993-2012 The Open Group
|
||||
(c) Copyright 2012-2022 CDE Project contributors, see CONTRIBUTORS for details
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ -->
|
||||
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.4.0a</GlossTerm>,
|
||||
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@</GlossTerm>,
|
||||
|
||||
© Copyright 1993-2012 The Open Group
|
||||
© Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details
|
||||
© Copyright 2012-2023 CDE Project contributors, see CONTRIBUTORS for details
|
||||
|
||||
Project Website: http://cdesktopenv.sourceforge.net/
|
||||
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
SUBDIRS = m-guides man guides help
|
||||
|
||||
if !NETBSD
|
||||
SUBDIRS = m-guides man guides help
|
||||
else
|
||||
# building the guides on netbsd (9.2) doesn't work currently
|
||||
SUBDIRS = m-guides man help
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -50,15 +50,15 @@ extern "C" {
|
|||
|
||||
/* CDE Version information */
|
||||
|
||||
#define DtVERSION 2
|
||||
#define DtREVISION 4
|
||||
#define DtUPDATE_LEVEL 0
|
||||
#define DtVERSION @CDE_VERSION_MAJOR@
|
||||
#define DtREVISION @CDE_VERSION_MINOR@
|
||||
#define DtUPDATE_LEVEL @CDE_VERSION_MICRO@
|
||||
|
||||
#define DtVERSION_NUMBER (DtVERSION * 10000 + \
|
||||
DtREVISION * 100 + \
|
||||
DtUPDATE_LEVEL)
|
||||
|
||||
#define DtVERSION_STRING "CDE Version 2.4.0a"
|
||||
#define DtVERSION_STRING "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -517,27 +517,23 @@ struct or_hwordrec {
|
|||
* Actual host_to_network functions defined in <netinit/in.h>
|
||||
* which is not yet standardized.
|
||||
*/
|
||||
|
||||
/* JET - Update 12/21/2021 - no need to define (or not) BYTE_SWAP
|
||||
* anymore as we can determine that via autotools (for the code).
|
||||
* Elsewhere, we can just use the systems hto*()/nto*() routines
|
||||
* regardless.
|
||||
*/
|
||||
|
||||
typedef enum {HTON=1, NTOH} SWABDIR;
|
||||
|
||||
extern void swab_dbrec (struct or_dbrec *rec, SWABDIR direction);
|
||||
extern void swab_objrec (struct or_objrec *rec, SWABDIR direction);
|
||||
|
||||
#ifdef BYTE_SWAP /* ie (BYTE_ORDER != BIG_ENDIAN) */
|
||||
|
||||
#define HTONL(x) x = htonl(x)
|
||||
#define HTONS(x) x = htons(x)
|
||||
#define NTOHL(x) x = ntohl(x)
|
||||
#define NTOHS(x) x = ntohs(x)
|
||||
|
||||
#else /* !BYTE_SWAP, ie (BYTE_ORDER == BIG_ENDIAN) */
|
||||
|
||||
#define HTONL(x)
|
||||
#define HTONS(x)
|
||||
#define NTOHL(x)
|
||||
#define NTOHS(x)
|
||||
|
||||
#endif /* BYTE_SWAP */
|
||||
|
||||
|
||||
/*--------------- TESKEY PARSE CHARACTER TYPES ------------
|
||||
* Used in langmap.c for linguistic parsing modules.
|
||||
|
|
|
|||
|
|
@ -52,8 +52,12 @@ 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)
|
||||
#include <sys/types.h>
|
||||
#if defined(HPUX) || defined(__linux__) || defined(SunOS) || defined(CSRG_BASED)
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#if defined(CSRG_BASED) || defined(__linux__)
|
||||
# include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
#if defined(sun) && defined(_XOPEN_SOURCE)
|
||||
|
|
@ -104,6 +108,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
|
|||
#endif /* HPUX */
|
||||
|
||||
#if defined(__linux__) || defined(CSRG_BASED)
|
||||
#include <string.h> /* memset for libcsa and others */
|
||||
typedef enum {B_FALSE, B_TRUE} boolean_t;
|
||||
#define MAXNAMELEN 256
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -26,7 +26,9 @@ nobase_include_HEADERS = Dt/Editor.h \
|
|||
csa/csa.h \
|
||||
Dt/Info.h \
|
||||
Dt/Search.h \
|
||||
Dt/Mmdb.h
|
||||
Dt/Mmdb.h \
|
||||
Dt/DtXinerama.h \
|
||||
Dt/PamSvc.h
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* CDE - Common Desktop Environment
|
||||
*
|
||||
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
|
||||
*
|
||||
* These libraries and programs are free software; you can
|
||||
* redistribute them and/or modify them under the terms of the GNU
|
||||
* Lesser General Public License as published by the Free Software
|
||||
* Foundation; either version 2 of the License, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* These libraries and programs are distributed in the hope that
|
||||
* they will be useful, but WITHOUT ANY WARRANTY; without even the
|
||||
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU Lesser General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with these libraries and programs; if not, write
|
||||
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
|
||||
* Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
/* $XConsortium: pam_svc.h /main/3 1996/10/30 11:13:40 drk $ */
|
||||
/*******************************************************************************
|
||||
**
|
||||
** "@(#)pam_svc.h 1.4 95/09/12
|
||||
**
|
||||
** Copyright 1993, 1994, 1995 Sun Microsystems, Inc. All rights reserved.
|
||||
**
|
||||
** This file contains header info related to use of PAM
|
||||
** (Pluggable Authentication Module) library.
|
||||
**
|
||||
*******************************************************************************/
|
||||
/* *
|
||||
* (c) Copyright 1993, 1994 Hewlett-Packard Company *
|
||||
* (c) Copyright 1993, 1994 International Business Machines Corp. *
|
||||
* (c) Copyright 1993, 1994, 1995 Sun Microsystems, Inc. *
|
||||
* (c) Copyright 1993, 1994 Novell, Inc. *
|
||||
*/
|
||||
|
||||
#ifndef _DT_PAM_SVC_H
|
||||
#define _DT_PAM_SVC_H
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#define DT_BAD_GID 29 /* Invalid Group ID */
|
||||
#define DT_INITGROUP_FAIL 30 /* group IDs init failed */
|
||||
#define DT_BAD_UID 31 /* Invaid User ID */
|
||||
|
||||
/*
|
||||
* External procedure declarations
|
||||
*/
|
||||
|
||||
extern int _DtAuthentication(char*, char*, char*, char*, char*);
|
||||
extern int _DtAccounting(char*, char*, char[], char*, char*, pid_t, int, int);
|
||||
extern int _DtSetCred(char*, char *, uid_t, gid_t);
|
||||
|
||||
#endif /* _DT_PAM_SVC_H */
|
||||
|
|
@ -492,14 +492,14 @@ FormatManPage(
|
|||
int italicCnt = 0;
|
||||
int result = 0;
|
||||
int cread;
|
||||
int lastLen;
|
||||
int lastLen = 0;
|
||||
int checkLen;
|
||||
int retWCLen;
|
||||
wchar_t lastWC;
|
||||
wchar_t retWC;
|
||||
char *rloc = in_buf;
|
||||
char *retStrPtr;
|
||||
char c;
|
||||
char c = 0;
|
||||
char retC;
|
||||
Boolean flag = False;
|
||||
enum State newState;
|
||||
|
|
|
|||
|
|
@ -5089,11 +5089,11 @@ ProcessSDLAttribute(
|
|||
char *attrValue;
|
||||
char **strPtr;
|
||||
char numBuf[DTD_NAMELEN+1];
|
||||
char *varOffset1;
|
||||
char *varOffset1 = NULL;
|
||||
SDLNumber *numPtr1;
|
||||
SdlOption *enumPtr1;
|
||||
SdlOption attrNum;
|
||||
_DtHelpFontValue fontNum;
|
||||
_DtHelpFontValue fontNum = 0;
|
||||
_DtHelpFontValue *fontPtr1;
|
||||
const SDLAttribute *pAttr = SDLAttributeList;
|
||||
|
||||
|
|
|
|||
|
|
@ -2787,7 +2787,7 @@ static void SearchIndex(
|
|||
&indexEntry, &entryLen,indexEntry,entryLen) == 0
|
||||
&& SearchForPattern(indexEntry, srchWord, srchWordLen) == True ) )
|
||||
{
|
||||
_DtHelpGlobSrchHit * hit;
|
||||
_DtHelpGlobSrchHit * hit = NULL;
|
||||
char * * topicIdList;
|
||||
|
||||
HitListAddFound ( curFile, curVol->curIndexXmStr[0],
|
||||
|
|
|
|||
|
|
@ -1413,7 +1413,7 @@ static enum _DtGrLoadStatus processTiff(
|
|||
ilFile inFile;
|
||||
ilPipe inPipe;
|
||||
ilFileImage inImage;
|
||||
const ilImageDes *inDes;
|
||||
const ilImageDes *inDes = 0;
|
||||
static ilContext IlContext = NULL;
|
||||
Display *dpy = DisplayOfScreen(screen);
|
||||
Drawable drawable = RootWindowOfScreen(screen);
|
||||
|
|
@ -2832,7 +2832,7 @@ int _DtGrOpenBuffer(
|
|||
int _DtGrCloseStream(
|
||||
_DtGrStream *stream)
|
||||
{
|
||||
int status;
|
||||
int status = 0;
|
||||
|
||||
if ((stream == NULL) || (stream->type == _DtGrNONE))
|
||||
return(EOF); /* Failure */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
# include <autotools_config.h>
|
||||
# include <cde_config.h>
|
||||
#endif
|
||||
#if defined(HAVE_LOCALE_H)
|
||||
# include <locale.h>
|
||||
|
|
|
|||
|
|
@ -1677,10 +1677,10 @@ ResolveCell(
|
|||
CellInfo *ret_info)
|
||||
{
|
||||
int i;
|
||||
char *id;
|
||||
char *id = NULL;
|
||||
char *idRefs;
|
||||
char *ptr;
|
||||
char c;
|
||||
char *ptr = NULL;
|
||||
char c = 0;
|
||||
int count;
|
||||
int len;
|
||||
int done;
|
||||
|
|
@ -1690,7 +1690,7 @@ ResolveCell(
|
|||
_DtCvUnit cellWidth;
|
||||
_DtCvUnit retWidth;
|
||||
_DtCvUnit retHeight;
|
||||
_DtCvUnit saveTop;
|
||||
_DtCvUnit saveTop = 0;
|
||||
CellInfo *thisCell = &ret_info[cell];
|
||||
DataPoint basePt;
|
||||
_DtCvValue reformat = False;
|
||||
|
|
|
|||
|
|
@ -397,11 +397,11 @@ _DtCvCheckLineSyntax (
|
|||
int str_len,
|
||||
_DtCvValue skip_hypen_ck)
|
||||
{
|
||||
int myStrLen;
|
||||
int wcFlag;
|
||||
void *pChar;
|
||||
int myStrLen = 0;
|
||||
int wcFlag = 0;
|
||||
void *pChar = NULL;
|
||||
wchar_t nextChar;
|
||||
wchar_t lastChar;
|
||||
wchar_t lastChar = 0;
|
||||
_DtCvValue lstCharMb = False;
|
||||
_DtCvValue nxtCharMb = False;
|
||||
|
||||
|
|
|
|||
|
|
@ -40,4 +40,9 @@ libDtHelp_la_SOURCES = Actions.c AsciiSpc.c Callbacks.c \
|
|||
Layout.c LayoutUtil.c LinkMgr.c \
|
||||
Selection.c VirtFuncs.c
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtHelp_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtHelp_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ SearchForClosestLine (
|
|||
_DtCvSelectData *next)
|
||||
{
|
||||
int i;
|
||||
int maxI;
|
||||
int maxI = 0;
|
||||
_DtCvUnit lineY;
|
||||
_DtCvUnit endX;
|
||||
_DtCvUnit begX;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
****************************************************************************
|
||||
************************************<+>*************************************/
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <autotools_config.h>
|
||||
#include <cde_config.h>
|
||||
#endif
|
||||
/*
|
||||
* system includes
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ BufCompressedSkip (
|
|||
BufFilePtr f,
|
||||
int bytes)
|
||||
{
|
||||
int c;
|
||||
int c = 0;
|
||||
while (bytes-- && ((c = BufFileGet(f)) != BUFFILEEOF))
|
||||
;
|
||||
return c;
|
||||
|
|
|
|||
|
|
@ -1221,7 +1221,7 @@ ilPipeInfo info;
|
|||
ilXWCPtr pXWC;
|
||||
ilXPrivPtr pPriv;
|
||||
ilSrcElementData *pSrcData, srcData;
|
||||
unsigned long bufferSize;
|
||||
unsigned long bufferSize = 0;
|
||||
/*
|
||||
** We need to use the execute fucntion with the ratio parameter.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ ilBool ilCrop (
|
|||
{
|
||||
unsigned int state;
|
||||
ilPipeInfo info;
|
||||
ilCropPrivptr pPriv;
|
||||
ilCropPrivptr pPriv = NULL;
|
||||
ilDstElementData dstdata;
|
||||
ilImageDes imdes;
|
||||
ilImageFormat imformat;
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ unsigned long *pNLines
|
|||
ilDecompG3G4PrivPtr pPriv; /* Pointer to private image data */
|
||||
|
||||
ilPtr dstImageP; /* Pointer to the Destn. Image */
|
||||
ilPtr pRefLine; /* Pointer to the Reference line */
|
||||
ilPtr pRefLine = NULL; /* Pointer to the Reference line */
|
||||
ilError error; /* Returned error */
|
||||
int dstBytesPerRow; /* no.of byte per Row in the dest image */
|
||||
ilBool Is_2DCoding; /* G3 2 D coding is present, if True */
|
||||
|
|
|
|||
|
|
@ -1024,7 +1024,7 @@ IL_PRIVATE ilBool _ilConvertRGBToPalette (
|
|||
unsigned short *pPalette;
|
||||
long *pColorTable;
|
||||
ilBool diffusion, chooseColors;
|
||||
int i, shifts[3] = { 0, 0, 0 }, nColors;
|
||||
int i, shifts[3] = { 0, 0, 0 }, nColors = 0;
|
||||
const unsigned short *pMulTable[3] = { NULL, NULL, NULL }; /* dither other than 484 only: pMul? */
|
||||
static ilConvertToPaletteInfo defaultConvert =
|
||||
{IL_DIFFUSION, { 4, 8, 4 }, 8, IL_PALETTE, (ilObject)NULL};
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ IL_PRIVATE ilError _ilMallocImagePixels (
|
|||
)
|
||||
{
|
||||
int plane, nPlanes;
|
||||
int MCUMinus1;
|
||||
int MCUMinus1 = 0;
|
||||
long nBytesToAlloc, nBytesPerRow, allocHeight;
|
||||
ilPtr pPixels;
|
||||
long rowBytesPerPlane [IL_MAX_SAMPLES];
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
/* use autotools detection to determine endianess */
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
# include <autotools_config.h>
|
||||
# include <cde_config.h>
|
||||
#endif
|
||||
|
||||
#ifndef WORDS_BIGENDIAN
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ iljpgError iljpgDecodeJIF (
|
|||
iljpgDataPtr pData;
|
||||
iljpgBool firstMarker, SOSFound, SOF0Found;
|
||||
iljpgError error;
|
||||
int value, nFrameComps, length;
|
||||
int value, nFrameComps = 0, length;
|
||||
iljpgPtr *ppTable;
|
||||
iljpgCompDataPtr pComp;
|
||||
int i, index;
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ static iljpgError build_huffman_tables (
|
|||
lookup_size,
|
||||
code, mask;
|
||||
tree_node *tree_nodes, /* pointer to pool of tree nodes */
|
||||
*nodep, *leafp, **followp; /* misc aux. tree pointers */
|
||||
*nodep, *leafp = NULL, **followp; /* misc aux. tree pointers */
|
||||
LOOKUP *lookup_symb, *lookup_len; /* pointers to lookup tables */
|
||||
int absize; /* actual number of Huffman-encoded symbols */
|
||||
int *hufvals, *hufcodes, *huflen; /* intermediate tables */
|
||||
|
|
|
|||
|
|
@ -784,7 +784,7 @@ ilBool ilScale (
|
|||
{
|
||||
unsigned int state;
|
||||
ilPipeInfo info;
|
||||
ilScalePrivptr pPriv;
|
||||
ilScalePrivptr pPriv = NULL;
|
||||
ilDstElementData dstdata;
|
||||
ilImageDes imdes;
|
||||
ilImageFormat imformat;
|
||||
|
|
|
|||
|
|
@ -490,17 +490,17 @@ static unsigned short tagNumbers [] = {
|
|||
#define AI_NTAGS (sizeof(tagNumbers) / sizeof (unsigned short))
|
||||
#define AIL_FATAL_ERROR(_error) {error = (_error); goto AILFatalError; }
|
||||
|
||||
ilFileImageRelation imageType;
|
||||
ilFileImageRelation imageType = mainImage;
|
||||
ilFileTag *tag [AI_NTAGS];
|
||||
ilBool present;
|
||||
ilError error;
|
||||
ilPtr pTagAlloc;
|
||||
unsigned long value;
|
||||
int i, tagIndex, nBits, resolutionUnit, fillOrder;
|
||||
int i, tagIndex, nBits, resolutionUnit, fillOrder = 0;
|
||||
unsigned long group3CompData;
|
||||
unsigned long group4CompData;
|
||||
ilFileTag *pTag;
|
||||
ilYCbCrInfo *pYCbCr; /* null if not YCbCr ; else -> des...YCbCr */
|
||||
ilYCbCrInfo *pYCbCr = NULL; /* null if not YCbCr ; else -> des...YCbCr */
|
||||
|
||||
/* Init/zero des and format in *pFileImage.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -164,9 +164,9 @@ ilFileTag *pTag;
|
|||
int nTags; /* # of tags to read */
|
||||
unsigned short numbers[MAX_NTAGS]; /* tag ids to read */
|
||||
ilFileTag *tags [MAX_NTAGS]; /* ptr to returned data */
|
||||
int stripOffsetsIndex, stripByteCountsIndex, colorMapIndex,
|
||||
QTablesIndex, DCTablesIndex, ACTablesIndex, softwareIndex,
|
||||
restartIndex;
|
||||
int stripOffsetsIndex, stripByteCountsIndex = 0, colorMapIndex,
|
||||
QTablesIndex = 0, DCTablesIndex = 0, ACTablesIndex = 0, softwareIndex = 0,
|
||||
restartIndex = 0;
|
||||
#define ADD_TAG(_index, _tagid) { \
|
||||
_index = nTags++; \
|
||||
numbers[_index] = _tagid; \
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#ifndef _config_h
|
||||
#define _config_h 1
|
||||
|
||||
#include <autotools_config.h> // determine endianess
|
||||
#include <cde_config.h> // determine endianess
|
||||
|
||||
#if defined(WORDS_BIGENDIAN)
|
||||
# define OLIAS_BIG_ENDIAN
|
||||
|
|
|
|||
|
|
@ -7,4 +7,10 @@ libDtMrm_la_CFLAGS = -I../DtTerm/Term -I../DtTerm/TermPrim -I../DtHelp \
|
|||
|
||||
libDtMrm_la_SOURCES = DtMrm.c
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtMrm_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtMrm_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -7,5 +7,11 @@ libDtPamSvc_la_SOURCES = PamSvc.c ${top_srcdir}/include/Dt/PamSvc.h
|
|||
|
||||
libDtPamSvc_la_LIBADD = -lpam
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtPamSvc_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtPamSvc_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
#if defined(__linux__)
|
||||
#include <grp.h>
|
||||
#endif
|
||||
#include "PamSvc.h"
|
||||
#include <Dt/PamSvc.h>
|
||||
|
||||
/*
|
||||
* Local function declarations
|
||||
|
|
|
|||
|
|
@ -3,15 +3,18 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
lib_LTLIBRARIES = libDtPrint.la
|
||||
|
||||
libDtPrint_la_CFLAGS = -DMULTIBYTE -DI18N_MSG @DT_INCDIR@
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtPrint_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtPrint_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
||||
if SOLARIS
|
||||
libDtPrint_la_CFLAGS += -DNO_REGCOMP
|
||||
endif
|
||||
|
||||
if HPUX
|
||||
libDtPrint_la_CFLAGS += -DMESSAGE_CAT
|
||||
endif
|
||||
|
||||
libDtPrint_la_SOURCES = PrintMsgs.c PrintDlgMgr.c PrintOptions.c PrintSetupB.c \
|
||||
PsubDefProc.c PsubUtil.c
|
||||
|
|
|
|||
|
|
@ -948,7 +948,7 @@ ColumnGeoSetPreferredWidths(
|
|||
int row)
|
||||
{
|
||||
Dimension slack = 0;
|
||||
int last_non_empty_col;
|
||||
int last_non_empty_col = 0;
|
||||
int col;
|
||||
|
||||
for(col = 0; col < PSUB_GEO_COL_COUNT; col++)
|
||||
|
|
|
|||
|
|
@ -9,34 +9,22 @@ CLEANFILES = boolyac.h boolyac.c
|
|||
AM_YFLAGS = -d
|
||||
|
||||
libDtSearch_la_CFLAGS = -DI18N_MSG -DMULTIBYTE -I./raima \
|
||||
@DT_INCDIR@
|
||||
$(DT_INCDIR)
|
||||
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtSearch_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtSearch_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
libDtSearch_la_LIBADD = raima/libraima.la
|
||||
|
||||
if LINUX
|
||||
libDtSearch_la_CFLAGS += -DBYTE_SWAP
|
||||
libDtSearch_la_LIBADD += -lm
|
||||
endif
|
||||
|
||||
if BSD
|
||||
libDtSearch_la_CFLAGS += -DBYTE_SWAP
|
||||
endif
|
||||
|
||||
if SOLARIS
|
||||
libDtSearch_la_CFLAGS += -DBYTE_SWAP
|
||||
libDtSearch_la_LIBADD += -lm -lc
|
||||
endif
|
||||
|
||||
if AIX
|
||||
libDtSearch_la_LIBADD += -lisode
|
||||
endif
|
||||
|
||||
if HPUX
|
||||
libDtSearch_la_LIBADD += -lm
|
||||
endif
|
||||
|
||||
libDtSearch_la_SOURCES = apndext.c ausdopen.c ausexit.c \
|
||||
bmstrstr.c boolpars.c boolsrch.c \
|
||||
boolyac.y cuslang.c dbchange.c \
|
||||
|
|
|
|||
|
|
@ -52,7 +52,8 @@
|
|||
*
|
||||
* $Log$
|
||||
*/
|
||||
#include "SearchP.h"
|
||||
#include <cde_config.h>
|
||||
#include <Dt/SearchP.h>
|
||||
|
||||
/********************************/
|
||||
/* */
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
/********************************/
|
||||
void swab_objrec (struct or_objrec *rec, SWABDIR direction)
|
||||
{
|
||||
#ifndef BYTE_SWAP
|
||||
#if defined(WORDS_BIGENDIAN)
|
||||
return;
|
||||
#else
|
||||
if (direction == NTOH) {
|
||||
|
|
@ -91,7 +92,7 @@ void swab_objrec (struct or_objrec *rec, SWABDIR direction)
|
|||
HTONS (rec->or_objeureka);
|
||||
}
|
||||
return;
|
||||
#endif /* BYTE_SWAP */
|
||||
#endif /* WORDS_BIGENDIAN */
|
||||
} /* swab_objrec() */
|
||||
|
||||
|
||||
|
|
@ -102,7 +103,7 @@ void swab_objrec (struct or_objrec *rec, SWABDIR direction)
|
|||
/********************************/
|
||||
void swab_dbrec (struct or_dbrec *rec, SWABDIR direction)
|
||||
{
|
||||
#ifndef BYTE_SWAP
|
||||
#if defined(WORDS_BIGENDIAN)
|
||||
return;
|
||||
#else
|
||||
if (direction == NTOH) {
|
||||
|
|
@ -147,7 +148,7 @@ void swab_dbrec (struct or_dbrec *rec, SWABDIR direction)
|
|||
HTONS (rec->or_language);
|
||||
}
|
||||
return;
|
||||
#endif /* BYTE_SWAP */
|
||||
#endif /* WORDS_BIGENDIAN */
|
||||
} /* swab_dbrec() */
|
||||
|
||||
/********************* DTSRSWAB.C **********************************/
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ long hilite_cleartext (int parse_type, char *stems, int stemcount)
|
|||
PARG parg;
|
||||
char * (*parser)() = usrblk.dblk->parser;
|
||||
char * (*stemmer)() = usrblk.dblk->stemmer;
|
||||
DtSrHitword *hitwords;
|
||||
DtSrHitword *hitwords = NULL;
|
||||
size_t hitwords_size = 0;
|
||||
long hitwcount = 0;
|
||||
long offset;
|
||||
|
|
@ -158,10 +158,10 @@ long hilite_cleartext (int parse_type, char *stems, int stemcount)
|
|||
hitwords = realloc (hitwords,
|
||||
hitwords_size * sizeof(DtSrHitword) + 16);
|
||||
}
|
||||
if (!hitwords) {
|
||||
fputs (PROGNAME"091 Out of Memory!\n", aa_stderr);
|
||||
DtSearchExit (91);
|
||||
}
|
||||
}
|
||||
if (!hitwords) {
|
||||
fputs (PROGNAME"091 Out of Memory!\n", aa_stderr);
|
||||
DtSearchExit (91);
|
||||
}
|
||||
hitwords[hitwcount].offset = offset;
|
||||
hitwords[hitwcount].length = wordlen;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libraima.la
|
||||
|
||||
libraima_la_LIBADD = -lc -lm
|
||||
|
||||
libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
|
||||
@DT_INCDIR@ -I$(top_srcdir)/include \
|
||||
$(DT_INCDIR) -I$(top_srcdir)/include \
|
||||
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
|
||||
-DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE
|
||||
|
||||
|
|
@ -21,10 +19,6 @@ if SOLARIS
|
|||
libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP
|
||||
endif
|
||||
|
||||
if HPUX
|
||||
libraima_la_CFLAGS += -DMESSAGE_CAT
|
||||
endif
|
||||
|
||||
|
||||
libraima_la_SOURCES = alloc.c cmtype.c connect.c \
|
||||
cotype.c crget.c crread.c crset.c \
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ int dbn /* Database number */
|
|||
char *orec; /* ptr to current owner record contents in cache */
|
||||
char *mrec; /* ptr to current member record contents in cache */
|
||||
char *nrec; /* ptr to next member record contents in cache */
|
||||
DB_ADDR mdba; /* db address of current member record */
|
||||
DB_ADDR ndba; /* db address of next member record */
|
||||
DB_ADDR mdba = NULL; /* db address of current member record */
|
||||
DB_ADDR ndba = NULL; /* db address of next member record */
|
||||
INT ordering; /* set order control variable */
|
||||
int stat, compare; /* status code & sort comparison result */
|
||||
SET_ENTRY *set_ptr;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
|
|||
|
||||
/* dba, or delete chain ptr */
|
||||
memcpy (&align_LONG, slotptr + sizeof(INT), sizeof(LONG));
|
||||
align_LONG = HTONL (align_LONG);
|
||||
HTONL (align_LONG);
|
||||
memcpy (slotptr + sizeof(INT), &align_LONG, sizeof(LONG));
|
||||
|
||||
/* If this is a deleted record, we're done */
|
||||
|
|
@ -151,7 +151,7 @@ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
|
|||
curr_offset < data_offset;
|
||||
curr_offset += sizeof(LONG)) {
|
||||
memcpy (&align_LONG, slotptr + curr_offset, sizeof(LONG));
|
||||
align_LONG = HTONL (align_LONG);
|
||||
HTONL (align_LONG);
|
||||
memcpy (slotptr + curr_offset, &align_LONG, sizeof(LONG));
|
||||
}
|
||||
} /* end loop on each slot */
|
||||
|
|
@ -183,7 +183,7 @@ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
|
|||
|
||||
/* 'orphan' ptr or 'delete chain' ptr */
|
||||
memcpy (&align_LONG, pgbuf + 6, sizeof(LONG));
|
||||
align_LONG = HTONL (align_LONG);
|
||||
HTONL (align_LONG);
|
||||
memcpy (pgbuf + 6, &align_LONG, sizeof(LONG));
|
||||
|
||||
#ifdef DEBUG_DBSWAB
|
||||
|
|
@ -234,7 +234,7 @@ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
|
|||
cptr = slotptr + slsize - 8;
|
||||
|
||||
memcpy (&align_LONG, cptr, sizeof(LONG));
|
||||
align_LONG = HTONL (align_LONG);
|
||||
HTONL (align_LONG);
|
||||
memcpy (cptr, &align_LONG, sizeof(LONG));
|
||||
|
||||
#ifdef DEBUG_DBSWAB
|
||||
|
|
@ -249,7 +249,7 @@ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
|
|||
/* 'child ptr'. after dba, 4 bytes before end of slot. */
|
||||
cptr += 4;
|
||||
memcpy (&align_LONG, cptr, sizeof(LONG));
|
||||
align_LONG = HTONL (align_LONG);
|
||||
HTONL (align_LONG);
|
||||
memcpy (cptr, &align_LONG, sizeof(LONG));
|
||||
|
||||
} /* end loop on each slot */
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <autotools_config.h>
|
||||
|
||||
/* Record number for OR_MISCREC DtSearch record */
|
||||
#define MISCREC_RECNO 3
|
||||
|
|
@ -81,22 +80,11 @@ typedef enum {HTON=1, NTOH} SWABDIR;
|
|||
|
||||
extern void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction);
|
||||
|
||||
#if !defined(WORDS_BIGENDIAN) /* ie (BYTE_ORDER != BIG_ENDIAN) */
|
||||
|
||||
#define HTONL(x) x = htonl(x)
|
||||
#define HTONS(x) x = htons(x)
|
||||
#define NTOHL(x) x = ntohl(x)
|
||||
#define NTOHS(x) x = ntohs(x)
|
||||
|
||||
#else /* !BYTE_SWAP, ie (BYTE_ORDER == BIG_ENDIAN) */
|
||||
|
||||
#define HTONL(x)
|
||||
#define HTONS(x)
|
||||
#define NTOHL(x)
|
||||
#define NTOHS(x)
|
||||
|
||||
#endif /* BYTE_SWAP */
|
||||
|
||||
/******** debug stuff *******/
|
||||
extern char *debug_keyslot_ptr;
|
||||
extern void snap_dump (char *label, void *ptr, int len);
|
||||
|
|
|
|||
|
|
@ -811,10 +811,10 @@ LOOKUP_ENTRY * *xlu_ptr /* pointer to lookup table slot for found page*/
|
|||
{
|
||||
LOOKUP_ENTRY *lookup; /* = db_lookup or ix_lookup */
|
||||
int pgtab_sz; /* = db_pgtab_sz or ix_pgtab_sz */
|
||||
long cmp;
|
||||
long cmp = 0;
|
||||
int cnt;
|
||||
int lu_slot, l, u;
|
||||
LOOKUP_ENTRY *lu_ptr, *replu_ptr;
|
||||
int lu_slot = 0, l, u;
|
||||
LOOKUP_ENTRY *lu_ptr = NULL, *replu_ptr;
|
||||
PAGE_ENTRY *pg_ptr;
|
||||
int *lru_ptr;
|
||||
int pg_slot;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
/*---------------------------------------------------------------------------
|
||||
db_VISTA Key File/Field Manipulation Functions
|
||||
----------------------------------------------
|
||||
An implementation of the B-tree indexing method described in
|
||||
An implementation of the B-tree indexing method described in
|
||||
"Sorting and Searching: The Art of Computer Programming, Vol III",
|
||||
Knuth, Donald E., Addison-Wesley, 1975. pp 473-480.
|
||||
|
||||
|
|
@ -164,12 +164,12 @@ key_open(void)
|
|||
}
|
||||
if ( no_of_keys ) {
|
||||
key_info =
|
||||
/* Macro references must be on one line for some compilers */
|
||||
/* Macro references must be on one line for some compilers */
|
||||
(KEY_INFO *)
|
||||
ALLOC(&db_global.Key_info, no_of_keys*sizeof(KEY_INFO), "key_info");
|
||||
if ( ! key_info )
|
||||
return( dberr(S_NOMEMORY) );
|
||||
for (i = 0, fld_ptr = &field_table[old_size_fd];
|
||||
for (i = 0, fld_ptr = &field_table[old_size_fd];
|
||||
i < size_fd; ++i, ++fld_ptr) {
|
||||
if ( fld_ptr->fd_key != NOKEY ) {
|
||||
ki_ptr = &key_info[fld_ptr->fd_keyno];
|
||||
|
|
@ -180,7 +180,7 @@ key_open(void)
|
|||
ki_ptr->dba = NULL_DBA;
|
||||
file_ptr = &file_table[fld_ptr->fd_keyfile];
|
||||
ki_ptr->keyval =
|
||||
/* Macro references must be on one line for some compilers */
|
||||
/* Macro references must be on one line for some compilers */
|
||||
ALLOC(&ki_ptr->Keyval, file_ptr->ft_slsize, db_avname);
|
||||
if ( ! ki_ptr->keyval )
|
||||
return( dberr(S_NOMEMORY) );
|
||||
|
|
@ -258,7 +258,7 @@ int field /* field number to be processed */
|
|||
|
||||
|
||||
|
||||
/* Reset key_info last status to reposition keys on file "fno"
|
||||
/* Reset key_info last status to reposition keys on file "fno"
|
||||
*/
|
||||
int
|
||||
key_reset(FILE_NO fno)
|
||||
|
|
@ -267,7 +267,7 @@ key_reset(FILE_NO fno)
|
|||
KEY_INFO *ki_ptr;
|
||||
|
||||
for (i = 0, ki_ptr = key_info; i < no_of_keys; ++i, ++ki_ptr) {
|
||||
if (((fno == size_ft) || (ki_ptr->keyfile == fno)) &&
|
||||
if (((fno == size_ft) || (ki_ptr->keyfile == fno)) &&
|
||||
((ki_ptr->lstat == KEYFOUND) || (ki_ptr->lstat == KEYNOTFOUND)))
|
||||
ki_ptr->lstat = KEYREPOS;
|
||||
}
|
||||
|
|
@ -363,7 +363,7 @@ DB_ADDR *dba /* database address of located key */
|
|||
/* return database address for d_keyfind */
|
||||
if ( *dba == NULL_DBA )
|
||||
bytecpy(dba, &curkey->dba, sizeof(DB_ADDR));
|
||||
|
||||
|
||||
return( db_status );
|
||||
}
|
||||
|
||||
|
|
@ -380,8 +380,8 @@ int *slot_offset, /* slot position offset */
|
|||
F_ADDR *child /* child ptr of located key */
|
||||
)
|
||||
{
|
||||
int cmp, i, l, u, slot_pos;
|
||||
char *node_slot_ptr;
|
||||
int cmp = 0, i = 0, l, u, slot_pos = 0;
|
||||
char *node_slot_ptr = NULL;
|
||||
|
||||
/* perform binary search on node */
|
||||
l = 0;
|
||||
|
|
@ -432,7 +432,7 @@ KEY_SLOT *slot, /* pointer to key slot to be compared */
|
|||
DB_ADDR *dba /* database address included in comparison if not null */
|
||||
)
|
||||
{
|
||||
/*
|
||||
/*
|
||||
returns < 0 if key_val < slot
|
||||
> 0 if key_val > slot
|
||||
= 0 if key_val == slot
|
||||
|
|
@ -529,7 +529,7 @@ DB_ADDR *dba /* db address of scanned record */
|
|||
node_slot_ptr = &node->slots[np_ptr->slot*slot_len];
|
||||
}
|
||||
bytecpy(&child, node_slot_ptr, sizeof(F_ADDR));
|
||||
} while ( child != NULL_NODE );
|
||||
} while ( child != NULL_NODE );
|
||||
|
||||
if (np_ptr->slot == node->used_slots) {
|
||||
--np_ptr->slot;
|
||||
|
|
@ -686,9 +686,9 @@ DB_ADDR dba /* record's database address */
|
|||
}
|
||||
db_status = stat;
|
||||
}
|
||||
else if ( db_status == S_OKAY )
|
||||
else if ( db_status == S_OKAY )
|
||||
dberr(S_SYSERR);
|
||||
|
||||
|
||||
return( db_status );
|
||||
}
|
||||
|
||||
|
|
@ -925,7 +925,7 @@ static int delete(void)
|
|||
r_node_slot_ptr = &r_node->slots[sizeof(F_ADDR)];
|
||||
bytecpy(node_slot_ptr, r_node_slot_ptr, slot_len - sizeof(F_ADDR));
|
||||
dio_touch(pg);
|
||||
|
||||
|
||||
/* set up to delete key from leaf */
|
||||
/* (this is more efficient than a recursive call) */
|
||||
slot_pos = 0;
|
||||
|
|
@ -1158,7 +1158,7 @@ d_keyread(char *key_val)
|
|||
if ( cfld_ptr->fd_type == COMKEY ) {
|
||||
/* copy compound key fields */
|
||||
for (kt_lc = size_kt - cfld_ptr->fd_ptr,
|
||||
key_ptr = &key_table[cfld_ptr->fd_ptr];
|
||||
key_ptr = &key_table[cfld_ptr->fd_ptr];
|
||||
(--kt_lc >= 0) && (key_ptr->kt_key == fldno); ++key_ptr) {
|
||||
fld_ptr = &field_table[key_ptr->kt_field];
|
||||
fptr = key_type.ks.data + key_ptr->kt_ptr;
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ DB_ADDR *db_addr
|
|||
char *fptr;
|
||||
const char *tfptr;
|
||||
int s, i, strfld;
|
||||
FIELD_ENTRY *sfld_ptr;
|
||||
FIELD_ENTRY *sfld_ptr = NULL;
|
||||
SORT_ENTRY *srt_ptr;
|
||||
DB_ADDR *co_ptr, *cm_ptr;
|
||||
|
||||
|
|
@ -402,7 +402,7 @@ DB_ADDR *db_addr
|
|||
}
|
||||
}
|
||||
}
|
||||
if ( strfld >= 0 ) {
|
||||
if ( strfld >= 0 && sfld_ptr) {
|
||||
/* insert the new struct key */
|
||||
if ( key_insert( strfld, rec + sfld_ptr->fd_ptr, dba ) != S_OKAY )
|
||||
return( db_status );
|
||||
|
|
|
|||
|
|
@ -1658,7 +1658,7 @@ int SPC_Query_Logfile(SPC_Channel_Ptr channel)
|
|||
{
|
||||
SPC_Connection_Ptr connection=channel->connection;
|
||||
protocol_request_ptr prot;
|
||||
XeString junk1, junk2;
|
||||
XeString junk1 = NULL, junk2 = NULL;
|
||||
|
||||
SPC_Write_Protocol_Request(connection, channel, QUERY_LOGFILE);
|
||||
prot=SPC_Filter_Connection(connection, channel, LOGFILE_REPLY, TRUE);
|
||||
|
|
@ -1713,7 +1713,7 @@ SPC_Validate_User(XeString hostname,
|
|||
{
|
||||
XeString username = XeString_NULL;
|
||||
uid_t this_uid;
|
||||
XeString proto_ver;
|
||||
XeString proto_ver = NULL;
|
||||
XeString hostinfo;
|
||||
XeString path;
|
||||
protocol_request_ptr prot;
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ void SPC_XtAddInput(SPC_Channel_Ptr channel,
|
|||
SPC_Callback_Condition condition)
|
||||
/*-----------------------------------------------------------------------+*/
|
||||
{
|
||||
SbInputId id;
|
||||
SbInputId id = 0;
|
||||
|
||||
switch(condition) {
|
||||
|
||||
|
|
@ -224,8 +224,7 @@ void SPC_XtAddInput(SPC_Channel_Ptr channel,
|
|||
else
|
||||
id = (*SbAddException_hookfn)(fd, handler, channel);
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
*id_addr=SPC_AddInput(fd, condition, id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1003,7 +1003,7 @@ _DtActionConverter(DtDtsDbField * fields,
|
|||
char bigBuf[_DtAct_MAX_BUF_SIZE];
|
||||
char *buf = bigBuf;
|
||||
char *fileName = _DtDbPathIdToString(pathId);
|
||||
char *actionType;
|
||||
char *actionType = NULL;
|
||||
|
||||
_DtSvcProcessLock();
|
||||
if (firstTime)
|
||||
|
|
|
|||
|
|
@ -885,7 +885,7 @@ TtRequestCallbackHandler(
|
|||
int argRepType;
|
||||
char *upttbuf;
|
||||
int upttbuflen, ivalue;
|
||||
char *upVType, *upVType2;
|
||||
char *upVType = NULL, *upVType2 = NULL;
|
||||
|
||||
|
||||
status = (Tt_status) tt_message_status(message);
|
||||
|
|
@ -1174,7 +1174,7 @@ InitiateTtRequest(
|
|||
ActionRequest *request )
|
||||
|
||||
{
|
||||
CallbackData *data;
|
||||
CallbackData *data = NULL;
|
||||
ActionPtr action = request->clonedAction;
|
||||
tt_msgAttr * tt = &(action->u.tt_msg);
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -961,7 +961,7 @@ ReadNextEntry(
|
|||
char *start;
|
||||
char *last;
|
||||
char *save;
|
||||
char *error_buffer;
|
||||
char *error_buffer = NULL;
|
||||
short startDef;
|
||||
char * errorName;
|
||||
char * version;
|
||||
|
|
|
|||
|
|
@ -1951,7 +1951,7 @@ DtDtsSetDataType(const char *filename, const char *datatype_in, const int overid
|
|||
int fd;
|
||||
char *dt;
|
||||
int size;
|
||||
u_char *buff;
|
||||
u_char *buff = NULL;
|
||||
struct stat file_stat;
|
||||
char *datatype = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ _DtSetSmState(
|
|||
Window smWindow,
|
||||
SmStateInfo *pSmStateInfo)
|
||||
{
|
||||
int propStatus;
|
||||
int propStatus = Success;
|
||||
PropDtSmStateInfo propSmStateInfo;
|
||||
PropDtSmStateInfo *pPropSmStateInfo;
|
||||
Atom xaDtSmStateInfo;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ _DtPerfChkpntListenInit(Display *display, Window parentwin)
|
|||
#endif
|
||||
{
|
||||
Time timestamp = INVALID_TIME;
|
||||
Window tmpwin;
|
||||
Window tmpwin = 0;
|
||||
Bool bsuccess = False;
|
||||
|
||||
_DtSvcProcessLock();
|
||||
|
|
|
|||
|
|
@ -110,12 +110,12 @@ GetTableIndex(
|
|||
#endif /* NeedWidePrototypes */
|
||||
{
|
||||
DtHashEntry *entries = tab->entries;
|
||||
int len, idx, i, rehash = 0;
|
||||
int len = 0, idx, i, rehash = 0;
|
||||
char c;
|
||||
Signature sig = 0;
|
||||
DtHashEntry entry;
|
||||
String s1, s2;
|
||||
DtHashKey compKey;
|
||||
DtHashKey compKey = NULL;
|
||||
|
||||
if (tab->keyIsString) {
|
||||
s1 = (String)key;
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
#include <Dt/Connect.h>
|
||||
#include <Dt/DtNlUtils.h>
|
||||
#ifdef USE_XINERAMA
|
||||
#include <DtXinerama.h>
|
||||
#include <Dt/DtXinerama.h>
|
||||
#endif
|
||||
#include "SharedProcs.h"
|
||||
|
||||
|
|
@ -209,7 +209,7 @@ _DtMessageDialog(
|
|||
int dialogType )
|
||||
|
||||
{
|
||||
Widget message;
|
||||
Widget message = NULL;
|
||||
Widget widget;
|
||||
XmString message_string;
|
||||
XWindowAttributes attributes;
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ _DtGetEntries(
|
|||
int dosort )
|
||||
{
|
||||
char *line, *colon, *temp, *str, *temp2;
|
||||
Entry entry;
|
||||
Entry entry = { NULL, NULL, 0, False };
|
||||
int length;
|
||||
int lineno = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
lib_LTLIBRARIES = libDtSvc.la
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtSvc_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtSvc_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
||||
# USe CPPFLAGS so it will apply to both C and C++ components
|
||||
libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \
|
||||
|
|
|
|||
|
|
@ -25,4 +25,10 @@ if HAS_UTEMPTER_LIBRARY
|
|||
libDtTerm_la_LIBADD += -lutempter
|
||||
endif
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtTerm_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtTerm_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -984,8 +984,8 @@ _DtTermBufferErase
|
|||
DtEraseMode eraseSwitch
|
||||
)
|
||||
{
|
||||
short startCol;
|
||||
short lastCol;
|
||||
short startCol = 0;
|
||||
short lastCol = 0;
|
||||
|
||||
switch(eraseSwitch)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -529,6 +529,8 @@ _DtTermEraseDisplay(Widget w) /* ED CSIpJ */
|
|||
case 2:
|
||||
eraseMode = eraseBuffer;
|
||||
break ;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
_DtTermFuncEraseInDisplay(w, (int)eraseMode, fromParser);
|
||||
vtw->term.tpd->cursorRow = row;
|
||||
|
|
@ -746,6 +748,9 @@ _DtTermEraseInLine(Widget w) /* EL ESC[pK */
|
|||
eraseMode = eraseLine;
|
||||
break;
|
||||
|
||||
default:
|
||||
return;
|
||||
|
||||
}
|
||||
_DtTermFuncEraseInLine(w, (int)eraseMode, fromParser);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libTermPrim.la
|
||||
|
||||
AM_CPPFLAGS = @DT_INCDIR@
|
||||
AM_CPPFLAGS = $(DT_INCDIR)
|
||||
|
||||
libTermPrim_la_SOURCES = TermPrim.c \
|
||||
TermPrimAction.c \
|
||||
|
|
@ -33,10 +33,6 @@ libTermPrim_la_SOURCES = TermPrim.c \
|
|||
|
||||
# JET there may be some more missing here...
|
||||
|
||||
if AIX
|
||||
libTermPrim_la_SOURCES += TermPrimGetPty-clone.c
|
||||
endif
|
||||
|
||||
if SOLARIS
|
||||
libTermPrim_la_SOURCES += TermPrimGetPty-svr4.c
|
||||
AM_CPPFLAGS += -DSUN_ARCHITECTURE
|
||||
|
|
|
|||
|
|
@ -573,8 +573,8 @@ _DtTermPrimBufferInsertWc
|
|||
short *returnLength /* count of characters in overflow buffer */
|
||||
)
|
||||
{
|
||||
short widthInc; /* incremental change in line width */
|
||||
short lengthInc; /* incremental change in line length */
|
||||
short widthInc = 0; /* incremental change in line width */
|
||||
short lengthInc = 0; /* incremental change in line length */
|
||||
short widthInsert; /* column width of chars inserted */
|
||||
short localCol;
|
||||
TermLine line;
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@ _DtTermPrimRefreshTextWc(Widget w, short startColumn, short startRow,
|
|||
short chunkStartColumn;
|
||||
short chunkWidth;
|
||||
short chunkLength;
|
||||
short thisStartColumn;
|
||||
short thisEndColumn;
|
||||
short thisStartColumn = 0;
|
||||
short thisEndColumn = 0;
|
||||
enhValues enhancements;
|
||||
int i1;
|
||||
int lineNum;
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ _DtTermPrimSubprocExec(Widget w,
|
|||
DtTermPrimitiveWidget tw = (DtTermPrimitiveWidget) w;
|
||||
static char *defaultCmd = (char *) 0;
|
||||
int i;
|
||||
int pty;
|
||||
int pty = -1;
|
||||
pid_t pid;
|
||||
char *c;
|
||||
int err;
|
||||
|
|
|
|||
|
|
@ -599,7 +599,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
|
|||
Arg arglist[20];
|
||||
Arg *newArglist;
|
||||
int i;
|
||||
KeySym ks;
|
||||
KeySym ks = NoSymbol;
|
||||
char *accelerator;
|
||||
char *acceleratorText;
|
||||
|
||||
|
|
|
|||
|
|
@ -1290,8 +1290,8 @@ Draw(
|
|||
XRectangle clip;
|
||||
Position p_x, p_y, s_x, s_y;
|
||||
Dimension width = 0, height = 0;
|
||||
Pixmap pix;
|
||||
Pixmap mask;
|
||||
Pixmap pix = 0;
|
||||
Pixmap mask = 0;
|
||||
int index;
|
||||
Dimension left = 0, right = 0, top = 0, bottom = 0;
|
||||
Dimension v_pad;
|
||||
|
|
|
|||
|
|
@ -1784,7 +1784,7 @@ extractFontMetrics(
|
|||
XmFontListEntry next_entry;
|
||||
XmFontType type_return = XmFONT_IS_FONT;
|
||||
XtPointer tmp_font;
|
||||
XFontStruct *font;
|
||||
XFontStruct *font = NULL;
|
||||
Boolean have_font_struct = False;
|
||||
Boolean have_font_set = False;
|
||||
Boolean use_font_set = False;
|
||||
|
|
|
|||
|
|
@ -3063,7 +3063,7 @@ Draw(
|
|||
GC gc;
|
||||
XRectangle clip;
|
||||
Position p_x, p_y, s_x, s_y;
|
||||
Dimension width, height;
|
||||
Dimension width = 0, height = 0;
|
||||
unsigned char behavior = G_Behavior (g);
|
||||
Position adj_x, adj_y;
|
||||
int rec_width=0,begin=0,diff=0;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,12 @@ AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) $(DT_INCDIR)
|
|||
|
||||
libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtWidget_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtWidget_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
if SOLARIS
|
||||
libDtWidget_la_CFLAGS += -DNO_REGCOMP
|
||||
|
|
|
|||
|
|
@ -940,7 +940,7 @@ _SpinBoxBeginLine( DtSpinBoxWidget spin,
|
|||
Cardinal *num_params)
|
||||
{
|
||||
int new_position;
|
||||
float new_current;
|
||||
float new_current = 0.0;
|
||||
|
||||
if (*num_params != 0) /* params means label or arrows */
|
||||
spin = (DtSpinBoxWidget)XtParent(spin);
|
||||
|
|
@ -978,7 +978,7 @@ _SpinBoxEndLine( DtSpinBoxWidget spin,
|
|||
Cardinal *num_params)
|
||||
{
|
||||
int new_position;
|
||||
float new_current;
|
||||
float new_current = 0.0;
|
||||
|
||||
if (*num_params != 0) /* params means label or arrows */
|
||||
spin = (DtSpinBoxWidget)XtParent(spin);
|
||||
|
|
|
|||
|
|
@ -985,7 +985,7 @@ GeometryManager(
|
|||
height_req = request->request_mode & CWHeight,
|
||||
bw_req = request->request_mode & CWBorderWidth,
|
||||
almost = False;
|
||||
XtGeometryResult result, parent_result;
|
||||
XtGeometryResult result = XtGeometryYes, parent_result;
|
||||
XtWidgetGeometry parent_req, parent_reply;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
#include "DtXinerama.h"
|
||||
#include <Dt/DtXinerama.h>
|
||||
|
||||
/* return a DtXineramaInfo_t (or NULL if no Xinerama) available */
|
||||
|
||||
|
|
|
|||
|
|
@ -5,5 +5,12 @@ lib_LTLIBRARIES = libDtXinerama.la
|
|||
libDtXinerama_la_SOURCES = DtXinerama.c
|
||||
|
||||
libDtXinerama_la_LIBADD = -lXinerama
|
||||
libDtXinerama_la_LDFLAGS = -version-info 2:1:0
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libDtXinerama_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libDtXinerama_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,24 +5,20 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
lib_LTLIBRARIES = libcsa.la
|
||||
|
||||
libcsa_la_CFLAGS = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
|
||||
@CSA_INCDIR@
|
||||
$(CSA_INCDIR)
|
||||
|
||||
libcsa_la_LIBADD = -lXt $(TIRPCLIB)
|
||||
libcsa_la_LIBADD = $(XTOOLLIB) $(TIRPCLIB)
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libcsa_la_LDFLAGS = -version-info 2:1:0
|
||||
|
||||
if SOLARIS
|
||||
libcsa_la_LDFLAGS += -G -z text -z defs
|
||||
libcsa_la_CFLAGS += -v
|
||||
endif
|
||||
|
||||
if HPUX
|
||||
libcsa_la_CFLAGS += -DHPUX
|
||||
else
|
||||
libcsa_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
if LINUX
|
||||
else
|
||||
libcsa_la_LIBADD += $(LIBSVC) -lXm
|
||||
libcsa_la_LIBADD += $(LIBSVC) $(XTOOLLIB)
|
||||
endif
|
||||
|
||||
AM_YFLAGS = -d
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <autotools_config.h>
|
||||
#include <cde_config.h>
|
||||
#endif
|
||||
#include <EUSCompat.h>
|
||||
#include "cm.h"
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ _DtCmHashCriteria(
|
|||
time_t tstart1, tstart2, tend1, tend2;
|
||||
time_t tick;
|
||||
char *name;
|
||||
cms_attribute_value *val, *hval;
|
||||
cms_attribute_value *val, *hval = NULL;
|
||||
boolean_t keep;
|
||||
|
||||
*hnum = 0;
|
||||
|
|
@ -247,7 +247,7 @@ _DtCmHashCriteria(
|
|||
|
||||
(*hattrs)[j].name.name = name;
|
||||
(*hattrs)[j].name.num = index;
|
||||
if (val) {
|
||||
if (val && hval) {
|
||||
(*hattrs)[j].value = &hval[j];
|
||||
(*hattrs)[j].value->type = val->type;
|
||||
if (csaattrs &&
|
||||
|
|
|
|||
|
|
@ -1206,7 +1206,7 @@ csa2cmsattrs(
|
|||
{
|
||||
CSA_return_code stat = CSA_SUCCESS;
|
||||
cms_attribute *cmsattrs;
|
||||
CSA_enum *ops_r;
|
||||
CSA_enum *ops_r = NULL;
|
||||
CSA_reminder *rptr1, *rptr2;
|
||||
int i,j;
|
||||
|
||||
|
|
|
|||
|
|
@ -1055,7 +1055,7 @@ _DtCm_table_delete(
|
|||
extern CSA_return_code
|
||||
_DtCm_table_size(Calendar *cal, int *size)
|
||||
{
|
||||
int *res;
|
||||
int *res = NULL;
|
||||
CSA_return_code stat = CSA_SUCCESS;
|
||||
_DtCm_Connection *conn;
|
||||
|
||||
|
|
@ -1275,7 +1275,7 @@ _DtCm_table_unregister_target(
|
|||
nullreturned = B_TRUE;
|
||||
break;
|
||||
default:
|
||||
stat = CSA_E_FAILURE;
|
||||
return CSA_E_FAILURE;
|
||||
}
|
||||
|
||||
if (nullreturned) {
|
||||
|
|
@ -1360,7 +1360,7 @@ _DtCm_table_register_target(
|
|||
nullreturned = B_TRUE;
|
||||
break;
|
||||
default:
|
||||
stat = CSA_E_FAILURE;
|
||||
return CSA_E_FAILURE;
|
||||
}
|
||||
|
||||
if (nullreturned) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
bin_PROGRAMS = ttdbck
|
||||
|
||||
|
|
|
|||
|
|
@ -151,9 +151,9 @@ const char* MP_TYPE_PROP = "_NODE_TYPE";
|
|||
Prop_ptr sp;
|
||||
_Tt_string_list_cursor v;
|
||||
_Tt_db_property_ptr dbprop = new _Tt_db_property();
|
||||
uid_t euid;
|
||||
gid_t group;
|
||||
mode_t mode;
|
||||
uid_t euid = 0;
|
||||
gid_t group = 0;
|
||||
mode_t mode = 0;
|
||||
int owner_written = 0;
|
||||
int group_written = 0;
|
||||
int mode_written = 0;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
noinst_SCRIPTS = ttce2xdr
|
||||
BUILT_SOURCES = ttce2xdr
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
bin_PROGRAMS = ttmv ttrm ttcp ttrmdir
|
||||
|
||||
AM_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
|
||||
|
||||
LDADD = @LIBTT@ $(TIRPCLIB) $(XTOOLLIB)
|
||||
LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
LDADD += -ldl -lintl -lsocket -lnsl
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
BUILT_SOURCES = mp_types_gram.h
|
||||
CLEANFILES = mp_types_gram.h
|
||||
|
|
|
|||
|
|
@ -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.4.0a" "CDE"
|
||||
.TH TTAUTH 1 "Release @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@" "CDE"
|
||||
.SH NAME
|
||||
ttauth \- ToolTalk authority file utility
|
||||
.SH SYNOPSIS
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
bin_PROGRAMS = rpc.ttdbserver
|
||||
|
||||
rpc_ttdbserver_CXXFLAGS = -I../../slib -I../../lib -I../../mini_isam \
|
||||
$(TIRPC_DEFINES) $(TT_VERSION_DEFINE)
|
||||
|
||||
rpc_ttdbserver_LDADD = @LIBTT@ ${TIRPCLIB} $(X_LIBS) ../../slib/libstt.a \
|
||||
rpc_ttdbserver_LDADD = $(LIBTT) ${TIRPCLIB} $(X_LIBS) ../../slib/libstt.a \
|
||||
../../mini_isam/libisam.a
|
||||
|
||||
if LINUX
|
||||
|
|
|
|||
|
|
@ -1553,7 +1553,7 @@ _tt_db_results *_tt_queue_message_1 (_tt_queue_msg_args *args,
|
|||
_tt_get_rpc_strings(args->ptypes, message_info->ptypes);
|
||||
|
||||
// Get the XDR size of the new message info structure
|
||||
u_int length;
|
||||
u_int length = 0;
|
||||
_Tt_xdr_size_stream xdrsz;
|
||||
if (!message_info->xdr((XDR *)xdrsz)) {
|
||||
results = TT_DB_ERR_ILLEGAL_MESSAGE;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
bin_PROGRAMS = ttsession
|
||||
|
||||
ttsession_CXXFLAGS = -I../../slib -I../../lib $(TT_VERSION_DEFINE)
|
||||
|
||||
ttsession_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
|
||||
ttsession_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a
|
||||
|
||||
if LINUX
|
||||
ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
MAINTAINERCLENAFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
bin_PROGRAMS = tttar
|
||||
|
||||
tttar_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
|
||||
|
||||
tttar_LDADD = ../../slib/libstt.a ../../mini_isam/libisam.a \
|
||||
@LIBTT@ $(TIRPCLIB) $(XTOOLLIB)
|
||||
$(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
tttar_LDADD += -ldl -lintl -lsocket -lnsl
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
|
||||
bin_PROGRAMS = tttrace
|
||||
|
||||
tttrace_CXXFLAGS = -I../../lib
|
||||
|
||||
tttrace_LDADD = @LIBTT@ $(TIRPCLIB) $(XTOOLLIB)
|
||||
tttrace_LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
tttrace_LDADD += -ldl -lintl -lsocket -lnsl
|
||||
|
|
|
|||
|
|
@ -2,20 +2,22 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
SUBDIRS = api db mp util tttk
|
||||
|
||||
include ../tooltalk.inc
|
||||
|
||||
lib_LTLIBRARIES = libtt.la
|
||||
|
||||
if AIX
|
||||
libtt_la_SOURCES = realpath.c
|
||||
else
|
||||
libtt_la_SOURCES =
|
||||
endif
|
||||
# if you are on a system that does not support realpath(), you may need to
|
||||
# include realpath.c in the _SOURCES
|
||||
#
|
||||
#libtt_la_SOURCES = realpath.c
|
||||
|
||||
libtt_la_SOURCES =
|
||||
|
||||
# fake things so libtool creates this as a C++ library
|
||||
nodist_EXTRA_libtt_la_SOURCES = dummy.cxx
|
||||
libtt_la_LIBADD = api/c/libapi.la api/dnd/libdnd.la db/libdb.la mp/libmp.la \
|
||||
util/libutil.la tttk/libtttk.la -lstdc++
|
||||
util/libutil.la tttk/libtttk.la
|
||||
|
||||
if SOLARIS
|
||||
# This stuff should be figured out by configure
|
||||
libtt_la_LIBADD += -lnsl -lsocket -lintl -ldl -lc -lw
|
||||
endif
|
||||
|
||||
|
|
@ -23,4 +25,10 @@ if LINUX
|
|||
libtt_la_LIBADD += $(TIRPCLIB)
|
||||
endif
|
||||
|
||||
# in order to try to keep lib versions the same across platforms, (2.1.0)
|
||||
if BSD
|
||||
libtt_la_LDFLAGS = -version-info 2:1:0
|
||||
else
|
||||
libtt_la_LDFLAGS = -version-info 3:0:1
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ ttdir = ${includedir}/Tt
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../../tooltalk.inc
|
||||
|
||||
noinst_LTLIBRARIES = libapi.la
|
||||
|
||||
libapi_la_CXXFLAGS = -I../../../lib
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../../tooltalk.inc
|
||||
|
||||
noinst_LTLIBRARIES = libdnd.la
|
||||
|
||||
libdnd_la_CFLAGS = -I../..
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
|
||||
noinst_LTLIBRARIES = libdb.la
|
||||
|
||||
libdb_la_CXXFLAGS = -I../../lib -I../../mini_isam
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
|
||||
noinst_LTLIBRARIES = libmp.la
|
||||
|
||||
libmp_la_CXXFLAGS = -I../../lib -I../../mini_isam
|
||||
|
|
|
|||
|
|
@ -640,7 +640,7 @@ parsed_address(_Tt_string &addr_string)
|
|||
int junk_version = 1;
|
||||
Tt_status status;
|
||||
const char *addr_format_fmt = "%%ld %%d %%d %%d %%lu %%%ds %%d";
|
||||
char addr_format[32];
|
||||
char addr_format[64];
|
||||
const char *fcs1_addr_format_fmt = "%%ld %%d %%d %%d %%lu %%%ds";
|
||||
char fcs1_addr_format[32];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
headerdir = ${prefix}/share/include/Tt
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
include ../../tooltalk.inc
|
||||
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
|
||||
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
|
||||
|
||||
noinst_LTLIBRARIES = libtttk.la
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue