debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cde-next

Browse Source
This commit is contained in:
Jon Trulson
2018-11-04 10:56:04 -07:00
parent 2dadc23e0e 0ffb04938c
commit 2c1f56d37c
163 changed files with 1492 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cde/lib/DtHelp/Helpos.c
View File

@@ -253,38 +253,10 @@ void DtHelpSetCatalogName(
if (catFile == NULL)
{
/* Setup the short and long versions */
#ifdef __ultrix
CatFileName = strdup("DtHelp.cat");
#else
CatFileName = strdup("DtHelp");
#endif
}
else
{
#ifdef __ultrix
/* If we have a full path, just use it */
if (*catFile == '/')
CatFileName = strdup(catFile);
else
{
/* We don't have a full path, and the ultirx os needs the
* ".cat" extention so let's make sure its there.
*/
if (strcmp(&catFile[strlen(catFile) -4], ".cat") == 0)
CatFileName = strdup(catFile);
else
{
/* Create our CatFileName with the extention */
CatFileName = malloc (strlen(catFile) + 5);
/* +5, 1 for NULL, 4 for ".cat" */
strcpy(CatFileName, catFile);
strcat(CatFileName, ".cat");
}
}
#else
{
/* If we have a full path, just use it */
if (*catFile == '/')
@@ -294,7 +266,7 @@ void DtHelpSetCatalogName(
/* hp-ux os does not work with the ".cat" extention, so
* if one exists, remove it.
*/
if (strcmp(&catFile[strlen(catFile) -4], ".cat") != 0)
CatFileName = strdup(catFile);
else
@@ -306,7 +278,6 @@ void DtHelpSetCatalogName(
CatFileName[len]= '\0';
}
}
#endif
}
_DtHelpProcessUnlock();
}
@@ -340,22 +311,18 @@ char *_DtHelpGetMessage(
static nl_catd nlmsg_fd;
_DtHelpProcessLock();
if ( first )
if ( first )
{
/* Setup our default message catalog names if none have been set! */
if (CatFileName == NULL)
{
/* Setup the short and long versions */
#ifdef __ultrix
CatFileName = strdup("DtHelp.cat");
#else
CatFileName = strdup("DtHelp");
#endif
}
loc = _DtHelpGetLocale();
if (!loc || !(strcmp (loc, "C")))
if (!loc || !(strcmp (loc, "C")))
/*
* If LANG is not set or if LANG=C, then there
* is no need to open the message catalog - just

4
cde/lib/DtHelp/Imakefile
View File

@@ -78,7 +78,7 @@ SRCS1 = \
HyperText.c JpegUtils.c Messages.c \
PathArea.c Print.c Resize.c \
SetList.c VolSelect.c XInterface.c \
XUICreate.c XbmUtils.c version.c
XUICreate.c XbmUtils.c
OBJS1 = \
Actions.o AsciiSpc.o Callbacks.o \
@@ -91,7 +91,7 @@ OBJS1 = \
HyperText.o JpegUtils.o Messages.o \
PathArea.o Print.o Resize.o \
SetList.o VolSelect.o XInterface.o \
XUICreate.o XbmUtils.o version.o
XUICreate.o XbmUtils.o
SRCS2 = \
Access.c AccessCCDF.c AccessSDL.c \

53
cde/lib/DtHelp/version.c
View File

@@ -1,53 +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
*/
#ifndef lint
#ifdef VERBOSE_REV_INFO
/* add any additional revision info here */
#endif /* VERBOSE_REV_INFO */
#endif /* lint */
/********************************************************
Copyright (c) 1988 by Hewlett-Packard Company
Copyright (c) 1988 by the Massachusetts Institute of Technology
Permission to use, copy, modify, and distribute this software
and its documentation for any purpose and without fee is hereby
granted, provided that the above copyright notice appear in all
copies and that both that copyright notice and this permission
notice appear in supporting documentation, and that the names of
Hewlett-Packard or M.I.T. not be used in advertising or publicity
pertaining to distribution of the software without specific, written
prior permission.
(c) Copyright 1993, 1994 Hewlett-Packard Company
(c) Copyright 1993, 1994 International Business Machines Corp.
(c) Copyright 1993, 1994 Sun Microsystems, Inc.
(c) Copyright 1993, 1994 Novell, Inc.
********************************************************/
#include <include/hpversion.h>
#ifndef lint
version_tag("$XConsortium: version.c /main/7 1996/08/30 15:23:51 drk $")
#endif /* lint */