From b5f34d1a78b61a8a615027eba9f169764457c1da Mon Sep 17 00:00:00 2001 From: Douglas Carmichael Date: Sun, 14 Jun 2015 11:10:36 -0500 Subject: [PATCH] Patches to enable compilation on OpenBSD 5.7/FreeBSD 10.1. --- cde/doc/util/dbtoman/instant/main.c | 2 +- cde/programs/dtlogin/genauth.c | 3 +++ cde/programs/dtlogin/session.c | 23 ----------------------- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/cde/doc/util/dbtoman/instant/main.c b/cde/doc/util/dbtoman/instant/main.c index 712c1ec..74a0add 100644 --- a/cde/doc/util/dbtoman/instant/main.c +++ b/cde/doc/util/dbtoman/instant/main.c @@ -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; diff --git a/cde/programs/dtlogin/genauth.c b/cde/programs/dtlogin/genauth.c index 357baf0..38e81ee 100644 --- a/cde/programs/dtlogin/genauth.c +++ b/cde/programs/dtlogin/genauth.c @@ -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) diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index 9a42844..5bdb48c 100644 --- a/cde/programs/dtlogin/session.c +++ b/cde/programs/dtlogin/session.c @@ -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", -- 2.3.0