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' of ssh://git.code.sf.net/p/cdesktopenv/code

Browse source
This commit is contained in:
Peter Howkins 2018-04-04 16:37:12 +01:00
commit d87f6ce29d
14 changed files with 58 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cde/config/cf/Imake.rules
View file

@ -134,6 +134,7 @@ XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
* NormalLintTarget (srclist)
* LintTarget ()
* LinkSourceFile (src,dir)
* CopySourceFile (src,dir)
* LinkFile (tofile,fromfile)
* MakeSubincludesForBuild (step,dir,srclist)
* LangNamedTargetSubdirs (lang,name,dirs,verb,flags,subname)
@ -2075,6 +2076,26 @@ clean:: @@\
#endif
/*
* CopySourceFile - snag source file from some other directory
*/
#ifndef CopySourceFile
#define CopySourceFile(src,dir) @@\
src: dir/src @@\
RemoveFile($@) @@\
$(CP) $? $@ @@\
@@\
NoConfigRec(src) @@\
@@\
includes:: src @@\
@@\
depend:: src @@\
@@\
clean:: @@\
RemoveFile(src)
#endif
/*
* LinkFile - link a file
*/

5
cde/databases/CDE-LOC.src
View file

@ -325,11 +325,6 @@ programs/localized/%_LANG_%/app-defaults/Dtbuilder
install_target = /usr/dt/app-defaults/%_LANG_%/Dtbuilder
}
XCOMM
programs/localized/%_LANG_%/app-defaults/Dtudcfonted
{ default
install_target = /usr/dt/app-defaults/%_LANG_%/Dtudcfonted
}
XCOMM
XCOMM >>-----------------------------
XCOMM appmanager
XCOMM <<-----------------------------

16
cde/databases/CDE-MAN.udb
View file

@ -651,22 +651,6 @@ doc/C/man/man1/dttypes.1
install_target = /usr/dt/share/man/man1/dttypes.1
}
#
doc/C/man/man1/dtudcexch.1
{ uxp
install_target = /usr/dt/share/catman/C/cde_man/cat1/dtudcexch.1
}
{ default
install_target = /usr/dt/share/man/man1/dtudcexch.1
}
#
doc/C/man/man1/dtudcfonted.1
{ uxp
install_target = /usr/dt/share/catman/C/cde_man/cat1/dtudcfonted.1
}
{ default
install_target = /usr/dt/share/man/man1/dtudcfonted.1
}
#
doc/C/man/man1/dtwm.1
{ uxp
install_target = /usr/dt/share/catman/C/cde_man/cat1/dtwm.1

10
cde/databases/CDE-MSG-LOC.src
View file

@ -328,16 +328,6 @@ programs/localized/%_LANG_%/msg/dtconfig.cat
install_target = /usr/dt/lib/nls/msg/%_LANG_%/dtconfig.cat
}
XCOMM
programs/localized/%_LANG_%/msg/dtudcexch.cat
{ default
install_target = /usr/dt/lib/nls/msg/%_LANG_%/dtudcexch.cat
}
XCOMM
programs/localized/%_LANG_%/msg/dtudcfonted.cat
{ default
install_target = /usr/dt/lib/nls/msg/%_LANG_%/dtudcfonted.cat
}
XCOMM
programs/localized/%_LANG_%/msg/dtpdm.cat
{ default
install_target = /usr/dt/lib/nls/msg/%_LANG_%/dtpdm.cat

70
cde/databases/CDE-RUN.udb
View file

@ -1305,76 +1305,6 @@ programs/dtcalc/dtcalc
mode = 0555
}
#
programs/dtudcfonted/dtudcfonted
{ default
install_target = /usr/dt/bin/dtudcfonted
mode = 0555
}
#
programs/localized/C/app-defaults/Dtudcfonted
{ default
install_target = /usr/dt/app-defaults/C/Dtudcfonted
}
#
programs/dtudcexch/dtudcexch
{ default
install_target = /usr/dt/bin/dtudcexch
mode = 0555
}
#
programs/dtudcfonted/dtaddcpf/dtaddcpf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtaddcpf
mode = 0555
}
#
programs/dtudcfonted/dtbdftocpf/dtbdftocpf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtbdftocpf
mode = 0555
}
#
programs/dtudcfonted/dtcpftobdf/dtcpftobdf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtcpftobdf
mode = 0555
}
#
programs/dtudcfonted/dtcpftogpf/dtcpftogpf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtcpftogpf
mode = 0555
}
#
programs/dtudcfonted/dtcpgpf/dtcpgpf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtcpgpf
mode = 0555
}
#
programs/dtudcfonted/dtgpftobdf/dtgpftobdf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtgpftobdf
mode = 0555
}
#
programs/dtudcfonted/dtgpftocpf/dtgpftocpf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtgpftocpf
mode = 0555
}
#
programs/dtudcfonted/dtlsgpf/dtlsgpf
{ default
install_target = /usr/dt/lib/dtudcfonted/dtlsgpf
mode = 0555
}
#
programs/dtudcfonted/libfal/fonts.list
{ default
install_target = /usr/dt/config/C/fonts.list
}
#
programs/dtterm/dtterm
{ default
install_target = /usr/dt/bin/dtterm

6
cde/lib/DtSearch/dtsrapi.c
View file

@ -543,7 +543,8 @@ int DtSearchQuery (
LLIST *llp;
enum { TEXT, NAVSTRING, FZKEYI }
qryarg;
char date1str[24];
# define _DATE1STR_LEN (24)
char date1str[_DATE1STR_LEN];
if (!valid_dbname (dbname))
return DtSrREINIT;
@ -621,7 +622,8 @@ QUERY_ERROR:
*ptr++ = ' ';
}
*(--ptr) = 0;
strcpy (date1str, objdate2fzkstr (usrblk.objdate1));
strncpy(date1str, objdate2fzkstr (usrblk.objdate1), _DATE1STR_LEN);
date1str[_DATE1STR_LEN - 1] = 0;
fprintf (aa_stderr,
PROGNAME "353 DtSearchQuery(): dbname='%s' srchtype='%c'\n"
" maxhits=%d keytypes='%s'\n"

7
cde/programs/Imakefile
View file

@ -17,6 +17,9 @@ DTINFODIR = dtinfo
DTINFODIR = dtinfo
#endif
XCOMM JET 4/2/2018 - disabling dtudcfonted and dtudcexch. They are
XCOMM very broken in terms of coverity and compiler warnings. Also,
XCOMM who uses them? And for what?
SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
@ -24,7 +27,7 @@ SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
dtscreen dtksh dtcm dtsearchpath \
dtappbuilder dtappintegrate dtprintegrate dtconfig \
dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
@ -32,7 +35,7 @@ LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
dtcalc dtaction dtcreate \
dtscreen dtksh dtcm dtsearchpath \
dtappbuilder dtappintegrate dtprintegrate dtprintinfo dtdspmsg \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
MakeSubdirs($(SUBDIRS))

4
cde/programs/dtcalc/ds_xlib.c
View file

@ -263,8 +263,10 @@ ds_save_resources(XrmDatabase rDB, char *filename)
{
if ((filename = getenv("DTCALCDEF")) == NULL)
{
if ( !(home = getenv("HOME")) )
return 1;
size_t fileLen = strlen(home) + 18;
home = getenv("HOME");
if ( (filename = calloc(1, fileLen)) != NULL )
{
needsFree = true;

2
cde/programs/dtcm/dtcm/dssw.c
View file

@ -945,7 +945,7 @@ load_dssw_times(DSSW *dssw, Tick start, Tick stop, Boolean set_no_time) {
dssw->stop_val.block = (buf[5] == 'a') ?
TIME_AM : TIME_PM;
} else {
strcpy(dssw->stop_val.val, buf);
snprintf(dssw->stop_val.val, START_STOP_LEN, "%s", buf);
dssw->stop_val.block = TIME_AM;
}
}

7
cde/programs/dtfile/SharedProcs.c
View file

@ -1631,6 +1631,7 @@ _DtPathFromInput(
FILE *pfp;
char command[MAXPATHLEN];
memset(command, 0, sizeof(command));
sprintf(command,"echo %s",path);
if((pfp=popen(command,"r")) != NULL)
@ -1656,7 +1657,11 @@ _DtPathFromInput(
if (read_ok)
{
command[MAXPATHLEN-1] = '\0';
int slen = strlen(command);
/* need to remove the trailing newline safely*/
if (slen >= 1)
command[slen-1] = '\0';
XtFree(path);
path = XtNewString(command);
pclose(pfp);

2
cde/programs/dtinfo/dtinfo/install/lib/fonts/Imakefile
View file

@ -7,7 +7,7 @@ MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir
OBJS = FontObj(dtinfo)
LinkSourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)
CopySourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)
MakeFonts()

4
cde/programs/dtsr/dtsrclean.c
View file

@ -610,14 +610,14 @@ void read_d2x (struct or_hwordrec * glob_word, long field)
static void write_d2x (struct or_hwordrec * glob_word, long field)
{
if (field == OR_SWORDKEY) {
strcpy (d21new.or_swordkey, glob_word->or_hwordkey);
snprintf(d21new.or_swordkey, 16, "%s", glob_word->or_hwordkey);
d21new.or_swoffset = htonl (glob_word->or_hwoffset);
d21new.or_swfree = htonl (glob_word->or_hwfree);
d21new.or_swaddrs = htonl (glob_word->or_hwaddrs);
RECWRITE (PROGNAME "102", &d21new, 0);
}
else if (field == OR_LWORDKEY) {
strcpy (d22new.or_lwordkey, glob_word->or_hwordkey);
snprintf(d22new.or_lwordkey, 40, "%s", glob_word->or_hwordkey);
d22new.or_lwoffset = htonl (glob_word->or_hwoffset);
d22new.or_lwfree = htonl (glob_word->or_hwfree);
d22new.or_lwaddrs = htonl (glob_word->or_hwaddrs);

12
cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c
View file

@ -1466,8 +1466,18 @@ int fix ;
bitmap = pcf->bitmaps + getINT32( (unsigned char *)(pcf->offsets + encodingOffset),
pcf->bmp_fmt);
invertBits( bitmap + bmp_adj, pcf->bmp_fmt, ptn_width, cpy_height, bmp_ptn + ptn_adj);
/* Only do this if non-NULL... */
if (bmp_ptn)
{
invertBits( bitmap + bmp_adj, pcf->bmp_fmt,
ptn_width, cpy_height, bmp_ptn + ptn_adj);
putPtn( (unsigned char *)bmp_ptn, ptn_width, ptn_height );
}
else
{
fprintf(stderr, "%s: bmp_ptn is NULL", __FUNCTION__);
}
fprintf(stdout,"ENDCHAR\n");
if( fix == FALSE ) free(bmp_ptn);
}

2
cde/programs/fontaliases/bdf/fonts.tmpl
View file

@ -6,7 +6,7 @@ XCOMM $XConsortium: fonts.tmpl /main/2 1996/09/13 17:55:52 drk $
OBJS = FontObj(dtinfo) $(LOCAL_OBJS)
LinkSourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)
CopySourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)
MakeFonts()