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

Merge branch 'master' into dtdocbook

Browse Source
This commit is contained in:
Liang Chang
2022-01-30 08:04:32 +08:00
parent 20e32a1208 75c377065a
commit b4ffb694bd
285 changed files with 778 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dthelp/Makefile.am
View File

@@ -1,4 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = dthelpview dthelpgen dthelpdemo dthelpprint parser
SUBDIRS = dthelpview dthelpgen dthelpprint parser
# dthelpdemo - removed from list above - I can't see anyone needing to
# build this example code for the forseeable future.

3
cde/programs/dthelp/dthelpprint/PrintTopics.c
View File

@@ -43,12 +43,13 @@ $COPYRIGHT$:
#endif
#ifdef HAVE_CONFIG_H
#include <autotools_config.h>
#include <cde_config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <sys/stat.h> /* for stat() */
#if defined(sun)

4
cde/programs/dthelp/parser/canon1/helptag/help.c
View File

@@ -85,7 +85,7 @@ if ((m_argc > 2) && (strchr(m_argv[2], 'f') || strchr(m_argv[2], 'F')))
/* fills ``install'' with path to ourself */
{
char *path, *cp;
char buf[200];
char buf[BUFSIZ];
char patbuf[BUFSIZ];
int quit, none;
@@ -135,7 +135,7 @@ else
quit++;
else
*cp = '\0';
sprintf(buf, "%s/%s", path, m_argv[0]);
snprintf(buf, sizeof(buf), "%s/%s", path, m_argv[0]);
if (access(buf, 1) == 0)
{

4
cde/programs/dthelp/parser/pass1/helptag/help.c
View File

@@ -86,7 +86,7 @@ if ((m_argc > 2) && (strchr(m_argv[2], 'f') || strchr(m_argv[2], 'F')))
/* fills ``install'' with path to ourself */
{
char *path, *cp;
char buf[200];
char buf[BUFSIZ];
char patbuf[BUFSIZ];
int quit, none;
@@ -136,7 +136,7 @@ else
quit++;
else
*cp = '\0';
sprintf(buf, "%s/%s", path, m_argv[0]);
snprintf(buf, sizeof(buf), "%s/%s", path, m_argv[0]);
if (access(buf, 1) == 0)
{

8
cde/programs/dthelp/parser/pass2/htag2/sdl.c
View File

@@ -1448,7 +1448,7 @@ static void MarkUsedStyle(M_WCHAR *level, M_WCHAR *class, M_WCHAR *ssi)
{
ElementPtr pThis;
M_WCHAR *rlevel = NULL, *rclass = NULL, *rssi = NULL;
LOGICAL *pBeenUsed;
LOGICAL *pBeenUsed = NULL;
pThis = pTossChain;
while (pThis)
@@ -1490,7 +1490,7 @@ while (pThis)
(!rssi || (w_strcmp(rssi, ssi) == 0)) &&
(w_strcmp(rclass, class) == 0))
{
if (*pBeenUsed == FALSE)
if (pBeenUsed && *pBeenUsed == FALSE)
{
nStyles++;
*pBeenUsed = TRUE;
@@ -2229,7 +2229,7 @@ while (pThis)
*/
static void MarkUsedTOSS(ElementPtr pRoot)
{
ElementPtr pParent, pSnb, pItem, pThis;
ElementPtr pParent, pSnb = NULL, pItem, pThis;
static char errMess[] =
"internal error - unrecognized element type in MarkUsedTOSS";
@@ -3254,7 +3254,7 @@ int zFileSize, length;
unsigned char zTemp[4];
int zFd;
char buffer[BUFSIZ];
FILE *saveOutFile;
FILE *saveOutFile = NULL;
char cCount[32];
static char errMess[] =
"internal error - unrecognized element type in EmitSDL";