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

Patches to enable compilation on OpenBSD 5.7/FreeBSD 10.1.

Browse source
This commit is contained in:
Douglas Carmichael 2015-06-14 11:10:36 -05:00 • committed by Jon Trulson
parent 87d863b8a4
commit aaab59761f
3 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/doc/util/dbtoman/instant/main.c
View file

@ -585,7 +585,7 @@ ReadESIS(
stripNL(buf);
if (do_DATAhack && (buf[0] == '\\') && (buf[1] == 'n') ) {
buf[0] = -1; /* simulate "^" command */
memcpy(&buf[1], &buf[2], strlen(buf)-1);
memmove(&buf[1], &buf[2], strlen(buf)-1);
}
cont[ncont].ch.data = strdup(buf);
cont[ncont].type = CMD_DATA;

3
cde/programs/dtlogin/genauth.c
View file

@ -123,6 +123,9 @@ extern int errno;
# ifdef __FreeBSD__
# define USE_CRYPT
# endif
# ifdef __OpenBSD__
# define USE_CRYPT
# endif
# ifdef sun
# define USE_CRYPT
# if (OSMAJORVERSION >= 4)

23
cde/programs/dtlogin/session.c
View file

@ -644,8 +644,6 @@ int
LoadXloginResources( struct display *d )
{
char cmd[1024];
char *language = NULL;
char *lang_key="";
char *authority="";
char *auth_key="";
char *resources = NULL;
@ -675,27 +673,6 @@ LoadXloginResources( struct display *d )
auth_key = "XAUTHORITY=";
}
if (d->language && strlen(d->language) > 0 ) {
language = strdup(d->language);
lang_key = "-D";
}
/*
* replace any "-" or "." in the language name with "_". The C
* preprocessor used by xrdb does not accept "-" or "." in a name.
*/
while ( (p = strchr(language, '-')) != NULL ) {
*p = '_';
}
while ( (p = strchr(language, '.')) != NULL ) {
*p = '_';
}
free(language);
Debug("LoadXloginResources - loading resource db from %s\n", resources);
if((XresourceDB = XrmGetFileDatabase(resources)) == NULL)
Debug("LoadXloginResources - Loading resource db from %s failed\n",