from:"Pascal Stumpf"

[cdesktopenv-devel] OpenBSD port

2012-08-07 Thread Pascal Stumpf

Ohai.

Just informing you guys that I'm currently working on an OpenBSD port.
Already got most stuff building and a shitload of patches (though mostly
just #ifdef's).  I'll probably start making a branch in a few days,
though this will need to be merged with the other porting efforts
(FreeBSD ...).

Cheers,
Pascal

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] CDE dtksh updated to newer ksh93 release?

2012-08-08 Thread Pascal Stumpf

On Wed, 8 Aug 2012 13:57:34 +0200, Irek Szczesniak wrote:
> Has anyone considered updating CDE's dtksh (Destop Korn Shell, i.e.
> ksh93 with Dt, Motif and Xt APIs) to a newer ksh93 release? The
> current dtksh uses ksh93d- (the minus representing an alpha version)
> and is far from what I'd call "stable". Current ksh93 release is
> ksh93u+ (the plus representing a stable version) from yesterday.
> 
> Irek

Hmm, its license is incompatible with the GPL at least.  Don't know
about LGPL, but I wouldn't get my hopes up.

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] CDE dtksh updated to newer ksh93 release?

2012-08-08 Thread Pascal Stumpf

On Wed, 8 Aug 2012 19:12:07 +0200, Irek Szczesniak wrote:
> On Wed, Aug 8, 2012 at 2:14 PM, Pascal Stumpf  wrote:
> > On Wed, 8 Aug 2012 13:57:34 +0200, Irek Szczesniak wrote:
> >> Has anyone considered updating CDE's dtksh (Destop Korn Shell, i.e.
> >> ksh93 with Dt, Motif and Xt APIs) to a newer ksh93 release? The
> >> current dtksh uses ksh93d- (the minus representing an alpha version)
> >> and is far from what I'd call "stable". Current ksh93 release is
> >> ksh93u+ (the plus representing a stable version) from yesterday.
> >>
> >> Irek
> >
> > Hmm, its license is incompatible with the GPL at least.  Don't know
> > about LGPL, but I wouldn't get my hopes up.
> 
> The current license is Eclipse EPL1.0, but that may be changeable.

You have to ask the copyright holder about that (AT&T).

> Also, you already have ksh93 in the tree. It's just an update, for
> which more permissive legal rules apply. 

No.  It is code licensed under the EPL that may not be relicensed
without consent from the copyright holder.  Why should upgrades be any
different?  Can I update OpenBSD's copy of GCC to 4.7 and keep the
license as GPL2 because it is "just an upgrade"?  Of course not.

> Beyond that I'd suggest to
> leave the "license incompatibility" debate to lawyers - and not some
> hillbilly wannabe lawyers who declare anything not GPL as incompatible
> with GPL - 

... except that everybody has to obey copyright law.  Look, I hate this
license compatibility game too, but there is nothing I can do about it
but play along if this project doesn't want to get sued.  It would all be
so much easier if everything was PD/ISC/BSD ...

> if we follow that lead then you couldn't even link X11 with
> OpenMotif.

I might not be getting the sarcasm here, but neither X11 nor OpenMotif
have anything to do with the GPL.  But yes, GPL'd programs linked
against OpenMotif may not be distributed freely.

> Irek
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] OpenBSD port

2012-08-09 Thread Pascal Stumpf

On Wed, 8 Aug 2012 19:53:23 -0600 (MDT), Jon Trulson wrote:
> On Wed, 8 Aug 2012, Pascal Stumpf wrote:
> 
> > On Tue, 07 Aug 2012 21:51:14 +0200, Pascal Stumpf wrote:
> >> Ohai.
> >>
> >> Just informing you guys that I'm currently working on an OpenBSD port.
> >> Already got most stuff building and a shitload of patches (though mostly
> >> just #ifdef's).  I'll probably start making a branch in a few days,
> >> though this will need to be merged with the other porting efforts
> >> (FreeBSD ...).
> >>
> >> Cheers,
> >> Pascal
> >
> > So here's a patch with all the changes to make it compile on OpenBSD.
> > It does not work yet, but I'd like to get this in as soon as possible to
> > facilitate further work.
> >
> > These are mostly #ifdef's, adapting to new standards (scope of var decls
> > in for loops), at least one 64bit bug and a fix for istr_string if it is
> > fed a NULL pointer.  The database file patches contain some stuff that
> > is specific to my port (on github, openbsd-wip/x11/cde), but I think the
> > whole install framework should be revisited anyway to something that
> > respects $PREFIX (for fake installation) and doesn't hardcode shared
> > library versions.
> >
> >
> 
> Hi,
> 
> I am not sure what to do with this... It is far too large for me to be
> able to review, and either it all goes in, or nothing does.  While
> a lot of what I see seems ok, there are other things that aren't...
> 
> For example, The very first diff deletes a line
> InstallLinkKitSubdirs($(DOCSUBDIRS))

This is an old and obsolete macro fron XFree86 times, and a noop in the
current situation anyway.  It's no longer defined for modern imake and
must be removed if building/configuring with external imake is supposed
to be supported in the future.

> from the top level Imakefile without explanation.  Why is this being
> deleted?
> 
> Further down, I see:
> 
> > +   CXXLIB = CplusplusLibC
> 
> For Library.tmpl.  This should not be needed, it's already set
> properly in Imake.tmpl.

Looking into this again, yes, there's a better solution.  Problem was
that HasCplusplus didn't get defined to YES.  I think Imake.tmpl should
default that to YES (or get rid of it altogether: how are you even
supposed to compile CDE without a c++ compiler??).  Currently, most
$OS.cf files are simply setting HasGcc2ForCplusplus, which is obviously
a lie nowadays.

> Same for some of the other items.  I simply cannot commit this.
> 
> Lots of the other patches look good, but I simply do not have the time or
> patience to try to seperate, evaluate and commit each one :)
> 
> What I need are seperate patches, small and self contained (or even a
> collection of related patches for a given subsystem) that I can have
> some hope of reviewing, commenting on, commiting, or rejecting.

Ok, sorry.  I'll try to separate the patch into smaller bits today.

> Perhaps you and others working on the BSD ports could contribute to a
> shared repo (maybe yours, I don't know) and arrange this.

I'm not fond of that, since that means there will be even more
fragmentation and probably merge problems and duplicate work (on 64bit
issues for instance).

> We might even be willing to create a seperate 'BSD' branch where the
> BSD patches could go until they are ready for master.  We are willing
> to work with you on this, but I simply cannot deal with a 300K blob
> of patches :)
> 
> [...]
> 
> -- 
> Jon Trulson
> 
> "If the Martian rope-a-dope don't get him, he'll get himself, he'll
>   come in too fast and punch himself out."
>   - one of my brothers, referring to the Curiosity landing.
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] scoping of var declarations in for loops

2012-08-09 Thread Pascal Stumpf

So here are all the patches that deal with the fact that modern
compilers assume different scoping rules for variables declared in for
loops.  On Linux, -fpermissive has been added as a compiler flag to
compensate for this old C code, but I think it is the wrong approach.

Sorry, couldn't help sneaking in a || defined(CSRG_BASED) and some casts
needed for other reasons ...


diff --git a/cde/lib/DtSvc/DtCodelibs/buf.C b/cde/lib/DtSvc/DtCodelibs/buf.C
index 13abb89..e13e202 100644
--- a/cde/lib/DtSvc/DtCodelibs/buf.C
+++ b/cde/lib/DtSvc/DtCodelibs/buf.C
@@ -118,7 +118,8 @@ _SHXbuf::reset(boolean g, boolean comp)
 char **
 _SHXbuf::vector()
 {
-for (int i = 0; i < vec.size(); i++)
+int i;
+for (i = 0; i < vec.size(); i++)
vec[i] = &buf[long(vec[i])];
 
 vec[i] = NULL;
diff --git a/cde/lib/tt/bin/ttdbserverd/dm_server.C 
b/cde/lib/tt/bin/ttdbserverd/dm_server.C
index bd09927..0b4eb9c 100644
--- a/cde/lib/tt/bin/ttdbserverd/dm_server.C
+++ b/cde/lib/tt/bin/ttdbserverd/dm_server.C
@@ -1079,7 +1079,8 @@ _tt_isopen_1(_Tt_isopen_args *args, SVCXPRT * /* transp 
*/)
 
int l = db_path.len();
int tl = strlen("TT_DB");
-   for (int j = 0; j(10);
 _propui_array = new DtVirtArray(10);
@@ -240,7 +241,7 @@ DmxPrintOptions::DmxPrintOptions (
 nitems = DMX_ARRAY_SIZE(hdrftr_values);;
 strings = (char **) XtMalloc( nitems * sizeof(char*) );
 data = (void **) XtMalloc( nitems * sizeof(void*) );
-for (int i=0; iget_scrolling_list(), XmNhelpCallback, 
-   HelpCB, DTMAILMSGLISTID);
+   HelpCB, (void *)DTMAILMSGLISTID);
 
 XtVaSetValues(_list->get_scrolling_list(), XmNuserData, this, NULL);
 _rowOfButtons =
@@ -2863,7 +2863,7 @@ RoamMenuWindow::addToRowOfButtons()
TRUE, this );
 ci  = new ButtonInterface (_rowOfButtons, _delete_button);
 w = ci->baseWidget();
-XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILDELBTNID);
+XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILDELBTNID);
 XtVaSetValues(w,
XmNleftAttachment, XmATTACH_FORM,
XmNtopAttachment, XmATTACH_FORM,
@@ -2880,7 +2880,7 @@ RoamMenuWindow::addToRowOfButtons()
TRUE, this );
 ci  = new ButtonInterface (_rowOfButtons, _next_button);
 w = ci->baseWidget();
-XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILNEXTBTNID);
+XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILNEXTBTNID);
 XtVaSetValues(w,
XmNleftAttachment, XmATTACH_WIDGET,
XmNleftWidget, prev_widget,
@@ -2899,7 +2899,7 @@ RoamMenuWindow::addToRowOfButtons()
TRUE, this );
 ci  = new ButtonInterface (_rowOfButtons, _previous_button);
 w = ci->baseWidget();
-XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILPREVBTNID);
+XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILPREVBTNID);
 XtVaSetValues(w,
XmNleftAttachment, XmATTACH_WIDGET,
XmNleftWidget, prev_widget,
@@ -2920,7 +2920,7 @@ RoamMenuWindow::addToRowOfButtons()
FALSE );
 ci  = new ButtonInterface (_rowOfButtons, _replySender_button);
 w = ci->baseWidget();
-XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILREPLYBTNID);
+XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILREPLYBTNID);
 XtVaSetValues(w,
XmNleftAttachment, XmATTACH_WIDGET,
XmNleftWidget, prev_widget,
@@ -2938,7 +2938,7 @@ RoamMenuWindow::addToRowOfButtons()
TRUE, TRUE, this);
 ci  = new ButtonInterface (_rowOfButtons, _print_button);
 w = ci->baseWidget();
-XtAddCallback(w, XmNhelpCallback, HelpCB, DTMAILPRINTBTNID);
+XtAddCallback(w, XmNhelpCallback, HelpCB, (void *)DTMAILPRINTBTNID);
 XtVaSetValues(w,
XmNleftAttachment, XmATTACH_WIDGET,
XmNleftWidget, prev_widget,
@@ -3292,7 +3292,7 @@ RoamMenuWindow::createContainerList()
 void
 RoamMenuWindow::createOpenContainerList(CmdList * open_container)
 {
-intncontainers;
+intncontainers, i;
 char   *container_name;
 ContainerMenuCmd   *container_cmd;
 
@@ -3327,7 +3327,7 @@ RoamMenuWindow::createOpenContainerList(CmdList * 
open_container)
 _open_container_containerlist =
   new DtVirtArray(ncontainers);
 
-for (int i=0; icontainerName();
if (NULL != container_name)
@@ -3490,7 +3490,7 @@ RoamMenuWindow::construct_file_menu()
 void
 RoamMenuWindow::createCopyList(CmdList * copy_to)
 {
-intncontainers;
+intncontainers, i;
 char   *container_name;
 ContainerMenuCmd   *container_cmd;
 
@@ -3550,7 +3550,7 @@ RoamMenuWindow::createCopyList(CmdList * copy_to)
 _copyto_containerlist =
   new DtVirtArray (ncontainers);
 
-for (int i=0; icontainerName();
if (NULL != container_name)
@@ -3930,7 +3930,7 @@ RoamMenuWindow::construct_compose_menu()
 void
 Ro

[cdesktopenv-devel] istr_string() fix

2012-08-09 Thread Pascal Stumpf

At least on OpenBSD/amd64, this macro returns a bogus value if its
argument is NULL.  So check for this first like the other macros in this
file do, and don't cast an istring to int.


diff --git a/cde/programs/dtappbuilder/src/libAButil/istr.h 
b/cde/programs/dtappbuilder/src/libAButil/istr.h
index fead77a..3582814 100644
--- a/cde/programs/dtappbuilder/src/libAButil/istr.h
+++ b/cde/programs/dtappbuilder/src/libAButil/istr.h
@@ -272,7 +272,7 @@ extern ISTR_PRIVT_STRN  *istrP_int_array1809065681PrivD;
 #define istr_string_safe(s) ((s) == NULL? Istr_null_string:istr_string(s))
 
 #define istrP_get_string_fast3718930164PrivF(istring) \
-(istrP_int_array1809065681PrivD[((int)istring)].str)
+((istring)==NULL ? Istr_null_string : 
(istrP_int_array1809065681PrivD[((long)istring)].str))
 
 /* istr_string - if debugging is turned on, checks ISTRINGS for validity */
 #ifdef DEBUG

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] SIGCLD -> SIGCHLD

2012-08-09 Thread Pascal Stumpf

The official POSIX name for this signal is SIGCHLD.  Linux probably has
SIGCLD only for SysV compatibility, but BSD does not.


diff --git a/cde/programs/dtexec/Main.c b/cde/programs/dtexec/Main.c
index a062203..3c359f0 100644
--- a/cde/programs/dtexec/Main.c
+++ b/cde/programs/dtexec/Main.c
@@ -538,7 +538,7 @@ InitializeSignalHandling( void )
sigemptyset(&svec.sa_mask);
svec.sa_flags   = 0;
svec.sa_handler = SigCld;
-   (void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
+   (void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
 
/*
 * "Urgent Signal" handlers
@@ -667,7 +667,7 @@ ExecuteCommand (
   svec.sa_handler = SIG_DFL;
 
   /* Normal */
-  (void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
+  (void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
 
   /* Urgent */
   (void) sigaction(SIGTERM, &svec, (struct sigaction *) NULL);
diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 930cb69..0691e89 100644
--- a/cde/programs/dtpad/main.c
+++ b/cde/programs/dtpad/main.c
@@ -985,7 +985,7 @@ InitEditSessionAndFirstPad(
 sigfillset(&act.sa_mask);
 act.sa_flags = 0;
 act.sa_handler = SigcldHndlr;
-sigaction(SIGCLD, &act, (struct sigaction *)NULL);
+sigaction(SIGCHLD, &act, (struct sigaction *)NULL);
 }
 }
 
@@ -1591,7 +1591,7 @@ void SigcldHndlr (int dummy)
 /*
  * Is this really necessary?
  */
-sigaction(SIGCLD, &act, (struct sigaction *)NULL);
+sigaction(SIGCHLD, &act, (struct sigaction *)NULL);
 }
 
 
diff --git a/cde/programs/dtpdmd/dtpdmd.c b/cde/programs/dtpdmd/dtpdmd.c
index 5489893..6ea9795 100644
--- a/cde/programs/dtpdmd/dtpdmd.c
+++ b/cde/programs/dtpdmd/dtpdmd.c
@@ -383,7 +383,7 @@ main( argc, argv )
 sigemptyset(&svec.sa_mask);
 svec.sa_flags   = 0;
 svec.sa_handler = handle_SIGCLD;
-(void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
+(void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
 
 /*
  * After this point, we need to trap all X and XIO errors.
diff --git a/cde/programs/dtpdmd/records.c b/cde/programs/dtpdmd/records.c
index ddc80ea..380a5b0 100644
--- a/cde/programs/dtpdmd/records.c
+++ b/cde/programs/dtpdmd/records.c
@@ -55,7 +55,7 @@ static void block_SIGCLD( void )
 int  rtn;
 
 sigemptyset( &newset );
-sigaddset( &newset, SIGCLD );
+sigaddset( &newset, SIGCHLD );
 rtn = sigprocmask( SIG_BLOCK, &newset, (sigset_t *) NULL );
 }
 
@@ -65,7 +65,7 @@ static void unblock_SIGCLD( void )
 int  rtn;
 
 sigemptyset( &newset );
-sigaddset( &newset, SIGCLD );
+sigaddset( &newset, SIGCHLD );
 rtn = sigprocmask( SIG_UNBLOCK, &newset, (sigset_t *) NULL );
 }
 
diff --git a/cde/programs/dtsession/SmRestore.c 
b/cde/programs/dtsession/SmRestore.c
index aa314cf..7fb200c 100644
--- a/cde/programs/dtsession/SmRestore.c
+++ b/cde/programs/dtsession/SmRestore.c
@@ -473,11 +473,11 @@ SystemCmd (char *pchCmd)
 {
 void (*signalHandler) ();
 
-signalHandler = (void (*)())signal (SIGCLD, SIG_DFL);
+signalHandler = (void (*)())signal (SIGCHLD, SIG_DFL);
 
 system (pchCmd);
 
-signal (SIGCLD, signalHandler);
+signal (SIGCHLD, signalHandler);
 } /* END OF FUNTION SystemCmd */
 
 
@@ -896,7 +896,7 @@ RestoreResources( Boolean errorHandlerInstalled, ... )
setegid(smGD.runningGID);
 #endif
 #endif
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 setsid();
 #else
(void) setpgrp();
@@ -3607,7 +3607,7 @@ StartLocalClient (
 
_DtEnvControl(DT_ENV_RESTORE_PRE_DT);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 setsid();
 #else
(void)setpgrp();
@@ -3843,7 +3843,7 @@ ForkWM( void )
 #endif
_DtEnvControl(DT_ENV_RESTORE_PRE_DT);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 setsid();
 #else
 (void)setpgrp();
@@ -3928,7 +3928,7 @@ KillParent( void )
 /*
  * Disassociate from parent
  */
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 setsid();
 #else
 setpgrp();
diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c
index c8e9b5b..22a9d56 100644
--- a/cde/programs/dtwm/WmFunction.c
+++ b/cde/programs/dtwm/WmFunction.c
@@ -108,7 +108,7 @@ static unsigned int GetEventInverseMask(XEvent *event);
 
 #ifdef WSM
 
-#if (defined(USL) || defined(__uxp__) || defined(linux)) && !defined(_NFILE)
+#if (defined(USL) || defined(__uxp__) || defined(linux) || 
defined(CSRG_BASED)) && !defined(_NFILE)
 #define _NFILE FOPEN_MAX
 #endif
 #define CLOSE_FILES_ON_EXEC() \
diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c
index 0331c36..a0630a0 100644
--- a/cde/programs/dtwm/WmResParse.c
+++ b/cde/programs/dtwm/WmResParse.c
@@ -7504,11 +7504,11 @@ SystemCmd (char *pchCmd)
 sa.sa_flags = 0;
 sa.sa_handler = SIG_DFL;
 
-(void) sigaction (SIGCLD, &sa, &osa);
+(void)

Re: [cdesktopenv-devel] Fix more sprintf() calls

2012-08-09 Thread Pascal Stumpf

On Thu, 09 Aug 2012 07:40:43 +0200, Marc Balmer wrote:
> A few more sprintf() to snprintf() conversion.
> 
> We need to find a proper way to replace strcpy() and strcat(), maybe
> keep a local copy of strlcpy() and strlcat() from OpenBSD around
> somewhere?  Other suggestions?

+1

Or link with -lbsd, which is provided on most Linux distributions
nowadays.  The hard part is to do the replacement work.  If someone is
interested, I can send them a full build log on OpenBSD, where the
linker warns about the use of unsafe functions.

> >From 6aba055101e8b7c2f0155d76e872125dfd69ef8c Mon Sep 17 00:00:00 2001
> From: Marc Balmer 
> Date: Thu, 9 Aug 2012 07:38:39 +0200
> Subject: [PATCH 2/2] Fix more sprintf calls.
> 
> ---
>  cde/lib/csa/convert4-5.c |   31 ---
>  cde/lib/csa/iso8601.c|2 +-
>  cde/lib/csa/laccess.c|2 +-
>  cde/lib/csa/lutil.c  |5 +++--
>  cde/lib/csa/rpccalls.c   |2 +-
>  5 files changed, 22 insertions(+), 20 deletions(-)
> 
> diff --git a/cde/lib/csa/convert4-5.c b/cde/lib/csa/convert4-5.c
> index 27a08bf..dfca086 100644
> --- a/cde/lib/csa/convert4-5.c
> +++ b/cde/lib/csa/convert4-5.c
> @@ -144,12 +144,12 @@ _DtCm_appt4_to_attrs(
>   ptr2 = (ptr1 ? strchr(ptr1, '.') : NULL);
>  
>   if (ptr1) {
> - sprintf(buf, "%d:%s%s%s", a4->appt_id.key, calname,
> + snprintf(buf, sizeof buf, "%d:%s%s%s", a4->appt_id.key, 
> calname,
>   (ptr2 == NULL ? "." : ""),
>   (ptr2 == NULL ? _DtCmGetLocalDomain(ptr1+1) :
>   ""));
>   } else {
> - sprintf(buf, "%d:%s@%s", a4->appt_id.key, calname,
> + snprintf(buf, sizeof buf, "%d:%s@%s", a4->appt_id.key, 
> calname,
>   _DtCmGetHostAtDomain());
>   }
>   opq.size = strlen(buf);
> @@ -450,43 +450,44 @@ _RepeatInfoToRule(Appt_4 *a4, cms_attribute_value 
> **attrval)
>  
>   switch (a4->period.period) {
>   case daily_4:
> - sprintf(buf, "D1 #%d ", duration);
> + snprintf(buf, sizeof buf, "D1 #%d ", duration);
>   break;
>   case weekly_4:
> - sprintf(buf, "W1 #%d ", duration);
> + snprintf(buf, sizeof buf, "W1 #%d ", duration);
>   break;
>   case biweekly_4:
> - sprintf(buf, "W2 #%d ", duration);
> + snprintf(buf, sizeof buf, "W2 #%d ", duration);
>   break;
>   case monthly_4:
> - sprintf(buf, "MD1 #%d ", duration);
> + snprintf(buf, sizeof buf, "MD1 #%d ", duration);
>   break;
>   case yearly_4:
> - sprintf(buf, "YM1 #%d ", duration);
> + snprintf(buf, sizeof buf, "YM1 #%d ", duration);
>   break;
>   case nthWeekday_4:
> - sprintf(buf, "MP1 #%d ", duration);
> + snprintf(buf, sizeof buf, "MP1 #%d ", duration);
>   break;
>   case everyNthDay_4:
> - sprintf(buf, "D%d #%d ", a4->period.nth, duration);
> + snprintf(buf, sizeof buf, "D%d #%d ", a4->period.nth, duration);
>   break;
>   case everyNthWeek_4:
> - sprintf(buf, "W%d #%d ", a4->period.nth, duration);
> + snprintf(buf, sizeof buf, "W%d #%d ", a4->period.nth, duration);
>   break;
>   case everyNthMonth_4:
> - sprintf(buf, "MD%d #%d ", a4->period.nth, duration);
> + snprintf(buf, sizeof buf, "MD%d #%d ", a4->period.nth, 
> duration);
>   break;
>   case monThruFri_4:
> - sprintf(buf, "W1 MO TU WE TH FR #%d ", duration);
> + snprintf(buf, sizeof buf, "W1 MO TU WE TH FR #%d ", duration);
>   break;
>   case monWedFri_4:
> - sprintf(buf, "W1 MO WE FR #%d ", duration);
> + snprintf(buf, sizeof buf, "W1 MO WE FR #%d ", duration);
>   break;
>   case tueThur_4:
> - sprintf(buf, "W1 TU TH #%d ", duration);
> + snprintf(buf, sizeof buf, "W1 TU TH #%d ", duration);
>   break;
>   case daysOfWeek_4:
> - sprintf(buf, "W1 #%d ", duration);
> + snprintf(buf, sizeof buf, "W1 #%d ", duration);
> + /* XXX strcat is unsafe here */
>   if (a4->period.nth & 0x1) strcat(buf, "SU ");
>   if (a4->period.nth & 0x2) strcat(buf, "MO ");
>   if (a4->period.nth & 0x4) strcat(buf, "TU ");
> diff --git a/cde/lib/csa/iso8601.c b/cde/lib/csa/iso8601.c
> index 5893f33..ef7a55c 100644
> --- a/cde/lib/csa/iso8601.c
> +++ b/cde/lib/csa/iso8601.c
> @@ -44,7 +44,7 @@ set_timezone(char *tzname)
>  if (tzname==NULL)
>   system("unset TZ\n");
>  else {
> -sprintf(tzenv, "TZ=%s", tzname);
> +snprintf(tzenv, sizeof tzenv, "TZ=%s", tzname)

[cdesktopenv-devel] BSD & Linux: use socklen_t where appropriate

2012-08-09 Thread Pascal Stumpf

This should use socklen_t where available, really ...



diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C 
b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
index dd6355b..67b1ce0 100644
--- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
@@ -217,7 +217,7 @@ main(int argc, char** argv, char **envp)
 #if defined(DEC) || defined(sun) || defined(HPUX)
int asize = sizeof(struct sockaddr);
 #else
-# if defined(linux)
+# if defined(linux) || defined(CSRG_BASED)
socklen_t asize;
 # else
size_t asize = sizeof(struct sockaddr);
@@ -484,7 +484,7 @@ main(int argc, char** argv, char **envp)
if (!_tt_debug_mode) {
if (0!=fork()) exit(0);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
setsid();
 #else
setpgrp();
diff --git a/cde/lib/tt/lib/mp/mp_stream_socket.C 
b/cde/lib/tt/lib/mp/mp_stream_socket.C
index f604f68..fb2ba5a 100644
--- a/cde/lib/tt/lib/mp/mp_stream_socket.C
+++ b/cde/lib/tt/lib/mp/mp_stream_socket.C
@@ -173,7 +173,11 @@ init(int init_as_source)
return 0;
}
 #else
+#if defined(linux) || defined(CSRG_BASED)
+   socklen_t   len;
+#else
int len;
+#endif
int optval;
_sock = socket(AF_INET, SOCK_STREAM, 0);
if (_sock < 0) {
@@ -439,7 +443,11 @@ accept()
 {
if (_msgsock == -1) {
 #ifndef OPT_TLI
+#if defined(linux) || defined(CSRG_BASED)
+   socklen_t   addrlen = sizeof(sockaddr_in);
+#else
int addrlen = sizeof(sockaddr_in);
+#endif
sockaddr_in saddr;
 
 #if defined(_AIX) && (OSMAJORVERSION==4) && (OSMINORVERSION==2)
diff --git a/cde/lib/tt/slib/mp_rpc_server.C b/cde/lib/tt/slib/mp_rpc_server.C
index 0b038cb..1ed9546 100644
--- a/cde/lib/tt/slib/mp_rpc_server.C
+++ b/cde/lib/tt/slib/mp_rpc_server.C
@@ -355,7 +355,11 @@ gettransient(int proto, int vers, int *sockp)
 #ifndef OPT_TLI
int found;
int s;
+#if defined(linux) || defined(CSRG_BASED)
+   socklen_t   len;
+#else
int len;
+#endif
int socktype;
sockaddr_in addr;
sockaddr_in tport;

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] Fix more sprintf() calls

2012-08-09 Thread Pascal Stumpf

On Thu, 09 Aug 2012 10:56:10 +0200, Pascal Stumpf wrote:
> On Thu, 09 Aug 2012 07:40:43 +0200, Marc Balmer wrote:
> > A few more sprintf() to snprintf() conversion.
> > 
> > We need to find a proper way to replace strcpy() and strcat(), maybe
> > keep a local copy of strlcpy() and strlcat() from OpenBSD around
> > somewhere?  Other suggestions?
> 
> +1
> 
> Or link with -lbsd, which is provided on most Linux distributions
> nowadays.  The hard part is to do the replacement work.  If someone is
> interested, I can send them a full build log on OpenBSD, where the
> linker warns about the use of unsafe functions.

Also, I've seen some instances where strncpy() is obviously misused
(assuming it NUL-terminates the string, which it does not).

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] config/cf and programs/dtinfo/config bits for OpenBSD

2012-08-09 Thread Pascal Stumpf

On Thu, 9 Aug 2012 12:17:43 -0600 (MDT), Jon Trulson wrote:
> On Thu, 9 Aug 2012, Pascal Stumpf wrote:
> 
> > This adds the basic config bits needed for OpenBSD.  Most is just copied
> > from the existing imake installation in /usr/X11R6.  Additionally:
> > * Allow overriding CDESharedRev, X11ProjectRoot and ProjectRoot
> > * Add a new define to be able to override MINCLUDESRC too
> > (this allows me to build CDE without symlinking any include directories)
> >
> 
> Applied, thanks.  Also (sorry to be a pain), could you send any future
> patches in 'git format patch' format?  Makes it alot easier.

Sure, will do.^^

> > Also, is it possible to get rid of the programs/dtinfo/config dir some
> > time in the future?  Having two versions of this around is kind of a
> > pain.
> >
> 
> Yes.  I've created a ticket on this.  Feel free to not bother patching
> any of the config stuff in dtinfo in the future.
> 
> [...]
> 
> -- 
> Jon Trulson
> 
> "If the Martian rope-a-dope don't get him, he'll get himself, he'll
>   come in too fast and punch himself out."
>   - one of my brothers, referring to the Curiosity landing.
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] (no subject)

2012-08-09 Thread Pascal . Stumpf

>From 291e6880ab7f2f21f532ec4ba6a5f0510b60cb26 Mon Sep 17 00: 00:00 2001
From: Pascal Stumpf 
Subject: [PATCH] Rename getline() to not conflict with the standard POSIX
 interface of the same name.
To: cdesktopenv-devel@lists.sourceforge.net
Date: Thu, 09 Aug 2012 21:35:12 +0200

---
 cde/config/makedepend/def.h   |2 +-
 cde/config/makedepend/main.c  |2 +-
 cde/config/makedepend/parse.c |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h
index 85ef815..1678222 100644
--- a/cde/config/makedepend/def.h
+++ b/cde/config/makedepend/def.h
@@ -150,7 +150,7 @@ char*realloc();
 
 char   *copy();
 char   *base_name();
-char   *getline();
+char   *our_getline();
 struct symtab  **slookup();
 struct symtab  **isdefined();
 struct symtab  **fdefined();
diff --git a/cde/config/makedepend/main.c b/cde/config/makedepend/main.c
index 631eded..ae67ecb 100644
--- a/cde/config/makedepend/main.c
+++ b/cde/config/makedepend/main.c
@@ -499,7 +499,7 @@ match(str, list)
  * Get the next line.  We only return lines beginning with '#' since that
  * is all this program is ever interested in.
  */
-char *getline(filep)
+char *our_getline(filep)
register struct filepointer *filep;
 {
register char   *p, /* walking pointer */
diff --git a/cde/config/makedepend/parse.c b/cde/config/makedepend/parse.c
index bad3fcf..07153be 100644
--- a/cde/config/makedepend/parse.c
+++ b/cde/config/makedepend/parse.c
@@ -56,7 +56,7 @@ gobble(filep, file, file_red)
register char   *line;
register inttype;
 
-   while (line = getline(filep)) {
+   while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, FALSE)) {
case IF:
case IFFALSE:
@@ -544,7 +544,7 @@ find_includes(filep, file, file_red, recursion, failOK)
register inttype;
boolean recfailOK;
 
-   while (line = getline(filep)) {
+   while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, TRUE)) {
case IF:
doif:
-- 
1.7.6


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] [PATCH] Rename getline() to not conflict with the standard POSIX interface of the same name.

2012-08-09 Thread Pascal Stumpf


---
 cde/config/makedepend/def.h   |2 +-
 cde/config/makedepend/main.c  |2 +-
 cde/config/makedepend/parse.c |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h
index 85ef815..1678222 100644
--- a/cde/config/makedepend/def.h
+++ b/cde/config/makedepend/def.h
@@ -150,7 +150,7 @@ char*realloc();
 
 char   *copy();
 char   *base_name();
-char   *getline();
+char   *our_getline();
 struct symtab  **slookup();
 struct symtab  **isdefined();
 struct symtab  **fdefined();
diff --git a/cde/config/makedepend/main.c b/cde/config/makedepend/main.c
index 631eded..ae67ecb 100644
--- a/cde/config/makedepend/main.c
+++ b/cde/config/makedepend/main.c
@@ -499,7 +499,7 @@ match(str, list)
  * Get the next line.  We only return lines beginning with '#' since that
  * is all this program is ever interested in.
  */
-char *getline(filep)
+char *our_getline(filep)
register struct filepointer *filep;
 {
register char   *p, /* walking pointer */
diff --git a/cde/config/makedepend/parse.c b/cde/config/makedepend/parse.c
index bad3fcf..07153be 100644
--- a/cde/config/makedepend/parse.c
+++ b/cde/config/makedepend/parse.c
@@ -56,7 +56,7 @@ gobble(filep, file, file_red)
register char   *line;
register inttype;
 
-   while (line = getline(filep)) {
+   while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, FALSE)) {
case IF:
case IFFALSE:
@@ -544,7 +544,7 @@ find_includes(filep, file, file_red, recursion, failOK)
register inttype;
boolean recfailOK;
 
-   while (line = getline(filep)) {
+   while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, TRUE)) {
case IF:
doif:
-- 
1.7.6


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] [PATCH] recognise OpenBSD version

2012-08-09 Thread Pascal Stumpf


---
 cde/config/imake/imakemdep.h |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h
index 2ec32e2..2c97383 100644
--- a/cde/config/imake/imakemdep.h
+++ b/cde/config/imake/imakemdep.h
@@ -637,6 +637,10 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
 # define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
 # define DEFAULT_OS_NAME"srm %[^\n]"
+#elif defined(__OpenBSD__)
+# define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
+# define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
+# define DEFAULT_OS_NAME"srm %[^\n]"
 #endif
 
 #else /* else MAKEDEPEND */
-- 
1.7.6


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] [PATCH] Provide support for installation under OpenBSD. Don't override PATH in the install script, it may hide needed tools, and the location of these binaries is highly OS-depende

2012-08-09 Thread Pascal Stumpf

Also, allow overriding some variables in the install script.


---
 cde/admin/IntegTools/dbTools/installCDE.src |   19 +--
 cde/admin/IntegTools/post_install/Imakefile |3 +
 cde/databases/CDE-FONTS.udb |   24 +
 cde/databases/CDE-SHLIBS.src|   72 +++
 cde/databases/Imakefile |3 +
 5 files changed, 115 insertions(+), 6 deletions(-)

diff --git a/cde/admin/IntegTools/dbTools/installCDE.src 
b/cde/admin/IntegTools/dbTools/installCDE.src
index 6e13dd0..9c90278 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -207,6 +207,9 @@ CleanDaemons()
   then
 stopsrc -s inetd >>$LOGFILE 2>&1
   fi
+elif [ "$PLATFORM" = openbsd ]
+then
+  true
 else
   ps -ef | grep $i | grep -v grep >/tmp/tmppsout
   if [ -s /tmp/tmppsout ]
@@ -234,6 +237,9 @@ RestartInetd()
   elif [ "$PLATFORM" = "dec" ]
   then
 /usr/sbin/inetd
+  elif [ "$PLATFORM" = "openbsd" ]
+  then
+true
   else
 #ifdef hpV4
 /usr/sbin/inetd 
@@ -537,6 +543,10 @@ XCOMM
   then
 PLATFORM="linux"
 PLATFORM_SCRIPT_DIR=""
+  elif [ $BUILDSYSTEM = "OpenBSD" ];
+  then
+PLATFORM="openbsd"
+PLATFORM_SCRIPT_DIR=""
   else # Build system = HP
 PLATFORM=hp-ux
 PLATFORM_SCRIPT_DIR=hp
@@ -566,9 +576,6 @@ XCOMM
 
   unset TMPDIR
 
-  PATH=/bin:/usr/bin:/etc:/usr/bin/X11:
-  export PATH
-
   CLEANING="no"
   CLEANING_ETC="no"
   TARBALL="no"
@@ -872,9 +879,9 @@ XCOMM
 fi
   fi
 
-  INSTALL_LOCATION=CDE_INSTALLATION_TOP
-  CONFIGURE_LOCATION=CDE_CONFIGURATION_TOP
-  LOGFILES_LOCATION=CDE_LOGFILES_TOP
+  [ -z "$INSTALL_LOCATION" ] && INSTALL_LOCATION=CDE_INSTALLATION_TOP
+  [ -z "$CONFIGURE_LOCATION" ] && CONFIGURE_LOCATION=CDE_CONFIGURATION_TOP
+  [ -z "$LOGFILES_LOCATION" ] && LOGFILES_LOCATION=CDE_LOGFILES_TOP
 
   if [ -L $INSTALL_LOCATION -a "$CONFIGURE_ONLY" != "yes" ]
   then
diff --git a/cde/admin/IntegTools/post_install/Imakefile 
b/cde/admin/IntegTools/post_install/Imakefile
index 04669e0..f8e3d8d 100644
--- a/cde/admin/IntegTools/post_install/Imakefile
+++ b/cde/admin/IntegTools/post_install/Imakefile
@@ -19,6 +19,9 @@ PLATFORM = hp-ux
 PLATFORM = linux
 SUBDIRS = linux
 #endif
+#ifdef OpenBSDArchitecture
+PLATFORM = openbsd
+#endif
 #ifdef RsArchitecture
 PLATFORM = aix
 SUBDIRS = ibm
diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb
index c61f1da..1cd029b 100644
--- a/cde/databases/CDE-FONTS.udb
+++ b/cde/databases/CDE-FONTS.udb
@@ -1067,3 +1067,27 @@ programs/fontaliases/postscript/ja/prolog.ps
 #{ dec
 #  install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps
 #}
+
+
+#
+# for OpenBSD
+#
+programs/fontaliases/linux/C/fonts.alias
+{ openbsd
+   install_target = /usr/local/dt/config/xfonts/C/fonts.alias
+}
+#
+programs/fontaliases/linux/C/fonts.dir
+{ openbsd
+   install_target = /usr/local/dt/config/xfonts/C/fonts.dir
+}
+#
+programs/fontaliases/linux/ja_JP/fonts.alias
+{ openbsd
+   install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.alias
+}
+#
+programs/fontaliases/linux/ja_JP/fonts.dir
+{ openbsd
+   install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.dir
+}
diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src
index e3e07ed..a9db7f8 100644
--- a/cde/databases/CDE-SHLIBS.src
+++ b/cde/databases/CDE-SHLIBS.src
@@ -1223,3 +1223,75 @@ XCOMM
 install_target = /usr/shlib/libDtMmdb.so
type = sym_link
 }
+
+
+XCOMM 
+XCOMM 
+XCOMM >>-
+XCOMM  openbsd libraries
+XCOMM <<-
+XCOMM 
+
+XCOMM 
+lib/DtHelp/libDtHelp.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtHelp.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/DtPrint/libDtPrint.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtPrint.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/DtMrm/libDtMrm.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtMrm.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/DtSvc/libDtSvc.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtSvc.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/DtWidget/libDtWidget.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtWidget.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/DtTerm/libDtTerm.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtTerm.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/tt/lib/libtt.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libtt.so.0.0
+   mode = 0755
+}
+XCOMM
+lib/csa/libcsa.so.0.0
+{ openbsd
+   install_target = /usr/local/dt/lib/libcsa.so.0.0
+   mode = 0755
+}
+XCOMM 
+lib/DtSearch/libDtSearch.so.0.0
+{ openbsd
+install_target = /usr/local/dt/lib/libDtSearch.so.0.0
+   mode = 0755
+}
+#if 0 /* JET - not for openbsd (yet) */ 
+XCOMM
+lib/DtMmdb/libDtMmdb.so.0.0
+{ openbsd
+install_target = /u

[cdesktopenv-devel] [PATCH] SIGPWR is not present everywhere.

2012-08-09 Thread Pascal Stumpf


---
 cde/lib/DtSearch/dtsrapi.c|4 +++-
 cde/lib/DtSearch/userint.c|2 ++
 cde/programs/dtsr/dtsrclean.c |2 ++
 cde/programs/dtsr/tomita.c|2 ++
 4 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/cde/lib/DtSearch/dtsrapi.c b/cde/lib/DtSearch/dtsrapi.c
index 27eded9..4fe506b 100644
--- a/cde/lib/DtSearch/dtsrapi.c
+++ b/cde/lib/DtSearch/dtsrapi.c
@@ -313,7 +313,7 @@ int DtSearchInit (
aa_argv0 = argv0;
 if (err_file)
aa_stderr = err_file;
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 else
aa_stderr = stderr;
 #endif
@@ -337,7 +337,9 @@ int DtSearchInit (
signal (SIGQUIT, signal_abort); /* quit, ctrl-d */
signal (SIGKILL, signal_abort); /* (kill -9, cannot be trapped) */
signal (SIGTERM, signal_abort); /* kill [-15], sfwr terminate */
+#ifdef SIGPWR
signal (SIGPWR, signal_abort);  /* power failure imminent */
+#endif
 #ifdef _AIX
signal (SIGXCPU, signal_abort); /* cpu time limit exceeded */
signal (SIGDANGER, signal_abort);  /* imminent paging space crash */
diff --git a/cde/lib/DtSearch/userint.c b/cde/lib/DtSearch/userint.c
index 2036ef7..1bd4b3b 100644
--- a/cde/lib/DtSearch/userint.c
+++ b/cde/lib/DtSearch/userint.c
@@ -105,7 +105,9 @@ voidinit_user_interrupt (void)
 signal (SIGKILL, flag_shutdown);   /* kill -9, cannot be trapped */
 signal (SIGALRM, flag_shutdown);   /* called alarm() polling timer */
 signal (SIGTERM, flag_shutdown);   /* kill [-15], sfwr terminate */
+#ifdef SIGPWR
 signal (SIGPWR, flag_shutdown);/* power failure imminent */
+#endif
 signal (SIGUSR1, flag_shutdown);   /* kill -30, "pings" OE */
 #ifdef _AIX
 signal (SIGXCPU, flag_shutdown);   /* cpu time limit exceeded */
diff --git a/cde/programs/dtsr/dtsrclean.c b/cde/programs/dtsr/dtsrclean.c
index e7ff7da..fdd5d9d 100644
--- a/cde/programs/dtsr/dtsrclean.c
+++ b/cde/programs/dtsr/dtsrclean.c
@@ -1016,7 +1016,9 @@ int main (int argc, char *argv[])
 signal (SIGKILL, signal_shutdown); /* this cannot be trapped */
 signal (SIGALRM, signal_shutdown);
 signal (SIGTERM, signal_shutdown);
+#ifdef SIGPWR
 signal (SIGPWR, signal_shutdown);
+#endif
 #ifdef _AIX
 signal (SIGXCPU, signal_shutdown);
 signal (SIGDANGER, signal_shutdown);
diff --git a/cde/programs/dtsr/tomita.c b/cde/programs/dtsr/tomita.c
index d2db302..9e17c50 100644
--- a/cde/programs/dtsr/tomita.c
+++ b/cde/programs/dtsr/tomita.c
@@ -701,7 +701,9 @@ static void deleter (char *infname)
 signal (SIGQUIT, kill_delete);
 signal (SIGTRAP, kill_delete);
 signal (SIGTERM, kill_delete);
+#ifdef SIGPWR
 signal (SIGPWR, kill_delete);
+#endif
 #ifdef _AIX
 signal (SIGXCPU, kill_delete); /* cpu time limit exceeded */
 signal (SIGDANGER, kill_delete);   /* imminent paging space
-- 
1.7.6


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] [PATCH] Imakefile diffs for OpenBSD.

2012-08-09 Thread Pascal Stumpf

Details: Kill an obsolete macro in the top-level Imakefile, add OpenBSD
support to a lot of other Imakefiles, don't define -DSVR4
unconditionally (this may need further patches in the headers for Linux,
but defining it unconditionally is definitely wrong), allow to specify
the location of the tcl library by defining TclLibrary; and don't build
dttype on OpenBSD (needs to be modified to not use advance/compile).
>From b35cab339f7be714ecb9ef2640c29886c4ff9af5 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 9 Aug 2012 22:06:51 +0200
Subject: [PATCH] Imakefile diffs for OpenBSD.

---
 cde/Imakefile|1 -
 cde/doc/C/Imakefile  |2 +-
 cde/doc/ja_JP.dt-eucJP/Imakefile |2 +-
 cde/lib/DtHelp/Imakefile |3 +++
 cde/lib/DtTerm/TermPrim/Imakefile|4 
 cde/lib/DtWidget/Imakefile   |2 ++
 cde/lib/csa/Imakefile|2 +-
 cde/programs/Imakefile   |   11 +++
 cde/programs/dtcm/dtcm/Imakefile |8 ++--
 cde/programs/dtcm/libDtCmP/Imakefile |2 +-
 cde/programs/dtcm/server/Imakefile   |2 +-
 cde/programs/dtdocbook/tcl/Imakefile |   10 ++
 cde/programs/dtfile/Imakefile|4 
 cde/programs/dtlogin/Imakefile   |4 
 cde/programs/dtspcd/Imakefile|2 +-
 cde/programs/nsgmls/Imakefile|2 +-
 16 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/cde/Imakefile b/cde/Imakefile
index 59f16e4..3cc2549 100644
--- a/cde/Imakefile
+++ b/cde/Imakefile
@@ -139,7 +139,6 @@ Everything.doc::
 
 
NamedTargetSubdirs(install.doc,$(DOCSUBDIRS),"installing",DESTDIR=$(DESTDIR),install)
 NamedTargetSubdirs(install.man.doc,$(DOCSUBDIRS),"installing man 
pages",DESTDIR=$(DESTDIR),install.man)
-InstallLinkKitSubdirs($(DOCSUBDIRS))
 NamedCleanSubdirs(clean.doc,$(DOCSUBDIRS))
 NamedTagSubdirs(tags.doc,$(DOCSUBDIRS))
 MakeMakeSubdirs($(DOCSUBDIRS),Makefiles.doc)
diff --git a/cde/doc/C/Imakefile b/cde/doc/C/Imakefile
index ff8e50c..70e475c 100644
--- a/cde/doc/C/Imakefile
+++ b/cde/doc/C/Imakefile
@@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
 #define PassCDebugFlags
 
 /* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = man help
 BSUBDIRS = help man 
diff --git a/cde/doc/ja_JP.dt-eucJP/Imakefile b/cde/doc/ja_JP.dt-eucJP/Imakefile
index 742811e..c775b2c 100644
--- a/cde/doc/ja_JP.dt-eucJP/Imakefile
+++ b/cde/doc/ja_JP.dt-eucJP/Imakefile
@@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/5 1997/03/05 11:10:37 damon $
 #define PassCDebugFlags
 
 /* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help
 BSUBDIRS = help 
diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index 89fe15c..eb219b5 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -28,6 +28,9 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I./il -I./jpeg
+#if defined(OpenBSDArchitecture)
+INCLUDES += -I$(INCROOT)
+#endif
 DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \
  -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
  -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
diff --git a/cde/lib/DtTerm/TermPrim/Imakefile 
b/cde/lib/DtTerm/TermPrim/Imakefile
index 4fceb3c..286bcd8 100644
--- a/cde/lib/DtTerm/TermPrim/Imakefile
+++ b/cde/lib/DtTerm/TermPrim/Imakefile
@@ -109,6 +109,10 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 #endif
 
+#ifdef OpenBSDArchitecture
+LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
+#endif
+
 SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/cde/lib/DtWidget/Imakefile b/cde/lib/DtWidget/Imakefile
index 67e2a41..9c1a80f 100644
--- a/cde/lib/DtWidget/Imakefile
+++ b/cde/lib/DtWidget/Imakefile
@@ -15,6 +15,8 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk 
$
 DEFINES = DtWidgetDefines
 #if defined(LinuxArchitecture)
 INCLUDES = -I. -I/usr/include/freetype2
+#elif defined(OpenBSDArchitecture)
+INCLUDES = -I. -I$(XPROJECTROOT)/include/freetype2
 #else
 INCLUDES = -I.
 #endif
diff --git a/cde/lib/csa/Imakefile b/cde/lib/csa/Imakefile
index fe1b785..fdc 100644
--- a/cde/lib/csa/Imakefile
+++ b/cde/lib/csa/Imakefile
@@ -15,7 +15,7 @@ INCLUDES = -I.
 OSMAJORVERSION = OSMajorVersion
 OSMINORVERSION = OSMinorVersion
 
-DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N -DSVR4 \
+DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
-DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERS

Re: [cdesktopenv-devel] FAILED: [PATCH] Rename getline() to not conflict with the standard POSIX interface of the same name.

2012-08-09 Thread Pascal Stumpf

On Thu, 9 Aug 2012 14:06:35 -0600 (MDT), Jon Trulson wrote:
> On Thu, 9 Aug 2012, Pascal Stumpf wrote:
> 
> This one failed to apply, probably corrupted. If it's easier, you can
> simply attach the patches as MIME attachments.
> 
> Or look into setting up 'git send-email' :)  This will solve the
> various formatting issues I see with some of your patches.
> 
> So, needless to say: not applied.

Sorry, retrying as attachment.

> 
> -- 
> Jon Trulson
> 
> "If the Martian rope-a-dope don't get him, he'll get himself, he'll
>   come in too fast and punch himself out."
>   - one of my brothers, referring to the Curiosity landing.
> 
> 
>From 291e6880ab7f2f21f532ec4ba6a5f0510b60cb26 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 9 Aug 2012 21:19:48 +0200
Subject: [PATCH] Rename getline() to not conflict with the standard POSIX
 interface of the same name.
To: cde

---
 cde/config/makedepend/def.h   |2 +-
 cde/config/makedepend/main.c  |2 +-
 cde/config/makedepend/parse.c |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h
index 85ef815..1678222 100644
--- a/cde/config/makedepend/def.h
+++ b/cde/config/makedepend/def.h
@@ -150,7 +150,7 @@ char*realloc();
 
 char   *copy();
 char   *base_name();
-char   *getline();
+char   *our_getline();
 struct symtab  **slookup();
 struct symtab  **isdefined();
 struct symtab  **fdefined();
diff --git a/cde/config/makedepend/main.c b/cde/config/makedepend/main.c
index 631eded..ae67ecb 100644
--- a/cde/config/makedepend/main.c
+++ b/cde/config/makedepend/main.c
@@ -499,7 +499,7 @@ match(str, list)
  * Get the next line.  We only return lines beginning with '#' since that
  * is all this program is ever interested in.
  */
-char *getline(filep)
+char *our_getline(filep)
register struct filepointer *filep;
 {
register char   *p, /* walking pointer */
diff --git a/cde/config/makedepend/parse.c b/cde/config/makedepend/parse.c
index bad3fcf..07153be 100644
--- a/cde/config/makedepend/parse.c
+++ b/cde/config/makedepend/parse.c
@@ -56,7 +56,7 @@ gobble(filep, file, file_red)
register char   *line;
register inttype;
 
-   while (line = getline(filep)) {
+   while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, FALSE)) {
case IF:
case IFFALSE:
@@ -544,7 +544,7 @@ find_includes(filep, file, file_red, recursion, failOK)
register inttype;
boolean recfailOK;
 
-   while (line = getline(filep)) {
+   while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, TRUE)) {
case IF:
doif:
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] OpenBSD fixes for lib/DtSvc

2012-08-09 Thread Pascal Stumpf

I'll sort the remaining fixes per subdirectory.  This fixes another for
loop, adds appropriate #ifdefs, provides a prototype for _DtsDbListDB()
and defines MAXINT to INT_MAX (BSD doesn't have values.h).
>From a894f50454343b091cc9a93fc49fc86e59d4de86 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 9 Aug 2012 22:51:52 +0200
Subject: [PATCH] OpenBSD fixed for lib/DtSvc.

---
 cde/lib/DtSvc/DtCodelibs/filegen.C|3 ++-
 cde/lib/DtSvc/DtEncap/spc-termio.c|4 +++-
 cde/lib/DtSvc/DtUtil1/CmdMain.c   |4 ++--
 cde/lib/DtSvc/DtUtil1/DbLoad.c|2 ++
 cde/lib/DtSvc/DtUtil1/Dts.c   |5 -
 cde/lib/DtSvc/DtUtil2/XlationSvc.c|4 ++--
 cde/lib/DtSvc/include/bms/sbstdinc.h  |2 +-
 cde/lib/DtSvc/include/codelibs/dynarray.h |4 ++--
 cde/lib/DtSvc/include/codelibs/privbuf.h  |2 +-
 cde/lib/DtSvc/include/codelibs/stringx.h  |6 +++---
 10 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/cde/lib/DtSvc/DtCodelibs/filegen.C 
b/cde/lib/DtSvc/DtCodelibs/filegen.C
index e29f1c3..ad8c8de 100644
--- a/cde/lib/DtSvc/DtCodelibs/filegen.C
+++ b/cde/lib/DtSvc/DtCodelibs/filegen.C
@@ -272,10 +272,11 @@ _SHXbuf::filegen()
 // Find the longest match if we are doing completion:
 if (completion)
 {
+   long i;
// compare all entries to a copy of the first entry
strcpy(filebuf, &bufptr[long(vec[0])]);
 
-   for (long i = 1; i < vec.size(); i++)
+   for (i = 1; i < vec.size(); i++)
{
register char *ref = filebuf;
register char *ptr = &bufptr[long(vec[i])];
diff --git a/cde/lib/DtSvc/DtEncap/spc-termio.c 
b/cde/lib/DtSvc/DtEncap/spc-termio.c
index 033453a..89b7b4e 100644
--- a/cde/lib/DtSvc/DtEncap/spc-termio.c
+++ b/cde/lib/DtSvc/DtEncap/spc-termio.c
@@ -36,7 +36,7 @@
 #include 
 
 #include 
-#if !defined(linux)
+#if !defined(linux) && !defined(CSRG_BASED)
 #include 
 #endif
 #include 
@@ -145,6 +145,7 @@ static struct modes_s Output_modes[] = {
 "OCRNL",   OCRNL,
 "ONOCR",   ONOCR,
 "ONLRET",  ONLRET,
+#if !defined(CSRG_BASED)
 "OFILL",   OFILL,
 "OFDEL",   OFDEL,
 "NLDLY",   NLDLY,
@@ -169,6 +170,7 @@ static struct modes_s Output_modes[] = {
 "FFDLY",   FFDLY,
 "FF0", FF0,
 "FF1", FF1,
+#endif
 END_OF_LIST, 0
 };
 
diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c
index 00e64ec..d57a2f4 100644
--- a/cde/lib/DtSvc/DtUtil1/CmdMain.c
+++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c
@@ -43,7 +43,7 @@
 #ifdef __apollo
 #include "/sys5/usr/include/sys/termio.h"
 #else
-#include 
+#include 
 #endif
 #include 
 #include 
@@ -989,7 +989,7 @@ _DtCmdCommandInvokerExecute (
   if (commandPid == 0) 
   {
 
-#if defined(__hp_osf) || defined(__osf__)
+#if defined(__hp_osf) || defined(__osf__) || defined(CSRG_BASED)
  setsid() ;
 #else
  (void) setpgrp ();
diff --git a/cde/lib/DtSvc/DtUtil1/DbLoad.c b/cde/lib/DtSvc/DtUtil1/DbLoad.c
index 7f0e242..b0b753d 100644
--- a/cde/lib/DtSvc/DtUtil1/DbLoad.c
+++ b/cde/lib/DtSvc/DtUtil1/DbLoad.c
@@ -104,6 +104,8 @@ extern  void_DtDtsSeqReset(void);
 extern int _DtDtsNextDCSeq(void);
 extern int _DtDtsNextDASeq(void);
 
+char **_DtsDbListDb(void);
+
 int  use_in_memory_db = False;
 
 static void
diff --git a/cde/lib/DtSvc/DtUtil1/Dts.c b/cde/lib/DtSvc/DtUtil1/Dts.c
index 4c61d8a..4b5956c 100644
--- a/cde/lib/DtSvc/DtUtil1/Dts.c
+++ b/cde/lib/DtSvc/DtUtil1/Dts.c
@@ -49,7 +49,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -59,6 +58,10 @@
  * On HP MAXINT is defined in both  and 
  */
 #undef MAXINT
+#elif defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
+#include 
 #endif
 #include 
 #include 
diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.c 
b/cde/lib/DtSvc/DtUtil2/XlationSvc.c
index 4d7dc3d..cbb6982 100644
--- a/cde/lib/DtSvc/DtUtil2/XlationSvc.c
+++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.c
@@ -2197,7 +2197,7 @@ int _DtXlateGetXlateEnv(
/* then look up version number of execution host */
if (ret_AppExecEnvVersion) 
{
-#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || 
defined(__osf__) || defined(linux)
+#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || 
defined(__osf__) || defined(linux) || defined(CSRG_BASED)
   char version[SYS_NMLN+SYS_NMLN+2];
 #else
   char version[UTSLEN+UTSLEN+2];
@@ -2250,7 +2250,7 @@ int _DtXlateGetXlateEnv(
 #error OSMAJORVERSION and/or OSMINORVERSION not defined
 #endif
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   sprintf(buf,"%s%s%s", STR(OSMAJORVERSION), 
  nl_langinfo('.'), STR(OSMINORVERSION));
 #else
diff --git a/cde/lib/DtSvc/include/bms/sbstdinc.h 
b/cde/lib/DtSv

[cdesktopenv-devel] OpenBSD fixes for lib/DtTerm

2012-08-09 Thread Pascal Stumpf

This does not work fully yet, but at least makes it compile.  I will
revisit later on when the 64bit issues are fixed.  Also, people doing
ports to other BSDs will still need to revisit this for their OS.
>From c04bd0616dc453dc4e69f3c2e8bb3564d58f6790 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 9 Aug 2012 23:53:47 +0200
Subject: [PATCH] OpenBSD fixes for lib/DtTerm: values.h, #ifdef's and some
 constants that are not defined on BSD.  Also, leave out
 utmp stuff that does not work on BSD. Note that this
 terminal allocation does not work properly yet, but this
 will be fixed later.

---
 cde/lib/DtTerm/Term/TermParse.c  |6 +-
 cde/lib/DtTerm/TermPrim/TermHeader.h |2 +-
 cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c |6 +-
 cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h |6 ++
 cde/lib/DtTerm/TermPrim/TermPrimParser.c |6 +-
 cde/lib/DtTerm/TermPrim/TermPrimSetPty.c |   11 +++
 cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c|6 ++
 cde/lib/DtTerm/TermPrim/TermPrimSubproc.c|6 +++---
 cde/lib/DtTerm/TermPrim/TermPrimUtil.c   |2 +-
 9 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c
index 2d41043..554c6a2 100644
--- a/cde/lib/DtTerm/Term/TermParse.c
+++ b/cde/lib/DtTerm/Term/TermParse.c
@@ -57,7 +57,11 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 
12:25:13 mgreess $"
  */
 #undef MAXINT
 #endif
-#include  
+#if defined(CSRG_BASED)
+#define MAXSHORT SHRT_MAX
+#else
+#include  
+#endif
 
 #if defined(USL) || defined(__uxp__)
 #include 
diff --git a/cde/lib/DtTerm/TermPrim/TermHeader.h 
b/cde/lib/DtTerm/TermPrim/TermHeader.h
index fcee6e3..d955c4d 100644
--- a/cde/lib/DtTerm/TermPrim/TermHeader.h
+++ b/cde/lib/DtTerm/TermPrim/TermHeader.h
@@ -44,7 +44,7 @@
 #include 
 #include 
 
-#if defined(linux) || defined(UXPArchitecture) || (defined(USL) && 
(OSMAJORVERSION > 1))
+#if defined(linux) || defined(UXPArchitecture) || (defined(USL) && 
(OSMAJORVERSION > 1)) || defined(CSRG_BASED)
 #define _NFILE   FOPEN_MAX
 #endif
 
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c 
b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
index ee7fe60..b8bfd3a 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
@@ -166,7 +166,7 @@ static struct _pty_dirs {
 {PTY_null,PTY_null, PTY_null,   PTY_null,   PTY_null, False},
 };
 
-#ifdef ALPHA_ARCHITECTURE
+#if defined(ALPHA_ARCHITECTURE) || defined(OpenBSDArchitecture)
 /* Use openpty() to open Master/Slave pseudo-terminal pair */
 /* Current version of openpty() uses non-STREAM device. BSD name space */
 #define TTYNAMELEN  25
@@ -254,7 +254,11 @@ GetPty(char **ptySlave, char **ptyMaster)
 * name for the tty that everyone else will
 * use...
 */
+#if defined(XTHREADS)
if (c1 = _XTtyname(ttyFd, tty_buf)) {
+#else
+   if (c1 = _XTtyname(ttyFd)) {
+#endif
ttyDev = realloc(ttyDev, strlen(c1) + 1);
(void) strcpy(ttyDev, c1);
}
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h 
b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
index 47061d7..e5a7b77 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
+++ b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
@@ -96,6 +96,12 @@
 # define USE_TCSENDBREAK   /* use tiocbreak()  */
 #endif /* LINUX_ARCHITECTURE */
 
+#ifdef  OPENBSD_ARCHITECTURE
+# define HAS_SETEUID /* seteuid available*/
+# define HAS_SETREUID/* setreuid available   */
+# define USE_TCSENDBREAK   /* use tiocbreak()  */
+#endif /* OPENBSD_ARCHITECTURE */
+
 #ifdef SUN_ARCHITECTURE
 # define XOR_CAPS_LOCK /* xor caps lock and shift  */
 # define USE_SRIOCSREDIR   /* use SRIOCSREDIR ioctl for -C */
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParser.c 
b/cde/lib/DtTerm/TermPrim/TermPrimParser.c
index 98c606b..f3a6ab7 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimParser.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimParser.c
@@ -47,7 +47,11 @@ static char rcs_id[] = "$TOG: TermPrimParser.c /main/2 
1999/10/15 12:23:41 mgree
  */
 #undef MAXINT
 #endif
-#include   
+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
+#include  
+#endif
 
 #ifdef BBA
 #pragmaBBA_IGNORE
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c 
b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
index 18e84a6..49fc8c9 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
@@ -109,6 +109,17 @@ static char rcs_id[] = "$TOG: TermPrimSetPty.c /main/2 
1998/04/03 17:11:24 mgree
 #define XTTYMODE_weras  14
 #define XTTYMODE_ln

[cdesktopenv-devel] Fixes for DtPrint and csa

2012-08-10 Thread Pascal Stumpf

Easy fixes ...
>From bbbe3785e3452784ca69ebf2f0ffe679567a48ab Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Fri, 10 Aug 2012 14:02:30 +0200
Subject: [PATCH] OpenBSD fixes for DtPrint and csa.

---
 cde/include/EUSCompat.h   |2 +-
 cde/lib/DtPrint/PrintSetupB.c |5 +
 cde/lib/csa/agent.wrapbegin   |2 +-
 cde/lib/csa/lutil.c   |1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h
index 31c43b0..3d85398 100644
--- a/cde/include/EUSCompat.h
+++ b/cde/include/EUSCompat.h
@@ -110,7 +110,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 
 #endif /* HPUX */
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN 256
 
diff --git a/cde/lib/DtPrint/PrintSetupB.c b/cde/lib/DtPrint/PrintSetupB.c
index 0c1eb86..97cf561 100644
--- a/cde/lib/DtPrint/PrintSetupB.c
+++ b/cde/lib/DtPrint/PrintSetupB.c
@@ -46,7 +46,11 @@
 #endif
 
 #include 
+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
 #include 
+#endif
 #include 
 
 #include 
@@ -60,6 +64,7 @@
 #include 
 #include 
 
+
 /*
  * 
  * Constant Definitions
diff --git a/cde/lib/csa/agent.wrapbegin b/cde/lib/csa/agent.wrapbegin
index b1cdb33..b11af6a 100644
--- a/cde/lib/csa/agent.wrapbegin
+++ b/cde/lib/csa/agent.wrapbegin
@@ -5,7 +5,7 @@
 #include 
 #endif /* HPUX */
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 # if defined __STDC__
 #  define REDEFINE_STDC
 #  undef __STDC__
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 2794832..1191c86 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -29,6 +29,7 @@
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 
+#include 
 #include 
 #include 
 #include 
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] OpenBSD fixes for lib/DtTerm

2012-08-10 Thread Pascal Stumpf

On Fri, 10 Aug 2012 06:02:37 -0600 (MDT), Jon Trulson wrote:
> On Thu, 9 Aug 2012, Pascal Stumpf wrote:
> 
> > This does not work fully yet, but at least makes it compile.  I will
> > revisit later on when the 64bit issues are fixed.  Also, people doing
> > ports to other BSDs will still need to revisit this for their OS.
> >
> 
> A question: In cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c You have a
> new line around 166:
> 
> #if defined(ALPHA_ARCHITECTURE) || defined(OpenBSDArchitecture)
> 
> Shouldn't 'OpenBSDArchitecture' be 'OPENBSD_ARCHITECTURE' in this
> context?

Indeed, good catch.

> -- 
> Jon Trulson
> 
> "If the Martian rope-a-dope don't get him, he'll get himself, he'll
>   come in too fast and punch himself out."
>   - one of my brothers, referring to the Curiosity landing.
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Tooltalk patches for OpenBSD

2012-08-10 Thread Pascal Stumpf

Mostly #ifdefs and missing casts.
>From e9781d995dd7d659a6aa1624af79d6513c8ed4ad Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Fri, 10 Aug 2012 14:07:06 +0200
Subject: [PATCH] Tooltalk fixes for OpenBSD.  This consists mainly of
 #ifdefs, casts and some small type nits.

---
 cde/lib/tt/bin/shell/mover.C   |2 +-
 cde/lib/tt/bin/shell/remover.C |2 +-
 cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C |4 ++
 cde/lib/tt/bin/ttdbserverd/db_server_functions.C   |3 +-
 cde/lib/tt/bin/tttar/tttar.C   |2 +-
 cde/lib/tt/bin/tttar/tttar_api.C   |4 +-
 cde/lib/tt/bin/tttar/tttar_spec.C  |2 +-
 cde/lib/tt/lib/api/c/api_api.C |4 ++
 cde/lib/tt/lib/db/tt_db_property.C |2 +-
 cde/lib/tt/lib/mp/mp_c_session.C   |4 +-
 cde/lib/tt/lib/mp/mp_desktop.C |2 +-
 cde/lib/tt/lib/mp/mp_message.C |2 +-
 cde/lib/tt/lib/tt_options.h|   30 
 cde/lib/tt/lib/tttk/ttdesktop.C|   24 
 cde/lib/tt/lib/tttk/ttdtfile.C |6 ++--
 cde/lib/tt/lib/tttk/ttdtprocid.C   |   12 
 cde/lib/tt/lib/tttk/ttmedia.C  |4 +-
 cde/lib/tt/lib/tttk/tttk.C |2 +-
 cde/lib/tt/lib/tttk/tttkmessage.C  |2 +-
 cde/lib/tt/lib/tttk/tttkpattern.C  |2 +-
 cde/lib/tt/lib/util/tt_file_system.C   |   12 ++--
 cde/lib/tt/lib/util/tt_host.C  |2 +-
 cde/lib/tt/lib/util/tt_host_equiv.C|4 +-
 cde/lib/tt/lib/util/tt_iostream.C  |2 +-
 cde/lib/tt/lib/util/tt_iostream.h  |2 +-
 cde/lib/tt/lib/util/tt_log.C   |2 +-
 cde/lib/tt/lib/util/tt_path.C  |4 +-
 cde/lib/tt/lib/util/tt_string.C|3 +-
 cde/lib/tt/lib/util/tt_string_map.C|4 +-
 cde/lib/tt/lib/util/tt_string_match.C  |4 ++
 cde/lib/tt/lib/util/tt_tracefile_parse.C   |3 +-
 cde/lib/tt/lib/util/tt_xdr_utils.C |   16 ++
 cde/lib/tt/mini_isam/isam_impl.h   |2 +-
 cde/lib/tt/mini_isam/iscntl.c  |6 ++--
 cde/lib/tt/slib/mp_otype.C |2 +-
 cde/lib/tt/slib/mp_ptype.C |2 +-
 cde/lib/tt/slib/mp_rpc_implement.C |2 +-
 cde/lib/tt/slib/mp_signature.C |2 +-
 cde/lib/tt/slib/mp_typedb.C|2 +-
 39 files changed, 129 insertions(+), 62 deletions(-)

diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C
index 264f50a..6a412c0 100644
--- a/cde/lib/tt/bin/shell/mover.C
+++ b/cde/lib/tt/bin/shell/mover.C
@@ -35,7 +35,7 @@
 #include "tt_options.h"
 #include 
 #include 
-#if defined(__osf__) || defined(linux)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #if !defined(USL) && !defined(__uxp__)
diff --git a/cde/lib/tt/bin/shell/remover.C b/cde/lib/tt/bin/shell/remover.C
index 3d3002d..f96b32c 100644
--- a/cde/lib/tt/bin/shell/remover.C
+++ b/cde/lib/tt/bin/shell/remover.C
@@ -35,7 +35,7 @@
 #include "tt_options.h"
 #include 
 #include 
-#if defined(__osf__) || defined(linux)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #if !defined(USL) && !defined(__uxp__)
diff --git a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C 
b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
index 7a532ee..cbd4ec7 100644
--- a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
+++ b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
@@ -91,7 +91,11 @@ typedef union
  */
 #undef MAXINT
 #endif
+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
 #include 
+#endif
 
 #ifdef __cplusplus
 
diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C 
b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
index e81863f..2264eb6 100644
--- a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -2773,7 +2774,7 @@ _tt_run_garbage_collect(int in_parallel)
}
} else {
 #endif /* OPT_AUTO_GARBAGE_COLLECT*/
-   exit((int)_tt_garbage_collect(NULL));
+   exit((intptr_t)_tt_garbage_collect(NULL));
 #if defined(OPT_AUTO_GARBAG_COLLECT)
}
 #endif /* OPT_AUTO_GARBAGE_COLLECT*/
diff --git a/cde/lib/tt/bin/tttar/tttar.C b/cde/lib/tt/bin/tttar/tttar.C
index c26432f..cf0875c 100644
--- a/cde/lib/tt/bin/tttar/tttar.C
+++ b/cde/lib/tt/bin/tttar/tttar.C
@@ -37,7 +37,7 @@
 #include 
 #include 
 #include 
-#if defined(__osf__) || defined(

[cdesktopenv-devel] dtterm pty allocation fix

2012-08-10 Thread Pascal Stumpf

This should be applied in addition to my previous DtTerm patches.
>From 5d97aa0dec2fd18a1a206311b6ee54a518e34424 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Fri, 10 Aug 2012 14:29:28 +0200
Subject: [PATCH] Allow dtterm to at least allocate a pty on OpenBSD.  Display
 is still mangled, however, and it frequently crashes (64bit
 issue).

---
 cde/lib/DtTerm/Imakefile |5 +
 cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c |5 -
 cde/programs/dtterm/util/logger.c|2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cde/lib/DtTerm/Imakefile b/cde/lib/DtTerm/Imakefile
index 8d502d7..f4d86a6 100644
--- a/cde/lib/DtTerm/Imakefile
+++ b/cde/lib/DtTerm/Imakefile
@@ -25,6 +25,11 @@ INCLUDES = -I. -I./TermPrim -I./Term -I./TermView
 REQUIREDLIBS = SharedDtTermReqs
 #endif
 
+/* for openpty */
+#if defined(OpenBSDArchitecture)
+REQUIREDLIBS += -lutil
+#endif
+
 TERMPRIM_OBJS = \
TermPrim/TermPrim.o \
TermPrim/TermPrimAction.o \
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c 
b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
index b8bfd3a..8507cdf 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
@@ -37,6 +37,9 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-bsd.c 
/main/4 1996/11/21 19
 #include "TermHeader.h"
 #include 
 #include 
+#if defined(OPENBSD_ARCHITECTURE)
+#include 
+#endif
 #include 
 #include 
 #include 
@@ -166,7 +169,7 @@ static struct _pty_dirs {
 {PTY_null,PTY_null, PTY_null,   PTY_null,   PTY_null, False},
 };
 
-#if defined(ALPHA_ARCHITECTURE) || defined(OpenBSDArchitecture)
+#if defined(ALPHA_ARCHITECTURE) || defined(OPENBSD_ARCHITECTURE)
 /* Use openpty() to open Master/Slave pseudo-terminal pair */
 /* Current version of openpty() uses non-STREAM device. BSD name space */
 #define TTYNAMELEN  25
diff --git a/cde/programs/dtterm/util/logger.c 
b/cde/programs/dtterm/util/logger.c
index 0f51669..dc5c8cc 100644
--- a/cde/programs/dtterm/util/logger.c
+++ b/cde/programs/dtterm/util/logger.c
@@ -72,7 +72,7 @@ main(int argc, char **argv)
 }
 
 /* init data... */
-#if defined(USL) || defined(__uxp__) || defined(linux)
+#if defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
 (void) memset((void *) &myaddr_in, (int) '\0', sizeof(myaddr_in));
 #else
 (void) memset(myaddr_in, '\0', sizeof(myaddr_in));
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] fixes for DtWidget, dtaction and dtappbuilder

2012-08-10 Thread Pascal Stumpf

another round of easy fixes.
>From 82ebb6b7a5a234557863149d01e8c71b7704c1c3 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Fri, 10 Aug 2012 14:35:23 +0200
Subject: [PATCH] OpenBSD fixes for DtWidget, dtaction, dtappbuilder.

---
 cde/lib/DtWidget/Editor.c |2 ++
 cde/programs/dtaction/Main.c  |6 +++---
 cde/programs/dtappbuilder/src/ab/abobjP.h |2 ++
 cde/programs/dtappbuilder/src/ab/abobj_set.c  |2 ++
 cde/programs/dtappbuilder/src/ab/prop.c   |4 
 cde/programs/dtappbuilder/src/ab/prop.h   |2 ++
 cde/programs/dtappbuilder/src/ab/propP.h  |2 ++
 cde/programs/dtappbuilder/src/abmf/stubs_c_file.c |2 +-
 cde/programs/dtappbuilder/src/abmf/write_c.c  |2 +-
 cde/programs/dtappbuilder/src/libABobj/obj.c  |2 ++
 10 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/cde/lib/DtWidget/Editor.c b/cde/lib/DtWidget/Editor.c
index c851ce2..431dbb5 100644
--- a/cde/lib/DtWidget/Editor.c
+++ b/cde/lib/DtWidget/Editor.c
@@ -67,6 +67,8 @@
 #elif defined(linux)
 # include 
 # define NO_putwc
+#elif defined(CSRG_BASED)
+# include 
 #endif /* linux */
 
 #include 
diff --git a/cde/programs/dtaction/Main.c b/cde/programs/dtaction/Main.c
index b06a9f9..866ec8d 100644
--- a/cde/programs/dtaction/Main.c
+++ b/cde/programs/dtaction/Main.c
@@ -295,7 +295,7 @@ main(
   
 XtSetLanguageProc(NULL, NULL, NULL);
 _DtEnvControl(DT_ENV_SET);
-(void) signal(SIGCLD, (void (*)())SIG_IGN);
+(void) signal(SIGCHLD, (void (*)())SIG_IGN);
 
 /*  Initialize the toolkit and open the display  */
 XtToolkitInitialize() ;
@@ -407,7 +407,7 @@ SetGidUid ( unsigned short rgid, unsigned short ruid )
/* fix process gid */
 #if defined(SVR4) || defined(_AIX)
 setgid(rgid);
-#elif defined(__osf__) || defined(linux)
+#elif defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 setregid(rgid, rgid);
 #elif defined(__hpux)
 setresgid(rgid, rgid, rgid);
@@ -418,7 +418,7 @@ SetGidUid ( unsigned short rgid, unsigned short ruid )
/* fix process uid */
 #if defined (SVR4) || defined (_AIX)
 setuid(ruid);
-#elif defined(__osf__) || defined(linux)
+#elif defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 setreuid(ruid, ruid);
 #elif defined(__hpux)
 setresuid(ruid, ruid, ruid);
diff --git a/cde/programs/dtappbuilder/src/ab/abobjP.h 
b/cde/programs/dtappbuilder/src/ab/abobjP.h
index 21c5536..7740c98 100644
--- a/cde/programs/dtappbuilder/src/ab/abobjP.h
+++ b/cde/programs/dtappbuilder/src/ab/abobjP.h
@@ -47,7 +47,9 @@
 #define _ABOBJ_P_H_
 
 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 
 #include 
 #include 
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_set.c 
b/cde/programs/dtappbuilder/src/ab/abobj_set.c
index 92488f1..0c748b0 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_set.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_set.c
@@ -49,7 +49,9 @@
  ***
  */
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #include 
 #include 
 #include 
diff --git a/cde/programs/dtappbuilder/src/ab/prop.c 
b/cde/programs/dtappbuilder/src/ab/prop.c
index 682f2f8..9aec493 100644
--- a/cde/programs/dtappbuilder/src/ab/prop.c
+++ b/cde/programs/dtappbuilder/src/ab/prop.c
@@ -86,6 +86,10 @@
 #include "dtbuilder.h"
 #include "revolv_ui.h"
 
+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#endif
+
 char   *LabelForString = NULL;
 char   *LabelForGraphic = NULL;
 char   *NoneItem = NULL;
diff --git a/cde/programs/dtappbuilder/src/ab/prop.h 
b/cde/programs/dtappbuilder/src/ab/prop.h
index a7e5c16..8ff07c9 100644
--- a/cde/programs/dtappbuilder/src/ab/prop.h
+++ b/cde/programs/dtappbuilder/src/ab/prop.h
@@ -47,7 +47,9 @@
 #define _PROPS_H_
 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #include 
 #include 
 #include 
diff --git a/cde/programs/dtappbuilder/src/ab/propP.h 
b/cde/programs/dtappbuilder/src/ab/propP.h
index 33052c7..798bcdc 100644
--- a/cde/programs/dtappbuilder/src/ab/propP.h
+++ b/cde/programs/dtappbuilder/src/ab/propP.h
@@ -48,7 +48,9 @@
 #define _PROPP_H_
 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #include 
 #include 
 #include 
diff --git a/cde/programs/dtappbuilder/src/abmf/stubs_c_file.c 
b/cde/programs/dtappbuilder/src/abmf/stubs_c_file.c
index 06007c2..6440a76 100644
--- a/cde/programs/dtappbuilder/src/abmf/stubs_c_file.c
+++ b/cde/programs/dtappbuilder/src/abmf/stubs_c_file.c
@@ -279,7 +279,7 @@ printf_setval(GenCodeInfo genCodeInfo, ABObj obj, ...)
 {
 intreturn_value = 0;
 File   codeFile = genCodeInfo->code_file;
-#if defined(__osf__) || defined(linux)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 /* OSF/1 define va_list in  as structure of char ** and int
  * Sun define va_list as void * */
 va_list

[cdesktopenv-devel] dtcm fixes for BSD

2012-08-10 Thread Pascal Stumpf

timezone() is actually a function on BSD.
>From a6cbfea115d4a669e5235e06bf03f567affddb73 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Fri, 10 Aug 2012 14:44:57 +0200
Subject: [PATCH] OpenBSD fixes for dtcm.  There are no global "timezone" and
 "tzname" symbols on BSD.  Apart from that, mainly #ifdefs.

---
 cde/programs/dtcm/dtcm/graphics.c|2 ++
 cde/programs/dtcm/libDtCmP/getdate.y |2 ++
 cde/programs/dtcm/libDtCmP/timeops.c |2 ++
 cde/programs/dtcm/server/delete.c|2 ++
 cde/programs/dtcm/server/insert.c|2 ++
 cde/programs/dtcm/server/lookup.c|2 ++
 cde/programs/dtcm/server/rtable4.c   |   13 +
 cde/programs/dtcm/server/svcmain.c   |3 ++-
 cde/programs/dtcm/server/update.c|2 ++
 cde/programs/dtcm/server/v4ops.c |5 +
 10 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/cde/programs/dtcm/dtcm/graphics.c 
b/cde/programs/dtcm/dtcm/graphics.c
index cc692ef..c8b4103 100644
--- a/cde/programs/dtcm/dtcm/graphics.c
+++ b/cde/programs/dtcm/dtcm/graphics.c
@@ -54,7 +54,9 @@ static  char sccsid[] = "@(#)graphics.c 1.23 94/11/29 Copyr 
1994 Sun Microsystem
 #include 
 #include 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #include  /* MAXPATHLEN defined here */
 #ifdef SVR4
 #include  /* SYS_NMLN */
diff --git a/cde/programs/dtcm/libDtCmP/getdate.y 
b/cde/programs/dtcm/libDtCmP/getdate.y
index 35a1aa3..e323822 100644
--- a/cde/programs/dtcm/libDtCmP/getdate.y
+++ b/cde/programs/dtcm/libDtCmP/getdate.y
@@ -65,7 +65,9 @@ static  char sccsid[] = "@(#)getdate.y 1.10 94/11/07 Copyr 
1993 Sun Microsystems
 #define STANDARD 2
 #define MAYBE3
 
+#ifdef SVR4
 extern long timezone;
+#endif
 
 %}
 
diff --git a/cde/programs/dtcm/libDtCmP/timeops.c 
b/cde/programs/dtcm/libDtCmP/timeops.c
index f0cdbbd..dcb722b 100644
--- a/cde/programs/dtcm/libDtCmP/timeops.c
+++ b/cde/programs/dtcm/libDtCmP/timeops.c
@@ -1008,6 +1008,7 @@ init_time()
_Xltimeparams localtime_buf;
_Xgtimeparams gmtime_buf;
 
+#ifdef SVR4
/* Fix for QAR 31607 */
tzset();
if (getenv("TZ") == NULL){
@@ -1017,6 +1018,7 @@ init_time()
putenv(tzptr);
tzset();
}
+#endif
 
t   = now();
tm  = *_XLocaltime(&t, localtime_buf);
diff --git a/cde/programs/dtcm/server/delete.c 
b/cde/programs/dtcm/server/delete.c
index 879d7ea..46479d9 100644
--- a/cde/programs/dtcm/server/delete.c
+++ b/cde/programs/dtcm/server/delete.c
@@ -38,7 +38,9 @@
 #include 
 #include 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #ifdef SunOS
 #include 
 #endif
diff --git a/cde/programs/dtcm/server/insert.c 
b/cde/programs/dtcm/server/insert.c
index 7c0852f..3559108 100644
--- a/cde/programs/dtcm/server/insert.c
+++ b/cde/programs/dtcm/server/insert.c
@@ -38,7 +38,9 @@
 #include 
 #include 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #ifdef SunOS
 #include 
 #endif
diff --git a/cde/programs/dtcm/server/lookup.c 
b/cde/programs/dtcm/server/lookup.c
index 5a5ac6a..883aba6 100644
--- a/cde/programs/dtcm/server/lookup.c
+++ b/cde/programs/dtcm/server/lookup.c
@@ -38,7 +38,9 @@
 #include 
 #include 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 #ifdef SunOS
 #include 
 #endif
diff --git a/cde/programs/dtcm/server/rtable4.c 
b/cde/programs/dtcm/server/rtable4.c
index fb6aab0..061b63d 100644
--- a/cde/programs/dtcm/server/rtable4.c
+++ b/cde/programs/dtcm/server/rtable4.c
@@ -45,7 +45,11 @@
 #include 
 #include 
 #include 
+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
 #include 
+#endif
 #include 
 #include 
 #ifdef SUNOS
@@ -1406,12 +1410,21 @@ extern long *
 _DtCm_rtable_gmtoff_4_svc(void *args, struct svc_req *svcrq)
 {
static long gmtoff;
+#if !defined(CSRG_BASED)
extern long timezone;
+#else
+   struct tm *t;
+#endif
 
if (debug)
fprintf(stderr, "_DtCm_rtable_gmtoff_4_svc called\n");
 
+#if defined(CSRG_BASED)
+   t = localtime(time(NULL));
+   gmtoff = t->tm_gmtoff;
+#else
gmtoff = timezone;
+#endif
return(&gmtoff);
 }
 
diff --git a/cde/programs/dtcm/server/svcmain.c 
b/cde/programs/dtcm/server/svcmain.c
index 62230ad..d329f68 100644
--- a/cde/programs/dtcm/server/svcmain.c
+++ b/cde/programs/dtcm/server/svcmain.c
@@ -702,7 +702,8 @@ main(int argc, char **argv)
 
if (udp_transp == (SVCXPRT *)-1) {
udp_transp = svcudp_create(standalone ? RPC_ANYSOCK : 0
-#if defined(_AIX) || defined(hpV4) || defined(__osf__) || defined(linux)
+#if defined(_AIX) || defined(hpV4) || defined(__osf__) || defined(linux) || \
+   defined(CSRG_BASED)
);
 #else
,0,0);
diff --git a/cde/programs/dtcm/server/update.c 
b/cde/programs/dtcm/server/update.c
index 5861b92..ed20fca 100644
--- a/cde/programs/dtcm/

[cdesktopenv-devel] dtfile patches

2012-08-10 Thread Pascal Stumpf

Fixes for dtfile.  Still not completely functional, but I will work on
that.
>From 94ccfbe81d142582e120d3e3cb0c50ff1cb795bc Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Fri, 10 Aug 2012 15:09:04 +0200
Subject: [PATCH] Fixes for dtfile on OpenBSD, plus missing prototypes.  Use
 statfs() on BSD to find out if a file system is NFS.

---
 cde/programs/dtfile/Desktop.c|1 +
 cde/programs/dtfile/FileManip.c  |5 +++--
 cde/programs/dtfile/Filter.c |1 +
 cde/programs/dtfile/Find.c   |6 +++---
 cde/programs/dtfile/Main.c   |2 +-
 cde/programs/dtfile/MkDir.c  |6 +++---
 cde/programs/dtfile/SharedProcs.c|2 ++
 cde/programs/dtfile/SharedProcs.h|3 +++
 cde/programs/dtfile/Trash.c  |   19 +++
 cde/programs/dtfile/dtcopy/sharedFuncs.c |   19 ++-
 10 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/cde/programs/dtfile/Desktop.c b/cde/programs/dtfile/Desktop.c
index 2619769..a090af2 100644
--- a/cde/programs/dtfile/Desktop.c
+++ b/cde/programs/dtfile/Desktop.c
@@ -105,6 +105,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c
index dd785d7..91f631c 100644
--- a/cde/programs/dtfile/FileManip.c
+++ b/cde/programs/dtfile/FileManip.c
@@ -64,7 +64,7 @@
 #define ROOTINO UFSROOTINO
 #  endif   /* sco */
 #else
-#  if defined(linux)
+#  if defined(linux) || defined(CSRG_BASED)
 #define ROOTINO 2
 #  endif
 #  include 
@@ -994,7 +994,8 @@ FileManip(
if (lstat (to, &s2) >= 0)  /*  exists */
{
   if ((stat (to, &s3) >= 0) &&
-#if defined(__hp_osf) || (__ultrix) || defined(__osf__) || defined(linux)
+#if defined(__hp_osf) || (__ultrix) || defined(__osf__) || defined(linux) || \
+   defined(CSRG_BASED)
(((s3.st_mode & S_IFMT) == S_IFDIR)  /* if is a directory */
|| ((s3.st_mode & S_IFMT) == S_IFSOCK)) )/* or a net special */
 #else
diff --git a/cde/programs/dtfile/Filter.c b/cde/programs/dtfile/Filter.c
index 7ff8145..5ee2137 100644
--- a/cde/programs/dtfile/Filter.c
+++ b/cde/programs/dtfile/Filter.c
@@ -106,6 +106,7 @@
 #include "Filter.h"
 #include "Help.h"
 
+char **DtDtsDataTypeNames(void);
 
 static char * FILE_FILTER = "FileFilter";
 
diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c
index 61a6b34..094d285 100644
--- a/cde/programs/dtfile/Find.c
+++ b/cde/programs/dtfile/Find.c
@@ -1811,7 +1811,7 @@ ExecuteFind(
if (access_priv == -1 && geteuid() != root_user)
{
 #else
-#  if defined(__hp_osf) || defined(__ultrix) || defined(__osf__) || 
defined(linux)
+#  if defined(__hp_osf) || defined(__ultrix) || defined(__osf__) || 
defined(linux) || defined(CSRG_BASED)
setreuid(geteuid(),-1);
if (access ((char *) path, R_OK) == -1)
{
@@ -1908,10 +1908,10 @@ ExecuteFind(
 #ifdef __osf__
oldSig = signal(SIGCHLD, sigchld_handler);
 #else
-   oldSig = signal(SIGCLD, SIG_DFL);
+   oldSig = signal(SIGCHLD, SIG_DFL);
 #endif /* __osf__ */
find_rec->popenId = findpopen(command, "r",&(find_rec->childpid));
-   signal (SIGCLD, oldSig);
+   signal (SIGCHLD, oldSig);
 
if (find_rec->popenId == NULL)
{
diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index cba5527..caf0fc3 100644
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -1020,7 +1020,7 @@ main(
 /* error handling follows, none for now */
 ;
 #else
-   (void) signal (SIGCLD, SIG_IGN);
+   (void) signal (SIGCHLD, SIG_IGN);
 #endif /* __osf__ */
XtSetLanguageProc( NULL, NULL, NULL );
 
diff --git a/cde/programs/dtfile/MkDir.c b/cde/programs/dtfile/MkDir.c
index 972050e..434c756 100644
--- a/cde/programs/dtfile/MkDir.c
+++ b/cde/programs/dtfile/MkDir.c
@@ -107,13 +107,13 @@ RunFileCommand(
   
/* prepare to catch the command termination */
 
-   oldSig = signal (SIGCLD, SIG_DFL);
+   oldSig = signal (SIGCHLD, SIG_DFL);
 
/* fork a process to run command */
 
if ((child = fork ()) < 0)  /* fork failed */
{
-  (void) signal (SIGCLD, oldSig);
+  (void) signal (SIGCHLD, oldSig);
   return (-1);
}
 
@@ -126,7 +126,7 @@ RunFileCommand(
  wait_return = wait (&exit_value);
   } while (wait_return != child);
 
-  (void) signal (SIGCLD, oldSig); /* child stopped or terminated */
+  (void) signal (SIGCHLD, oldSig); /* child stopped or terminated */
 
   return (exit_value);  /* if exit_value == 0 then success */
}
diff --git a/cde/programs/dtfile/SharedProcs.c 
b/cde/programs/dtfile/SharedProcs.c
index 5da0294..333efe0 100644
--- a/cde/programs/dtfile/SharedProcs.c
+++ b/cde/programs/dtfile/SharedProcs.c
@@ -130,6 +130,8 @@ extern XmWidgetExtData _XmGetWidgetExtData(
 #include

Re: [cdesktopenv-devel] [PATCH] dtcreate: fix exit with TT_ERR_PTYPE and fix several sprintf related segfaults.

2012-08-11 Thread Pascal Stumpf

On Sat, 11 Aug 2012 04:16:49 -0400, William Schaub wrote:
> On 08/11/2012 03:56 AM, William Schaub wrote:
> > On 08/11/2012 03:18 AM, Marc Balmer wrote:
> >> A few comments:
> >>
> >> Since sizeof(char) is 1, it is not needed to write
> >>
> >> malloc(... + 5 * sizeof(char))
> >>
> >> but just
> >>
> >> malloc(... + 5)
> >>
> >> And actually, only 4 extra characters are needed, so don't waste that
> >> byte ;)
> >>
> >> And never use a multiplication in a malloc, never, ever.  It has been
> >> the source of remote-root exploits (due to integer overflow).  Simple
> >> rule:  If there is a multiplication needed, use calloc:
> >>
> >> malloc(n * sizeof whatever)/* never, ever */
> >>
> >> use
> >>
> >> calloc(n, sizeof whatever)/* this is the way to go */
> >>
> >> The original code contains a nice bug:
> >>
> >>  title = XtMalloc(strlen(pre) + strlen(suf) + 2);
> >>  sprintf(title, "%s - %s", pre, suf);
> >>
> >> The format string alone adds 3 characters to the final string (' - '),
> >> and then there is the NUL terminating characters, so the target buffer
> >> needs to be at least strlen(pre) + strlen(suf) + 4 characters long, but
> >> here a smaller buffer is allocated.  This nicely demonstrates the
> >> evilness of sprintf...
> >>
> >>
> > I'm waiting on CDE to rebuild at the moment but as soon as I verify 
> > that my changes still result in a working dtcreate I will reply to 
> > this message with a new patch with the changes you suggested.
> 
> Ok Here is the revised patch.

Always use a size_t for len, not an int.

>>> text/x-patch content
> --
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> ___
> cdesktopenv-devel mailing list
> cdesktopenv-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Next round of OpenBSD patches

2012-08-11 Thread Pascal Stumpf

dtcalc, dthelp, dtimsstart.  Please also keep in mind that the Imakefile
diffs really need to be committed in order to make things for me easier
on OpenBSD.
>From 4aedd5a34ef2edd6f375be23753902fe659ae248 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 13:38:22 +0200
Subject: [PATCH] OpenBSD patches for dtcalc, dtdocbook, dthelp and
 dtimsstart.

---
 cde/programs/dtcalc/motif.c|7 +++
 cde/programs/dtdocbook/instant/util.c  |2 ++
 cde/programs/dthelp/parser/canon1/helptag/global.h |6 +++---
 cde/programs/dthelp/parser/canon1/helptag/help.c   |6 +++---
 cde/programs/dthelp/parser/canon1/util/wchar.c |2 ++
 cde/programs/dthelp/parser/pass1/helptag/help.c|6 +++---
 cde/programs/dthelp/parser/pass1/util/wchar.c  |2 ++
 cde/programs/dthelp/parser/pass2/htag2/global.h|2 +-
 cde/programs/dthelp/parser/pass2/util/wchar.c  |2 ++
 cde/programs/dtimsstart/main.c |2 +-
 cde/programs/dtimsstart/start.c|8 
 11 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c
index 2a663e4..e3db030 100644
--- a/cde/programs/dtcalc/motif.c
+++ b/cde/programs/dtcalc/motif.c
@@ -80,6 +80,7 @@
 #include 
 #include 
 #include 
+#include 
 /* Copied from BaseClassI.h */
 extern XmWidgetExtData _XmGetWidgetExtData(
 Widget widget,
@@ -266,6 +267,12 @@ extern Vars v ; /* Calctool variables and 
options. */
 char translations_return[] = "Return:ManagerGadgetSelect()";
 static Boolean NoDisplay=False;
 
+extern XtPointer _XmStringUngenerate (
+XmString string,
+XmStringTag tag,
+XmTextType tag_type,
+XmTextType output_type);
+
 int
 main(argc, argv)
 int argc ;
diff --git a/cde/programs/dtdocbook/instant/util.c 
b/cde/programs/dtdocbook/instant/util.c
index 19ab9bd..eb3d264 100644
--- a/cde/programs/dtdocbook/instant/util.c
+++ b/cde/programs/dtdocbook/instant/util.c
@@ -78,7 +78,9 @@ static char *RCSid =
 #include 
 #include 
 #include 
+#if !defined(CSRG_BASED)
 #include 
+#endif
 
 #include "general.h"
 
diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h 
b/cde/programs/dthelp/parser/canon1/helptag/global.h
index 7b619d1..2e9e267 100644
--- a/cde/programs/dthelp/parser/canon1/helptag/global.h
+++ b/cde/programs/dthelp/parser/canon1/helptag/global.h
@@ -44,7 +44,7 @@
 #endif
 #include 
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include 
 #include 
 #include 
@@ -179,7 +179,7 @@ EXTERN char dirsep
 #if defined(MSDOS)
 INIT('\\')
 #else
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 INIT('/')
 #else
 define directory separator here
@@ -187,7 +187,7 @@ INIT('/')
 #endif
   ;
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__)|| defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__)|| defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #define CSEP '/'
 #define SSEP "/"
 #else
diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c 
b/cde/programs/dthelp/parser/canon1/helptag/help.c
index 830bf2e..2162595 100644
--- a/cde/programs/dthelp/parser/canon1/helptag/help.c
+++ b/cde/programs/dthelp/parser/canon1/helptag/help.c
@@ -356,7 +356,7 @@ char *qualname;
 char *unqualname;
 #endif
 {
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 
 FILE *f;
 #endif
@@ -381,7 +381,7 @@ else
 
 fnp = fn;
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 qualname[0] = '\0';
 gp = qualname + strlen(qualname);
 roomleft = roomleft - strlen(qualname);
@@ -495,7 +495,7 @@ do  {
 while (1);
 *strrchr(qualname, CSEP) = '\0';
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || 
defined(__uxp__) || defined(

[cdesktopenv-devel] dtinfo on OpenBSD

2012-08-11 Thread Pascal Stumpf

See patch.
>From e1739161c2bc99c37ccce4b74d1ef42f45279e77 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 13:43:57 +0200
Subject: [PATCH] Make dtinfo work on OpenBSD.

strstream.h is now called "strstream" and is obsolete, but use it anyway until
all code is converted over.  This also needs std:: added, at least for GCC
4.2.1.  Lastly, when hardcoding the path to perl, /usr/bin/perl should be used
rather than anything else.
---
 cde/programs/dtinfo/tools/misc/msgsets.C |   23 ---
 cde/programs/dtinfo/tools/misc/treeres   |2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cde/programs/dtinfo/tools/misc/msgsets.C 
b/cde/programs/dtinfo/tools/misc/msgsets.C
index 48f0d24..6b59abf 100644
--- a/cde/programs/dtinfo/tools/misc/msgsets.C
+++ b/cde/programs/dtinfo/tools/misc/msgsets.C
@@ -42,7 +42,7 @@
 #ifdef __cplusplus
 
 #include 
-#if !defined(__DECCXX) && !defined(USL)
+#if !defined(__DECCXX) && !defined(USL) && !defined(CSRG_BASED)
 #include 
 #else
 #include 
@@ -195,11 +195,12 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 /* All Rights Reserved */
 
 #include 
-#include 
+#include 
+#include 
 
 #define BUFFER_INCR_UNIT   64
 
-ostrstream **sets;
+std::ostrstream **sets;
 int sets_cnt = 0; /* number of sets slots occupied */
 int sets_max = 0; /* total number of sets slots */
 
@@ -509,14 +510,14 @@ case 1:
 
sets_max += BUFFER_INCR_UNIT;
if (sets_cnt == 0) {
-   sets = (ostrstream **)
-   malloc(sizeof(ostrstream *) * sets_max);
+   sets = (std::ostrstream **)
+   malloc(sizeof(std::ostrstream *) * sets_max);
set_nums = (int *)
malloc(sizeof(int) * sets_max);
}
else {
-   sets = (ostrstream **)
-   realloc(sets, sizeof(ostrstream *) * sets_max);
+   sets = (std::ostrstream **)
+   realloc(sets, sizeof(std::ostrstream *) * sets_max);
set_nums = (int *)
realloc(set_nums, sizeof(int) * sets_max);
}
@@ -528,7 +529,7 @@ case 1:
 }
 if (cur_set >= 0)
*sets[cur_set] << '\0';
-sets[cur_set = sets_cnt++] = new ostrstream;
+sets[cur_set = sets_cnt++] = new std::ostrstream;
 
 *sets[cur_set] << (char*)yytext;
 
@@ -556,7 +557,7 @@ case 3:
 case 4:
 {
 if (cur_set < 0) { // maybe not a message id
-   cout << (char*)yytext;
+   std::cout << (char*)yytext;
 }
 else { // must be a message id
*sets[cur_set] << (char*)yytext;
@@ -581,7 +582,7 @@ case 7:
 case 8:
 {
 if (cur_set < 0)
-   cout << *(char*)yytext;
+   std::cout << *(char*)yytext;
 else
*sets[cur_set] << *(char*)yytext;
 }
@@ -1151,7 +1152,7 @@ main()
 
 for (i = 0; i < sets_cnt; i++) {
const char* record = sets[sorted[i]]->str();
-   cout << record << '\n' << flush;
+   std::cout << record << '\n' << std::flush;
 }
 
 free(sorted);
diff --git a/cde/programs/dtinfo/tools/misc/treeres 
b/cde/programs/dtinfo/tools/misc/treeres
index 6537743..d077302 100755
--- a/cde/programs/dtinfo/tools/misc/treeres
+++ b/cde/programs/dtinfo/tools/misc/treeres
@@ -1,5 +1,5 @@
 # feed this into perl
-eval '(exit $?0)' && eval 'exec /usr/local/bin/perl $0 ${1+"$@"}' & eval 'exec 
/usr/local/bin/perl $0 $argv'
+eval '(exit $?0)' && eval 'exec /usr/bin/perl $0 ${1+"$@"}' & eval 'exec 
/usr/bin/perl $0 $argv'
if 0;
 
 # treeres - resource file preprocessor
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtlogin on OpenBSD

2012-08-11 Thread Pascal Stumpf

See patch.
>From 6081cf4c4ad8370c69bf0571a61d8adccc007712 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 13:49:07 +0200
Subject: [PATCH] Make dtlogin compile on OpenBSD.

Most importantly, we *cannot* do the utmp stuff this code is attempting.
It is SysV-specific.
---
 cde/programs/dtlogin/account.c |4 
 cde/programs/dtlogin/dm.c  |   16 +++-
 cde/programs/dtlogin/session.c |2 +-
 cde/programs/dtlogin/util.c|3 ++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/cde/programs/dtlogin/account.c b/cde/programs/dtlogin/account.c
index d5047a3..e14389d 100644
--- a/cde/programs/dtlogin/account.c
+++ b/cde/programs/dtlogin/account.c
@@ -138,6 +138,7 @@ Account( struct display *d, char *user, char *line, pid_t 
pid,
 #endif /* NeedWidePrototypes */
 waitType exitcode )
 {
+#if !defined(CSRG_BASED) /* we cannot do this on BSD ... */
 struct utmp utmp;  /* local struct for new entry  */
 struct utmp *u;/* pointer to entry in utmp file   */
 intfd;
@@ -348,6 +349,7 @@ Account( struct display *d, char *user, char *line, pid_t 
pid,
 #endif
 
 #endif /* !sun */
+#endif /* !CSRG_BASED */
 }
 
 
@@ -369,6 +371,7 @@ UtmpIdOpen( char *utmpId )
 struct utmp *u;/* pointer to entry in utmp file   */
 intstatus = 1; /* return code */
 
+#if !defined(CSRG_BASED)
 while ( (u = getutent()) != NULL ) {
 
if ( (strncmp(u->ut_id, utmpId, 4) == 0 ) &&
@@ -380,6 +383,7 @@ UtmpIdOpen( char *utmpId )
 }
 
 endutent();
+#endif
 return (status);
 }
 
diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index 717b043..136d0bd 100644
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -515,7 +515,7 @@ StopAll( int arg )
 
 intChildReady = 0;
 
-#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__uxp__) || 
defined (__osf__) || defined(linux)
+#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__uxp__) || 
defined (__osf__) || defined(linux) || defined(CSRG_BASED)
 static SIGVAL
 ChildNotify( int arg )
 {
@@ -599,7 +599,9 @@ ProcessChildDeath( int pid, waitType status )
 *  do process accounting...
 */
 
+#if !defined(CSRG_BASED)
Account(d, NULL, NULL, pid, DEAD_PROCESS, status);
+#endif
 
 
/*
@@ -732,7 +734,9 @@ ProcessChildDeath( int pid, waitType status )
 *  do process accounting...
 */
 
+#if !defined(CSRG_BASED)
Account(d, NULL, NULL, pid, DEAD_PROCESS, status);
+#endif
 
switch (d->status)
{
@@ -1030,6 +1034,7 @@ StartDisplay(
 *  are already in use...
 */
  
+#if !defined(CSRG_BASED)
if (d->utmpId == NULL) {
int i;
char *p, *q;
@@ -1061,6 +1066,7 @@ StartDisplay(
}   
 #endif  
}
+#endif
 }
 
 if (NULL == d->authFile)
@@ -1150,7 +1156,9 @@ StartDisplay(
 }
 }
 #endif
+#if !defined(CSRG_BASED)
Account(d, "LOGIN", line, getpid(), LOGIN_PROCESS, status);
+#endif
 }
 
if (!WaitForServer (d))
@@ -1244,7 +1252,9 @@ StopDisplay( struct display *d )
 else 
 if ((d->displayType.location == Local) || !dt_shutdown ) {
/* don't remove the console */
+#if !defined(CSRG_BASED)
Account(d, NULL, NULL, 0, DEAD_PROCESS, status);
+#endif
RemoveDisplay (d);
}   
 }
@@ -1546,7 +1556,9 @@ StartGetty( struct display *d )
/*
 *  do process accounting...
 */
+#if !defined(CSRG_BASED)
Account(d, "LOGIN", NULL, getpid(), LOGIN_PROCESS, status);
+#endif
 
 
#ifdef _AIX
@@ -1723,6 +1735,7 @@ GettyRunning( struct display *d )
 
 Debug("Checking for a getty on line %s.\n", utmp.ut_line);
 
+#if !defined(CSRG_BASED)
 setutent();
 
 rvalue = FALSE;
@@ -1760,6 +1773,7 @@ GettyRunning( struct display *d )
 }
 
 endutent();
+#endif /* !CSRG_BASED */
 return rvalue;
 }
 
diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index 92fa5d8..a1fbaa6 100644
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -1290,7 +1290,7 @@ StartClient( struct verify_info *verify, struct display 
*d, int *pidp )
}
 #endif
 
-#ifndef sun
+#if !defined(sun) && !defined(CSRG_BASED)
Account(d, user, NULL, getpid(), USER_PROCESS, status);
 #endif
 
diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c
index c93d29b..accb0ff 100644
--- a/cde/programs/dtlogin/util.c
+++ b/cde/programs/dtlogin/util.c
@@ -679,7 +679,8 @@ static int
 MatchesFileSuffix(char *filename, char *suffix)
 {
 intretval = 0;
-#if defined(_AIX) || defined(SVR4) || defined (__os

[cdesktopenv-devel] dtmail on OpenBSD

2012-08-11 Thread Pascal Stumpf

See patch.
>From 2ec9c4b8b1368229eaf4e458808d6121d882595a Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 13:57:26 +0200
Subject: [PATCH] Current state of my dtmail work.

Mostly #ifdefs and casts; also, do not redefine strcasestr().  This will
probably be needed for Linux too when compiling without -fpermissive.
---
 cde/programs/dtmail/MotifApp/InterruptibleCmd.C   |2 +-
 cde/programs/dtmail/MotifApp/MainWindow.C |2 +-
 cde/programs/dtmail/MotifApp/MenuBar.C|   24 ++--
 cde/programs/dtmail/MotifApp/SelectFileCmd.C  |2 +-
 cde/programs/dtmail/dtmail/DmxPrintSetup.C|2 +-
 cde/programs/dtmail/dtmail/FindDialog.C   |2 +
 cde/programs/dtmail/dtmail/MsgScrollingList.C |2 +-
 cde/programs/dtmail/dtmail/RoamApp.C  |4 +-
 cde/programs/dtmail/dtmail/RoamCmds.C |4 +-
 cde/programs/dtmail/dtmail/RoamInterruptibleCmd.C |2 +-
 cde/programs/dtmail/dtmail/SendMsgDialog.C|2 +-
 cde/programs/dtmail/dtmail/Sort.C |1 +
 cde/programs/dtmail/include/DtMail/Buffer.hh  |2 +-
 cde/programs/dtmail/include/DtMail/DtMail.h   |2 +-
 cde/programs/dtmail/include/DtMail/Threads.hh |2 +-
 cde/programs/dtmail/libDtMail/Common/DtMailRc.C   |3 ++
 cde/programs/dtmail/libDtMail/Common/HashTable.C  |9 +++--
 cde/programs/dtmail/libDtMail/Common/IO.C |2 +-
 cde/programs/dtmail/libDtMail/Common/NotDynamic.C |4 +-
 cde/programs/dtmail/libDtMail/RFC/RFCFormat.C |6 ++-
 cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C|   40 ++--
 cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C |   11 +-
 cde/programs/dtmail/libDtMail/RFC/RFCTransport.C  |2 +-
 23 files changed, 75 insertions(+), 57 deletions(-)

diff --git a/cde/programs/dtmail/MotifApp/InterruptibleCmd.C 
b/cde/programs/dtmail/MotifApp/InterruptibleCmd.C
index 49a3f63..3fe82cf 100644
--- a/cde/programs/dtmail/MotifApp/InterruptibleCmd.C
+++ b/cde/programs/dtmail/MotifApp/InterruptibleCmd.C
@@ -69,7 +69,7 @@
 #include 
 #include 
 
-#if !defined(linux)
+#if !defined(linux) && !defined(CSRG_BASED)
 extern forceUpdate( Widget );
 #endif
 
diff --git a/cde/programs/dtmail/MotifApp/MainWindow.C 
b/cde/programs/dtmail/MotifApp/MainWindow.C
index 80061ed..1065b33 100644
--- a/cde/programs/dtmail/MotifApp/MainWindow.C
+++ b/cde/programs/dtmail/MotifApp/MainWindow.C
@@ -150,7 +150,7 @@ MainWindow::initialize( )
 /* install callback */
 // XtAddCallback(_main, XmNhelpCallback, HelpCB, helpId);
 XtAddCallback(_main, XmNhelpCallback, 
-   HelpCB, "_HOMETOPIC");
+   HelpCB, (void *)"_HOMETOPIC");
 
 // Called derived class to create the work area
 
diff --git a/cde/programs/dtmail/MotifApp/MenuBar.C 
b/cde/programs/dtmail/MotifApp/MenuBar.C
index e305cf4..5d41b8c 100644
--- a/cde/programs/dtmail/MotifApp/MenuBar.C
+++ b/cde/programs/dtmail/MotifApp/MenuBar.C
@@ -191,22 +191,22 @@ MenuBar::createPulldown (
helpId = XtName(*cascade);
if (helpId == "Mailbox") {
XtAddCallback(*cascade, XmNhelpCallback, 
-   HelpCB, DTMAILCONTAINERMENUID);
+   HelpCB, (void *)DTMAILCONTAINERMENUID);
} else if (helpId == "Edit") {
XtAddCallback(*cascade, XmNhelpCallback, 
-   HelpCB, DTMAILEDITMENUID);
+   HelpCB, (void *)DTMAILEDITMENUID);
} else if (helpId == "Message") {
XtAddCallback(*cascade, XmNhelpCallback, 
-   HelpCB, DTMAILMESSAGEMENUID);
+   HelpCB, (void *)DTMAILMESSAGEMENUID);
} else if (helpId == "Attachments") {
XtAddCallback(*cascade, XmNhelpCallback, 
-   HelpCB, DTMAILATTACHMENUID);
+   HelpCB, (void *)DTMAILATTACHMENUID);
} else if (helpId == "View") {
XtAddCallback(*cascade, XmNhelpCallback, 
-   HelpCB, DTMAILVIEWMENUID);
+   HelpCB, (void *)DTMAILVIEWMENUID);
} else if (helpId == "Compose") {
XtAddCallback(*cascade, XmNhelpCallback, 
-   HelpCB, DTMAILCOMPOSEMENUID);
+   HelpCB, (void *)DTMAILCOMPOSEMENUID);
}
}
  } else
@@ -323,22 +323,22 @@ MenuBar::createPulldown (
helpId = XtName

[cdesktopenv-devel] dtpdmd, dtprintinfo

2012-08-11 Thread Pascal Stumpf

See patch.
>From 80a1a1b8552b51b0d4acc18e6756d5da5d8350dd Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 14:01:14 +0200
Subject: [PATCH] OpenBSD patches for dtpdmd and dtprintinfo.

Casts, #ifdefs, SIGCLD ...
---
 cde/programs/dtpdmd/manager.c  |2 +-
 cde/programs/dtprintinfo/UI/DtApp.C|   12 ++--
 cde/programs/dtprintinfo/UI/DtPrinterIcon.C|2 +-
 cde/programs/dtprintinfo/UI/DtPrinterIcon.h|2 +-
 cde/programs/dtprintinfo/libUI/BaseUI.h|2 +-
 cde/programs/dtprintinfo/objects/BaseObj.h |2 +-
 .../dtprintinfo/objects/PrintObj/ParseJobs.C   |4 ++--
 cde/programs/dtprintinfo/util/Invoke.C |2 ++
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/cde/programs/dtpdmd/manager.c b/cde/programs/dtpdmd/manager.c
index 55af045..1893f5d 100644
--- a/cde/programs/dtpdmd/manager.c
+++ b/cde/programs/dtpdmd/manager.c
@@ -425,7 +425,7 @@ void mgr_launch_pdm( XpPdmServiceRec *rec )
sigemptyset(&svec.sa_mask);
svec.sa_flags   = 0;
svec.sa_handler = SIG_DFL;
-   (void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
+   (void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
 
for (i=3; i < FOPEN_MAX; i++) {
if ((i != rec->message_pipe[1]) && 
diff --git a/cde/programs/dtprintinfo/UI/DtApp.C 
b/cde/programs/dtprintinfo/UI/DtApp.C
index 94bc423..a93fbda 100644
--- a/cde/programs/dtprintinfo/UI/DtApp.C
+++ b/cde/programs/dtprintinfo/UI/DtApp.C
@@ -324,16 +324,16 @@ void DtApp::SaveYourSelf()
 
save_state = true;
 
-   char *value = window->setPrefD->ShowOnlyMyJobs() ? "1" : "0";
+   char *value = window->setPrefD->ShowOnlyMyJobs() ? (char *)"1" : (char 
*)"0";
Save("ShowOnlyMine", value);
 
-   value = window->setPrefD->ShowStatusLine() ? "1" : "0";
+   value = window->setPrefD->ShowStatusLine() ? (char *)"1" : (char *)"0";
Save("ShowMessageLine", value);
 
-   value = window->setPrefD->ShowDetailsLabel() ? "1" : "0";
+   value = window->setPrefD->ShowDetailsLabel() ? (char *)"1" : (char *)"0";
Save("ShowDetailsLabel", value);
 
-   value = window->setPrefD->ShowStatusFlags() ? "1" : "0";
+   value = window->setPrefD->ShowStatusFlags() ? (char *)"1" : (char *)"0";
Save("ShowProblemFlag", value);
 
char interval[9];
@@ -357,10 +357,10 @@ void DtApp::SaveYourSelf()
   queues = (DtPrinterIcon **) window->container->Children();
   for (i = 0; i < window->container->NumChildren(); i++)
{
-value = queues[i]->Visible() ? "1" : "0";
+value = queues[i]->Visible() ? (char *)"1" : (char *)"0";
 sprintf(attribute, "%s.Visible", queues[i]->QueueObj()->Name());
 Save(attribute, value);
-value = queues[i]->Open() ? "1" : "0";
+value = queues[i]->Open() ? (char *)"1" : (char *)"0";
 sprintf(attribute, "%s.Open", queues[i]->QueueObj()->Name());
 Save(attribute, value);
}
diff --git a/cde/programs/dtprintinfo/UI/DtPrinterIcon.C 
b/cde/programs/dtprintinfo/UI/DtPrinterIcon.C
index a0e593d..b2a9785 100644
--- a/cde/programs/dtprintinfo/UI/DtPrinterIcon.C
+++ b/cde/programs/dtprintinfo/UI/DtPrinterIcon.C
@@ -174,7 +174,7 @@ char *DtPrinterIcon::Description()
 
sprintf(buf, "%s_Print", queue->Name());
char *desc = DtActionDescription(buf);
-   return (desc ? desc : "");
+   return (desc ? desc : (char *)"");
 }
 
 void DtPrinterIcon::PrintQueueUp(boolean _flag)
diff --git a/cde/programs/dtprintinfo/UI/DtPrinterIcon.h 
b/cde/programs/dtprintinfo/UI/DtPrinterIcon.h
index 82780c3..e5d5b4c 100644
--- a/cde/programs/dtprintinfo/UI/DtPrinterIcon.h
+++ b/cde/programs/dtprintinfo/UI/DtPrinterIcon.h
@@ -59,7 +59,7 @@ class DtPrinterContainer : public Container
   : Container(category, parent, name, SCROLLED_HORIZONTAL_ROW_COLUMN) { }
~DtPrinterContainer() { delete dnd; }
 
-   boolean DtPrinterContainer::SetVisiblity(boolean flag)
+   boolean SetVisiblity(boolean flag)
 {
   Container::SetVisiblity(flag);
   dnd->UpdateActivity(flag);
diff --git a/cde/programs/dtprintinfo/libUI/BaseUI.h 
b/cde/programs/dtprintinfo/libUI/BaseUI.h
index f02c903..0a83a9f 100644
--- a/cde/programs/dtprintinfo/libUI/BaseUI.h
+++ b/cde/programs/dtprintinfo/libUI/BaseUI.h
@@ -40,7 +40,7 @@
   #define boolean boolean_t
   #define true B_TRUE
   #define false B_FALSE
-#elif defined(linux)
+#elif defined(linux) || defined(CSRG_BASED)
   #define false 0
   #define true 0
   #define

[cdesktopenv-devel] dtsearchpath, dtscreen, dtsession

2012-08-11 Thread Pascal Stumpf

See patch.
>From 13e8eae8cc80c5e694c45ce0b10e37418fd7fb5b Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 14:04:50 +0200
Subject: [PATCH] Patches for dtscreen, dtsearchpath, dtsession on OBSD.

Do not redefine round(3), and provide a manpath for OpenBSD.
(this is one of the few things that need to be adjusted for other BSDs)
---
 cde/programs/dtscreen/usleep.c|2 +-
 cde/programs/dtscreen/worm.c  |2 ++
 cde/programs/dtsearchpath/libCliSrv/UnixEnv.C |4 +++-
 cde/programs/dtsession/SmConMgmt.c|2 +-
 cde/programs/dtsession/SmGlobals.c|4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cde/programs/dtscreen/usleep.c b/cde/programs/dtscreen/usleep.c
index 0849081..ca89c52 100644
--- a/cde/programs/dtscreen/usleep.c
+++ b/cde/programs/dtscreen/usleep.c
@@ -41,7 +41,7 @@
 
 #include "dtscreen.h"
 
-#if !defined(_AIX) && !defined(hpV4) && !defined(linux)
+#if !defined(_AIX) && !defined(hpV4) && !defined(linux) && !defined(CSRG_BASED)
 int
 usleep(unsigned long usec)
 {
diff --git a/cde/programs/dtscreen/worm.c b/cde/programs/dtscreen/worm.c
index bdf0141..a806fac 100644
--- a/cde/programs/dtscreen/worm.c
+++ b/cde/programs/dtscreen/worm.c
@@ -88,12 +88,14 @@ typedef struct {
 int size[MAXCOLORS];
 }   wormstruct;
 
+#if !defined(CSRG_BASED)
 int
 round(x)
 float   x;
 {
 return ((int) floor((double) x));
 }
+#endif
 
 
 void
diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C 
b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
index 731fe91..1e7fdf1 100644
--- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
+++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
@@ -53,7 +53,7 @@
 #endif
 #include 
 
-#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(USL) || 
defined(__uxp__) || (linux)
+#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(USL) || 
defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
 #define UID_NO_CHANGE ((uid_t) -1)
 #define GID_NO_CHANGE ((gid_t) -1)
 #endif
@@ -80,6 +80,8 @@ UnixEnvironment::UnixEnvironment()
 manpath = "/usr/share/%L/man:/usr/share/man:/usr/local/man";
 #elif defined(linux)
 manpath = 
"/usr/share/man/%L:/usr/share/man:/usr/contrib/man/%L:/usr/contrib/man:/usr/local/man/%L:/usr/local/man";
+#elif defined(__OpenBSD__)
+   manpath = 
"/usr/share/man:/usr/X11R6/man:/usr/local/man:/usr/ports/infrastructure/man";
 #endif
 else
manpath = temp;
diff --git a/cde/programs/dtsession/SmConMgmt.c 
b/cde/programs/dtsession/SmConMgmt.c
index aa0f678..23ed57c 100644
--- a/cde/programs/dtsession/SmConMgmt.c
+++ b/cde/programs/dtsession/SmConMgmt.c
@@ -163,7 +163,7 @@ GetMemoryUtilization(void)
 #if !defined(linux)
 static int init = 0;
 static kmem;
-#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && 
!defined (__osf__)
+#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && 
!defined (__osf__) && !defined(CSRG_BASED)
 extern void nlist();
 #endif
 int i;
diff --git a/cde/programs/dtsession/SmGlobals.c 
b/cde/programs/dtsession/SmGlobals.c
index 36c3511..4bda658 100644
--- a/cde/programs/dtsession/SmGlobals.c
+++ b/cde/programs/dtsession/SmGlobals.c
@@ -1352,7 +1352,7 @@ RemoveFiles(
 
 _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 setsid();
 #else
 (void) setpgrp();
@@ -1457,7 +1457,7 @@ MoveDirectory(
 
 _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 setsid();
 #else
 (void) setpgrp();
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] localisations

2012-08-11 Thread Pascal Stumpf

See patch.
>From 8f32716f7b34ab01357b42e6040596b1b967653b Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 14:08:03 +0200
Subject: [PATCH] OpenBSD #ifdefs for imake templates for localisations.

---
 cde/programs/localized/templates/French.tmpl   |2 +-
 cde/programs/localized/templates/German.tmpl   |2 +-
 cde/programs/localized/templates/Italian.tmpl  |2 +-
 cde/programs/localized/templates/Spanish.tmpl  |2 +-
 cde/programs/localized/templates/app-defaults.tmpl |6 +++---
 cde/programs/localized/templates/msg.C.tmpl|4 ++--
 cde/programs/localized/templates/types.tmpl|8 
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cde/programs/localized/templates/French.tmpl 
b/cde/programs/localized/templates/French.tmpl
index 7e02939..0bc6c96 100644
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -31,6 +31,6 @@ LANG=fr
 LANG=fr
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 LANG=fr_FR.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/German.tmpl 
b/cde/programs/localized/templates/German.tmpl
index 890b333..53be70f 100644
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -31,6 +31,6 @@ LANG=de
 LANG=de
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 LANG=de_DE.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/Italian.tmpl 
b/cde/programs/localized/templates/Italian.tmpl
index ccc368b..4e8f243 100644
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -31,6 +31,6 @@ LANG=it
 LANG=it
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 LANG=it_IT.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/Spanish.tmpl 
b/cde/programs/localized/templates/Spanish.tmpl
index 532d01e..69d1fb3 100644
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -31,6 +31,6 @@ LANG=es
 LANG=es
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 LANG=es_ES.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/app-defaults.tmpl 
b/cde/programs/localized/templates/app-defaults.tmpl
index c835823..9198b02 100644
--- a/cde/programs/localized/templates/app-defaults.tmpl
+++ b/cde/programs/localized/templates/app-defaults.tmpl
@@ -8,7 +8,7 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 XCOMM no dtinfo for linux/fbsd
 DTINFO=
 #else
@@ -56,7 +56,7 @@ LinkFile(Dtcm.nls,$(CDESRC)/dtcm/dtcm/Dtcm.ad)
 LinkFile(Dtterm.nls,$(CDESRC)/dtterm/Dtterm.ad)
 LinkFile(Dtmail.nls,$(CDESRC)/dtmail/dtmail/Dtmail)
 LinkFile(Dtbuilder.nls,$(CDESRC)/dtappbuilder/src/ab/Dtbuilder.ad)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && 
!defined(OpenBSDArchitecture)
 XCOMM no dtinfo for linux/fbsd
 LinkFile(Dtinfo.nls,$(CDESRC)/dtinfo/dtinfo/src/Dtinfo)
 #endif
@@ -80,7 +80,7 @@ DtstyleDescRule(Dtcm,Dtcm)
 DtstyleDescRule(Dtterm,Dtterm)
 DtstyleDescRule(Dtmail,Dtmail)
 DtstyleDescRule(Dtbuilder,Dtbuilder)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && 
!defined(OpenBSDArchitecture)
 XCOMM no dtinfo for linux/fbsd
 DtstyleDescRule(Dtinfo,Dtinfo)
 #endif
diff --git a/cde/programs/localized/templates/msg.C.tmpl 
b/cde/programs/localized/templates/msg.C.tmpl
index aa1a88d..eeb4fc9 100644
--- a/cde/programs/localized/templates/msg.C.tmpl
+++ b/cde/programs/localized/templates/msg.C.tmpl
@@ -8,7 +8,7 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 XCOMM no dtinfo for linux/fbsd
 DTINFOCATS=
 #else
@@ -93,7 +93,7 @@ 
LinkFile(dthelpgen.msg,$(CDESRC)/dthelp/dthelpgen/dthelpgen.msg)
 LinkFile(dthelpprint.msg,$(CDESRC)/dthelp/dthelpprint/dthelpprint.msg)
 LinkFile(dticon.msg,$(CDESRC)/dticon/dticon.msg)
 LinkFile(dtimsstart.msg,$(CDESRC)/dtimsstart/dtimsstart.msg)
-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchite

[cdesktopenv-devel] nsgmls

2012-08-11 Thread Pascal Stumpf

See patch.
>From d6d86e42f39b750f965608e359b9d05efc1c7732 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 14:09:40 +0200
Subject: [PATCH] Make nsgmls compile on OpenBSD.

As far as I can tell, the duplicate instantiations from entmgr_inst.m4 are
unnecessary and only cause compile failures without -fpermissive.
---
 cde/programs/nsgmls/CmdLineApp.C   |4 ++--
 cde/programs/nsgmls/CmdLineApp.h   |2 +-
 cde/programs/nsgmls/CodingSystem.C |4 ++--
 cde/programs/nsgmls/CodingSystem.h |2 +-
 cde/programs/nsgmls/OutputCharStream.C |4 ++--
 cde/programs/nsgmls/OutputCharStream.h |2 +-
 cde/programs/nsgmls/config.h   |2 +-
 cde/programs/nsgmls/entmgr_inst.m4 |6 --
 cde/programs/nsgmls/nsgmls.C   |8 
 cde/programs/nsgmls/xnew.h |2 +-
 10 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/cde/programs/nsgmls/CmdLineApp.C b/cde/programs/nsgmls/CmdLineApp.C
index b2f7468..4ba7cbc 100644
--- a/cde/programs/nsgmls/CmdLineApp.C
+++ b/cde/programs/nsgmls/CmdLineApp.C
@@ -58,7 +58,7 @@
 
 #include "ConsoleOutput.h"
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 #include 
 using namespace std;
@@ -292,7 +292,7 @@ Boolean CmdLineApp::openFilebufWrite(filebuf &file,
 return 0;
   return file.attach(fd) != 0;
 #else
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   return file.open(filename, ios::out|ios::trunc) != 0;
 #else
   return file.open(filename, ios::out|ios::trunc|IOS_BINARY) != 0;
diff --git a/cde/programs/nsgmls/CmdLineApp.h b/cde/programs/nsgmls/CmdLineApp.h
index 98f5773..45d505f 100644
--- a/cde/programs/nsgmls/CmdLineApp.h
+++ b/cde/programs/nsgmls/CmdLineApp.h
@@ -43,7 +43,7 @@
 #include 
 #endif
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 using namespace std;
 #else
diff --git a/cde/programs/nsgmls/CodingSystem.C 
b/cde/programs/nsgmls/CodingSystem.C
index ad7935a..6f9e520 100644
--- a/cde/programs/nsgmls/CodingSystem.C
+++ b/cde/programs/nsgmls/CodingSystem.C
@@ -33,7 +33,7 @@
 #ifdef SP_SHORT_HEADERS
 #include 
 #else
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #include 
@@ -82,7 +82,7 @@ String OutputCodingSystem::convertOut(const StringC 
&str) const
   encoder->output(copy.data(), copy.size(), &stream);
   delete encoder;
   char *s = stream.str();
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   String result(s, stream.pcount());
 #else
   String result(s, stream.out_waiting());
diff --git a/cde/programs/nsgmls/CodingSystem.h 
b/cde/programs/nsgmls/CodingSystem.h
index e073ae5..62adbd0 100644
--- a/cde/programs/nsgmls/CodingSystem.h
+++ b/cde/programs/nsgmls/CodingSystem.h
@@ -41,7 +41,7 @@
 
 #include 
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 using namespace std;
 #else
diff --git a/cde/programs/nsgmls/OutputCharStream.C 
b/cde/programs/nsgmls/OutputCharStream.C
index fd1f758..1739437 100644
--- a/cde/programs/nsgmls/OutputCharStream.C
+++ b/cde/programs/nsgmls/OutputCharStream.C
@@ -28,7 +28,7 @@
 #include "OutputCharStream.h"
 #include "CodingSystem.h"
 #include "macros.h"
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #include 
@@ -148,7 +148,7 @@ void IosOutputCharStream::flush()
 encoder_->output(buf_, ptr_ - buf_, byteStream_);
 ptr_ = buf_;
   }
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   byteStream_->pubsync();
 #else
   byteStream_->sync();
diff --git a/cde/programs/nsgmls/OutputCharStream.h 
b/cde/programs/nsgmls/OutputCharStream.h
index 15088bb..7551bfd 100644
--- a/cde/programs/nsgmls/OutputCharStream.h
+++ b/cde/programs/nsgmls/OutputCharStream.h
@@ -33,7 +33,7 @@
 #include "Owner.h"
 #include "CodingSystem.h"
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 using namespace std;
 #else
diff --git a/cde/programs/nsgmls/config.h b/cde/programs/nsgmls/config.h
index 7859a9c..2f7bcc9 100644
--- a/cde/programs/nsgmls/config.h
+++ b/cde/programs/nsgmls/config.h
@@ -32,7 +32,7 @@
 
 #ifdef __GNUG__
 // It's not missing, but it pulls in libg++
-#if !defined(linux)
+#if !defined(linux) && !defined(CSRG_BASED)
 #define SP_NEW_H_MISSING
 // set_new_handler() has to be declared extern "C"
 #define SP_SET_NEW_HANDLER_EXTERN_C
diff --git a/cde/programs/nsgmls/entmgr_inst.m4 
b/cde/programs/nsgmls/entmgr_inst.m4
index 79a9784..20002a8 100644
--- a/cde/programs/nsgmls/entmgr_inst.m4
+++ b/cde/programs/nsgmls/entmgr_inst.m4
@@ -61,7 +61,6 @@ __instantiate(`RangeMapIter')
 __instantiate(`RangeMap')
 __instantiate(Vector)
 __instantiate(Vector)
-__instantiate(Vector >)
 __instantiate(Owner)
 __instantiate(ISet)
 __instantiate(Vector >)
@@ -71,16 +70,11 @@ __instantiate(ISetIter)
 _

[cdesktopenv-devel] ttsnoop

2012-08-11 Thread Pascal Stumpf

See patch.
>From 5cb4665c3777b64fd1b6d56d9ec947dcef91301b Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sat, 11 Aug 2012 14:12:47 +0200
Subject: [PATCH] OpenBSD patches for ttsnoop.

Mostly adding std:: for strstream interfaces.
---
 cde/programs/ttsnoop/DtTt.C  |   26 +++---
 cde/programs/ttsnoop/callbackChooser_stubs.C.src |4 +-
 cde/programs/ttsnoop/fileChooser_stubs.C.src |8 +++---
 cde/programs/ttsnoop/messageProps_stubs.C.src|   10 
 cde/programs/ttsnoop/patternProps_stubs.C.src|4 +-
 cde/programs/ttsnoop/sessionChooser_stubs.C.src  |4 +-
 cde/programs/ttsnoop/ttChooser_stubs.C.src   |6 ++--
 cde/programs/ttsnoop/ttsnoop.C.src   |   12 +-
 cde/programs/ttsnoop/ttsnoop_stubs.C.src |   12 +-
 9 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/cde/programs/ttsnoop/DtTt.C b/cde/programs/ttsnoop/DtTt.C
index 26315dd..0f55c75 100644
--- a/cde/programs/ttsnoop/DtTt.C
+++ b/cde/programs/ttsnoop/DtTt.C
@@ -34,7 +34,7 @@
 #include 
 #include 
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #include 
@@ -468,7 +468,7 @@ DtTtSetLabel(
 )
 {
 Tt_status status = tt_ptr_error( val );
-ostrstream errStream;
+std::ostrstream errStream;
 errStream << func << " = " << val << " (" << status << ")" << ends;
 char *label = errStream.str();
 DtTtSetLabel( labelWidget, label );
@@ -483,7 +483,7 @@ DtTtSetLabel(
Tt_status status
 )
 {
-ostrstream errStream;
+std::ostrstream errStream;
 errStream << func << " = " << status << ends;
 char *label = errStream.str();
 DtTtSetLabel( labelWidget, label );
@@ -498,7 +498,7 @@ DtTtSetLabel(
int returnVal
 )
 {
-ostrstream errStream;
+std::ostrstream errStream;
 errStream << func << " = " << returnVal << ends;
 char *label = errStream.str();
 DtTtSetLabel( labelWidget, label );
@@ -519,7 +519,7 @@ _DtTtChoices(
return 0;
}
for (int i = 0; i < count; i++) {
-   ostrstream itemStream;
+   std::ostrstream itemStream;
itemStream << (void *)pPats[ i ];
char *name = (char *)
tt_pattern_user( *pPats[ i ], _DtTtPatsNameKey );
@@ -566,7 +566,7 @@ _DtTtChoices(
}
*itemCount = dtTtMessagesCount;
for (i = 0; i < dtTtMessagesCount; i++) {
-   ostrstream itemStream;
+   std::ostrstream itemStream;
itemStream << (void *)dtTtMessages[ i ];
char *op = tt_message_op( dtTtMessages[ i ] );
if (! tt_is_err( tt_ptr_error( op ))) {
@@ -592,7 +592,7 @@ _DtTtChoices(
}
*itemCount = dtTtPatternsCount;
for (i = 0; i < dtTtPatternsCount; i++) {
-   ostrstream itemStream;
+   std::ostrstream itemStream;
itemStream << (void *)dtTtPatterns[ i ] << ends;
items[ i ] = XmStringCreateLocalized(
itemStream.str() );
@@ -636,11 +636,11 @@ _DtOpen(
 )
 {
 char *file = tempnam( 0, AIX_CONST_STRING tempnamTemplate );
-ostrstream cmdStream;
+std::ostrstream cmdStream;
 cmdStream << cmd << " > " << file << ends;
 int sysStat = system( cmdStream.str() );
 if (! WIFEXITED( sysStat )) {
-   ostrstream func;
+   std::ostrstream func;
func << "system( \"" << cmdStream.str() << "\" )" << ends;
DtTtSetLabel( label, func.str(), sysStat );
delete cmdStream.str();
@@ -662,12 +662,12 @@ _DtOpen(
const char *file
 )
 {
-ostrstream labelStream;
+std::ostrstream labelStream;
 labelStream << "dtaction Open " << file << ends;
 DtTtSetLabel( label, labelStream.str() );
 delete labelStream.str();
 
-ostrstream cmd;
+std::ostrstream cmd;
 cmd << "( unset TT_TRACE_SCRIPT; if dtaction Open " << file
<< "; then :; else textedit " << file << "; fi; sleep 600; rm -f "
<< file << " ) &" << ends;
@@ -699,12 +699,12 @@ _DtMan(
const char *topic
 )
 {
-ostrstream labelStream;
+std::ostrstream labelStream;
 labelStream << "dtaction Dtmanpageview " << topic << ends;
 DtTtSetLabel( label, labelStream.str() );
 delete labelStream.str();
 
-ostrstream cmd;
+std::ostrstream cmd;
 cmd &l

Re: [cdesktopenv-devel] dtinfo on OpenBSD

2012-08-11 Thread Pascal Stumpf

On Sat, 11 Aug 2012 13:52:08 +0200, Marc Balmer wrote:
> Wouldn't it be better to avoid the multiplication in malloc here, too?
> 
> i.e. instead of
> 
> > sets = (std::ostrstream **)
> > +   malloc(sizeof(std::ostrstream *) * sets_max);
> 
> use
> 
> > sets = (std::ostrstream **)
> > +   calloc(sizeof(std::ostrstream *), sets_max);
> 
> 
> (to avoid possible integer overflow)

Indeed, but in this patch I only bothered with making it work.
Replacing mallog(a*b) with calloc should be done as a separate effort
across the whole tree.

> 
> 
> --
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> ___
> cdesktopenv-devel mailing list
> cdesktopenv-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtmail actually does compile on OpenBSD ...

2012-08-12 Thread Pascal Stumpf

Seems there were some other changes that made it work, so disabling it
was unnecessary.
>From e12c05fd2b51777d4b11f024f59613a4dfb7ec75 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 12 Aug 2012 14:45:34 +0200
Subject: [PATCH] dtmail actually does work now on OpenBSD due to other
 changes.

---
 cde/programs/Imakefile |   14 ++
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index aefb92f..5dcebce 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -19,14 +19,9 @@ DTINFODIR =
 DTKSHDIR = dtksh
 DTINFODIR = dtinfo
 #endif
-#if defined(OpenBSDArchitecture)
-DTMAILDIR =
-#else
-DTMAILDIR = dtmail
-#endif
 
 
-SUBDIRS = dthelp dsdm $(DTMAILDIR) dtpad dtfile dtwm dtlogin \
+SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
dtcalc dtaction dtspcd \
dtscreen $(DTKSHDIR) dtcm dtsearchpath \
@@ -35,7 +30,7 @@ SUBDIRS = dthelp dsdm $(DTMAILDIR) dtpad dtfile dtwm dtlogin \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
 
-LINTSUBDIRS = dthelp dsdm $(DTMAILDIR) dtpad dtfile dtlogin dtwm \
+LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile dtlogin dtwm \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
dtcalc dtaction dtcreate \
dtscreen $(DTKSHDIR) dtcm dtsearchpath \
@@ -43,11 +38,6 @@ LINTSUBDIRS = dthelp dsdm $(DTMAILDIR) dtpad dtfile dtlogin 
dtwm \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
 
-#if !defined(OpenBSDArchitecture)
-SUBDIRS += dtmail
-LINTSUBDIRS += dtmail
-#endif
-
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 LintSubdirs($(LINTSUBDIRS))
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] DtHelp: Do not use internal libjpeg

2012-08-12 Thread Pascal Stumpf

See patch.
>From e14f3e896a38ec560e6ce897ebe7b3035bced4cf Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 12 Aug 2012 15:25:22 +0200
Subject: [PATCH] Do not use internal libjpeg.

Nowadays, OpenMotif is itself linked to libjpeg, so pulling in another
version of it causes symbol size mismatches, not to mention the maintenance
burden and security implications arising from keeping our own copy of libjpeg.

We still need some of the header files provided here because they are internal
to libjpeg and not installed on most distributions.
---
 cde/lib/DtHelp/Imakefile |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index eb219b5..3af280f 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -13,8 +13,8 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 
drk $
 #define IHaveSubdirs
 #define PassCDebugFlags/**/
 
-SUBDIRS = il jpeg
-DONES = il/DONE jpeg/DONE
+SUBDIRS = il
+DONES = il/DONE
 EXTRALIBRARYDEPS = $(DONES)
 
 MakeSubdirs($(SUBDIRS))
@@ -149,7 +149,7 @@ JPEG_OBJS = \
 jpeg/jdinput.o  jpeg/jerror.o   jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
-OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
+OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
 
 #include 
 
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] warning fixes for libDtSearch

2012-08-12 Thread Pascal Stumpf

See patch.

There is one warning which I am not sure how to fix.  It is triggered by
OpenBSD's -Wbounded:

cc -c -g -pipe -Wall -Wpointer-arith -Wno-unused -Wno-write-strings
-Wno-switch
 -I.  -I../../.. -I../../../exports/include -I/usr/local/include
-I/usr/X11R6/in
clude  -DCSRG_BASED -DANSICPP -DMULTIBYTE -DNLS16
-DOSMAJORVERSION=5 -DOSM
INORVERSION=2  -DFUNCPROTO=15 -DNARROWPROTO  -DXK_MISCELLANY -DMULTIBYTE
   -DCDE_INSTALLATION_TOP=\"/usr/local/dt\"
-DCDE_CONFIGURATION_TOP=\"
/etc/dt\"   -DNO_TRANS -DUNIX -DNO_CONST -D_POSIX_SOURCE
-DBSDSHLIB  -f
pic keyfcns.c^M
keyfcns.c: In function 'split_root':^M
keyfcns.c:841: warning: array size (1) smaller than bound length (4)^M
keyfcns.c:841: warning: array size (1) smaller than bound length (4)^M
keyfcns.c: In function 'delete':^M
keyfcns.c:930: warning: array size (1) smaller than bound length (4)^M
keyfcns.c:930: warning: array size (1) smaller than bound length (4)^M
keyfcns.c:1085: warning: array size (1) smaller than bound length (4)^M
keyfcns.c:1085: warning: array size (1) smaller than bound length (4)^M


What happens here is that it attempts to copy four bytes either into or
from a one-byte buffer.  To be honest, I don't have any idea how this
code is even supposed to work.  Can someone else have a look?
>From e01905229716f81f97075426d097430346b58523 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 12 Aug 2012 18:51:53 +0200
Subject: [PATCH] Low-hanging fruit: Fix most warnings in lib/DtSearch.

Most of these are related to missing includes and prototypes as well as
parens/braces.  A few are also potential 64bit issues.
---
 cde/lib/DtSearch/ausexit.c|1 +
 cde/lib/DtSearch/boolpars.c   |5 +++--
 cde/lib/DtSearch/boolsrch.c   |2 ++
 cde/lib/DtSearch/dbchange.c   |2 ++
 cde/lib/DtSearch/dtoe.c   |6 +-
 cde/lib/DtSearch/dtoeinit.c   |1 +
 cde/lib/DtSearch/dtsrapi.c|5 +++--
 cde/lib/DtSearch/dtsrutil.c   |1 +
 cde/lib/DtSearch/dtsrve.c |5 -
 cde/lib/DtSearch/hencode.c|1 +
 cde/lib/DtSearch/iscompat.c   |1 +
 cde/lib/DtSearch/jpn.c|7 ---
 cde/lib/DtSearch/lang.c   |8 +---
 cde/lib/DtSearch/msgs.c   |1 +
 cde/lib/DtSearch/objdate.c|1 +
 cde/lib/DtSearch/ocf.c|   17 ++---
 cde/lib/DtSearch/opendblk.c   |1 +
 cde/lib/DtSearch/raima/alloc.c|4 +---
 cde/lib/DtSearch/raima/cmtype.c   |1 +
 cde/lib/DtSearch/raima/connect.c  |5 +++--
 cde/lib/DtSearch/raima/cotype.c   |1 +
 cde/lib/DtSearch/raima/crget.c|3 ++-
 cde/lib/DtSearch/raima/crread.c   |1 +
 cde/lib/DtSearch/raima/crset.c|1 +
 cde/lib/DtSearch/raima/crtype.c   |1 +
 cde/lib/DtSearch/raima/crwrite.c  |1 +
 cde/lib/DtSearch/raima/csmget.c   |1 +
 cde/lib/DtSearch/raima/csmread.c  |1 +
 cde/lib/DtSearch/raima/csmset.c   |1 +
 cde/lib/DtSearch/raima/csmwrite.c |1 +
 cde/lib/DtSearch/raima/csoget.c   |1 +
 cde/lib/DtSearch/raima/csoread.c  |1 +
 cde/lib/DtSearch/raima/csoset.c   |1 +
 cde/lib/DtSearch/raima/csowrite.c |1 +
 cde/lib/DtSearch/raima/dbacode.c  |2 ++
 cde/lib/DtSearch/raima/dbdpath.c  |1 +
 cde/lib/DtSearch/raima/dbfpath.c  |1 +
 cde/lib/DtSearch/raima/dblfcns.c  |3 +++
 cde/lib/DtSearch/raima/dbtype.h   |4 
 cde/lib/DtSearch/raima/dbuserid.c |1 +
 cde/lib/DtSearch/raima/delete.c   |1 +
 cde/lib/DtSearch/raima/destroy.c  |1 +
 cde/lib/DtSearch/raima/dio.c  |   17 +
 cde/lib/DtSearch/raima/discon.c   |1 +
 cde/lib/DtSearch/raima/disdel.c   |1 +
 cde/lib/DtSearch/raima/fillnew.c  |1 +
 cde/lib/DtSearch/raima/findco.c   |1 +
 cde/lib/DtSearch/raima/findfm.c   |1 +
 cde/lib/DtSearch/raima/findlm.c   |1 +
 cde/lib/DtSearch/raima/findnm.c   |1 +
 cde/lib/DtSearch/raima/findpm.c   |1 +
 cde/lib/DtSearch/raima/initial.c  |2 ++
 cde/lib/DtSearch/raima/inittab.c  |1 +
 cde/lib/DtSearch/raima/ismember.c |1 +
 cde/lib/DtSearch/raima/isowner.c  |1 +
 cde/lib/DtSearch/raima/keydel.c   |1 +
 cde/lib/DtSearch/raima/keyexist.c |1 +
 cde/lib/DtSearch/raima/keyfcns.c  |   10 ++
 cde/lib/DtSearch/raima/keyfind.c  |1 +
 cde/lib/DtSearch/raima/keyfrst.c  |1 +
 cde/lib/DtSearch/raima/keylast.c  |1 +
 cde/lib/DtSearch/raima/keynext.c  |1 +
 cde/lib/DtSearch/raima/keyprev.c  |1 +
 cde/lib/DtSearch/raima/keystore.c |1 +
 cde/lib/DtSearch/raima/libfcns.c  |   22 ++
 cde/lib/DtSearch/raima/makenew.c  |2 ++
 cde/lib/DtSearch/raima/members.c  |1 +
 cde/lib/DtSearch/raima/opens.c|1 +
 cde/lib/DtSearch/raima/options.c  |2 ++
 cde/lib/DtSearch/raima/recfcns.c  |   12 
 cde/lib/DtSearch/raima/recfrst.c  |1 +
 cde/lib/DtSearch/raima/recnext.c  |1 +
 cde/lib/DtSearch/raima/r

[cdesktopenv-devel] cpp -traditional

2012-08-12 Thread Pascal Stumpf

See patch.
>From 4789df8593794a186533aa2d7e31a66bfb429de4 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 12 Aug 2012 19:33:25 +0200
Subject: [PATCH] Use cpp -traditional.

StandardCppOptions do not get respected here, so change the default CppCmd
to cpp -traditional like for FreeBSD.  Helps kill a few warnings.
---
 cde/config/cf/OpenBSD.cf |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index f297896..f0ba631 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -164,7 +164,7 @@ XCOMM operating system:  OSName 
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define MkdirHierCmd   mkdir -p
 
 #ifndef CppCmd
-#define CppCmd /usr/libexec/cpp
+#define CppCmd /usr/libexec/cpp -traditional
 #endif
 #define StandardCppOptions -traditional
 #define StandardCppDefines /**/
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] security fix for udbToAny.ksh

2012-08-12 Thread Pascal Stumpf

Always use mktemp(1) for generating a random filename in a shell script.
>From 5e7ecc7fc1615b2992bfbf8b16d4eaa74023d153 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 12 Aug 2012 20:27:32 +0200
Subject: [PATCH] Do not use the PID as a way of generating a "random"
 filename.

This script did not even check for the file's existence prior to cat'ing
random stuff into it.  Ouch.
---
 cde/admin/IntegTools/dbTools/udbToAny.ksh |   11 ++-
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cde/admin/IntegTools/dbTools/udbToAny.ksh 
b/cde/admin/IntegTools/dbTools/udbToAny.ksh
index 4c26e8b..655b627 100755
--- a/cde/admin/IntegTools/dbTools/udbToAny.ksh
+++ b/cde/admin/IntegTools/dbTools/udbToAny.ksh
@@ -142,7 +142,7 @@ ConvertRoutine()
;;
 esac
 
-   cat > /tmp/awk$$ < $TMPFILE <> /tmp/awk$$
-[ -z "$CUSTOM_PRINT" ]  || cat "$CUSTOM_PRINT_LIB" >> /tmp/awk$$
+cat "$UDB_PARSE_LIB" >> $TMPFILE
+[ -z "$CUSTOM_PRINT" ]  || cat "$CUSTOM_PRINT_LIB" >> $TMPFILE
 
 $AWK -v mailTo="$Administrator" \
 -v action="$DoAction" \
@@ -176,7 +176,7 @@ EOF
 -v UseDefaultBlocks="$UseDefaultBlocks" \
 -v DeBugFile="$DEBUGFILE" \
 -v DeBug="$DEBUGLEVEL" \
--f /tmp/awk$$ $*
+-f $TMPFILE $*
 
 
 #
@@ -185,7 +185,7 @@ EOF
 #   -f "$UDB_PARSE_LIB" \
 #
 
- rm /tmp/awk$$
+ rm $TMPFILE
 }
 
 #
@@ -246,6 +246,7 @@ typeset UDB_PARSE_LIB="$DBTOOLSRC/udbParseLib.awk"
 typeset CUSTOM_PRINT_LIB=""
 typeset DEBUGFILE="/dev/tty"
 typeset DEBUGLEVEL=0
+typeset TMPFILE=`mktemp /tmp/awkX`
 
 if [ $# -gt 2 ]; then 
 while [ $# -gt 0 ]
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Fix sym2num on OpenBSD

2012-08-12 Thread Pascal Stumpf

See patch.
>From c9fc412775e5665336170332478605b641ab8d3e Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 12 Aug 2012 21:27:19 +0200
Subject: [PATCH] sym2num: add path to cpp on OpenBSD.

---
 cde/programs/dtprintinfo/sym2num |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/cde/programs/dtprintinfo/sym2num b/cde/programs/dtprintinfo/sym2num
index 8799eb3..ba22f7e 100755
--- a/cde/programs/dtprintinfo/sym2num
+++ b/cde/programs/dtprintinfo/sym2num
@@ -58,6 +58,9 @@ awk '/^\$set/ { SET_NAME=$2; SET_COUNT++; MES_COUNT=0;
 if [[ -f /usr/ccs/lib/cpp ]]   #IBM & SUN
 then
cpp_path=/usr/ccs/lib   
+elif [[ -f /usr/libexec/cpp ]] #BSD
+then
+   cpp_path=/usr/libexec
 elif [[ -f /lib/cpp ]] #HP
 then
cpp_path=/lib
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] [PATCH] some tweaks for configRun: add -h/--usage option, use portable print instead of echo \c, etc.

2012-08-12 Thread Pascal Stumpf

On Sun, 12 Aug 2012 14:41:42 -0600 (MDT), Jon Trulson wrote:
> On Sun, 12 Aug 2012, Douglas Mencken wrote:
> 
> >> I am pretty sure that 'echo -n' and 'echo -e' work everywhere.  Why
> >> not use those instead?
> >
> > printf is available everywhere; "echo -n" is an exotic, "echo -e" is
> > much more exotic
> >
> 
> No, I have yet to see a system where echo -n/-e was not supported,
> even on ancient systems.
> 
> I had thought printf was a bash addition.  ksh supports print, but
> even there -n/-e for echo works..

printf is POSIX.  Whether that's a separate utility or a shell built-in
is left up to the implementation.

echo is impossible to be used portably, as stated in the "APPLICATION
USAGE" section on echo.  Therefore, POSIX recommends always using
printf(1).

Also, from RATIONALE:

As specified, echo writes its arguments in the simplest of ways. The two
different historical
versions of echo vary in fatally incompatible ways.

The BSD echo checks the first argument for the string -n which causes it
to suppress the
 that would otherwise follow the final argument in the output.

The System V echo does not support any options, but allows escape
sequences within its
operands, as described for XSI implementations in the OPERANDS section.

And in fact, this situation is even worse due to the fact that echo too
can be implemented as a shell built-in, often with different options
than the stand-alone command.  For instance, on OpenBSD:
23:01 ~ $ echo -e foo
foo
23:01 ~ $ /bin/echo -e foo
-e foo
23:01 ~ $ 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] WIP: dtbuilder on 64bit, fix it on 32bit

2012-08-13 Thread Pascal Stumpf

Please test this patch on 32bit, it should fix the dtbuilder crashes
people were seeing.  Also note that dtbuilder still crashes on 64bit ...
>From 8c68bec54adb88c223e170e3945d40028f2b9c85 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 13 Aug 2012 17:35:34 +0200
Subject: [PATCH] WIP to make dtbuilder work on 64bit.

Fixes many, though not all 64bit-warnings.  In lots of places, pointers are
cast to ints to be then used as array subscripts.  The only way to deal with
this is to change them to long.  Additionally, use calloc() to allocate the
int_array in istr.c and drop the (wrong) macro patch to istr.h.  Should make
dtbuilder work on 32bit again.
---
 cde/programs/dtappbuilder/src/ab/abobj_layout.c|2 +-
 cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c  |   12 +++---
 cde/programs/dtappbuilder/src/ab/connP.h   |4 +-
 cde/programs/dtappbuilder/src/ab/conn_obj.c|   16 
 cde/programs/dtappbuilder/src/ab/conn_stubs.c  |   16 
 .../dtappbuilder/src/ab/message_ed_stubs.c |   10 ++--
 cde/programs/dtappbuilder/src/abmf/abmf.c  |3 +-
 cde/programs/dtappbuilder/src/abmf/abmfP.h |2 +-
 cde/programs/dtappbuilder/src/abmf/args.c  |2 +-
 cde/programs/dtappbuilder/src/abmf/connect.c   |2 +-
 cde/programs/dtappbuilder/src/abmf/stubs_c_file.c  |2 +-
 cde/programs/dtappbuilder/src/libABil/abuil_load.c |4 +-
 .../src/libABil/abuil_resource_attr_map.c  |   24 +-
 cde/programs/dtappbuilder/src/libABil/abuil_trav.c |2 +-
 cde/programs/dtappbuilder/src/libABil/bil.c|   22 +-
 .../dtappbuilder/src/libABil/bil_loadatt.c |2 +-
 cde/programs/dtappbuilder/src/libABil/bil_store.c  |   10 ++--
 .../dtappbuilder/src/libABil/gil_loadobj.c |2 +-
 .../dtappbuilder/src/libABobj/obj_fields.c |   10 +++--
 cde/programs/dtappbuilder/src/libABobj/obj_list.c  |6 +-
 .../dtappbuilder/src/libABobj/obj_names_list.c |4 +-
 .../dtappbuilder/src/libABobj/obj_scoped.c |2 +-
 cde/programs/dtappbuilder/src/libABobj/obj_utils.c |6 +-
 .../dtappbuilder/src/libABobjXm/objxm_args.c   |2 +-
 .../dtappbuilder/src/libABobjXm/objxm_strs.c   |   12 +++---
 .../dtappbuilder/src/libABobjXm/objxm_util.c   |8 ++--
 cde/programs/dtappbuilder/src/libAButil/istr.c |   44 ++--
 cde/programs/dtappbuilder/src/libAButil/istr.h |5 +-
 cde/programs/dtappbuilder/src/libAButil/strlist.c  |   27 ++--
 cde/programs/dtappbuilder/src/libAButil/strlist.h  |   14 +++---
 30 files changed, 141 insertions(+), 136 deletions(-)

diff --git a/cde/programs/dtappbuilder/src/ab/abobj_layout.c 
b/cde/programs/dtappbuilder/src/ab/abobj_layout.c
index c4c2daa..45a95bb 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_layout.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_layout.c
@@ -110,7 +110,7 @@ abobj_calculate_new_layout(
 Positionx, y;
 Dimension   width, height;
 Dimension   p_width, p_height;
-intgridpos;
+long   gridpos;
 
 if ((attachments = obj->attachments) == NULL)
 return -1;
diff --git a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c 
b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
index 41d18ef..bbea9cc 100644
--- a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
@@ -258,7 +258,7 @@ static void set_attach_values(
PropOptionsSetting  objlist_setting,
int offset_value,
int position_value,
-   int objlist_value
+   XtPointer   objlist_value
);
 
 static voidchange_attach_type(
@@ -2642,7 +2642,7 @@ set_attach_values(
 PropOptionsSetting objlist_setting,
 intoffset_value,
 intposition_value,
-intobjlist_value
+XtPointer  objlist_value
 )
 {
 switch (attach_type)
@@ -2945,7 +2945,7 @@ convert_offset_position(
 /*
 set_attach_values(attach_type, 
offset_setting, position_setting, objlist_setting, 
-   offset_value, position_value, (int)sibling_obj);
+   offset_value, position_value, (XtPointer)sibling_obj);
 */
 
 *ret_offset = offset_value;
@@ -3068,7 +3068,7 @@ change_attach_type(
  */
 set_attach_values(attach_type, 
offset_setting, position_setting, objlist_setting, 
-   offset, position, (int)attach_obj);
+   offset, position, (XtPointer)attach_obj);
 }
 
 
@@ -3263,7 +3263,7 @@ change_opp_attach_type(
  */
 set_attach_values(opp_attach_type, 
opp_offset_setting, opp_position_setting, opp_objlist_s

Re: [cdesktopenv-devel] [PATCH 3/4] Skip building m-guides and dtksh for FreeBSD

2012-08-13 Thread Pascal Stumpf

On Mon, 13 Aug 2012 16:54:39 +0200, Joshuah Hurst wrote:
> On Mon, Aug 13, 2012 at 12:59 PM, Marcin Cieslak  wrote:
> > On Mon, 13 Aug 2012, Irek Szczesniak wrote:
> >
> >> On Mon, Aug 13, 2012 at 4:01 AM, Marcin Cieslak  wrote:
> >> > ---
> >> >  cde/doc/C/Imakefile|2 +-
> >> >  cde/programs/Imakefile |2 +-
> >> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> >> Why are you disabling dtksh? It's an integral part of CDE and required
> >> for functionality like DtBuilder.
> >
> > It does not compile right now; the build of dtksh is temporarily
> > disabled for Linux so it seems we need to do for FreeBSD
> > for the build to continue.
> >
> > I fully agree we need to get it working.
> 
> At some point in the future we need to look at updating the ksh93 base
> of dtksh. dtksh is currently based on ksh93d-, which is an alpha
> version. The current AT&T ksh stable upstream version is ksh93u+, ~15
> years newer, much more stable and much more portable. Runs on Linux
> (Suse, Fedora, embedded, etc), FreeBSD, NetBSD, Solaris, Illumos,
> HP/UX, too.
> The license issues (if there are actually any, so far I haven't seen
> proof by a lawyer) are solvable by using libshell.so.1, which is ksh93
> as shared library.

Possibly the best solution is asking the Open Group for permission to
link dtksh to a static libshell.

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] WIP: dtbuilder on 64bit, fix it on 32bit

2012-08-13 Thread Pascal Stumpf

On Mon, 13 Aug 2012 15:10:51 -0400, William Schaub wrote:
> On 08/13/2012 11:42 AM, Pascal Stumpf wrote:
> > Please test this patch on 32bit, it should fix the dtbuilder crashes
> > people were seeing.  Also note that dtbuilder still crashes on 64bit ...
> >
> Seems to work for me on 32bit ARM.

Wow.  I had no idea CDE even worked on ARM. :)

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] fix dtmail build on OpenBSD

2012-08-19 Thread Pascal Stumpf

See patch.
>From 5837eaeaa8bc310c049c4f796868ac6fdd38ba24 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 19 Aug 2012 18:19:40 +0200
Subject: [PATCH] OpenBSD still uses GNU iconv, so the second argument to
 iconv(3) is not const.

---
 cde/programs/dtmail/libDtMail/Common/Session.C  |2 +-
 cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C 
b/cde/programs/dtmail/libDtMail/Common/Session.C
index 0c664cc..5ad49d0 100644
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -1618,7 +1618,7 @@ char *from_cs, char *to_cs)
DtMailEnv error;
iconv_t cd;
size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0;
-#if defined(_AIX) || defined(sun) | defined(CSRG_BASED)
+#if defined(_AIX) || defined(sun) || defined(__FreeBSD__)
const char *ip = (const char *) *bp;
 #else
char *ip = *bp;
diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C 
b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
index 172b844..0651149 100644
--- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
@@ -1030,7 +1030,7 @@ char *from_cs, char *to_cs)
DtMailEnv error;
iconv_t cd;
size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0;
-#if defined(_aix) || defined(sun) || defined(CSRG_BASED)
+#if defined(_aix) || defined(sun) || defined(__FreeBSD__)
const char *ip = (const char *) *bp;
 #else
char *ip = *bp;
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtksh on OpenBSD

2012-08-19 Thread Pascal Stumpf

This works on OpenBSD too.
>From ab5069cde5883590fbf211b7dea73fe776c82239 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 19 Aug 2012 18:33:42 +0200
Subject: [PATCH] Build dtksh on OpenBSD.

This needs ksh93 to bootstrap, available in the openbsd-wip for now as a port,
due to be committed some time soon ...
---
 cde/config/cf/OpenBSD.cf |4 
 cde/programs/Imakefile   |4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index f0ba631..dab1cec 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1028,5 +1028,9 @@ install:: fonts.alias 
@@\
 #define RandomMotifMessageCatalogRule(target)
 #endif
 
+#ifndef KornShell
+#define KornShell   /usr/local/bin/ksh93
+#endif
+
 /* This must come last */
 #include 
diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index f6b1835..da64fb7 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -12,10 +12,10 @@ EXTRADIRS += util
 
 XCOMM some of these cannot be built on linux yet.
 XCOMM dtksh dtinfo
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture)
 DTKSHDIR = 
 DTINFODIR = 
-#elif defined(FreeBSDArchitecture)
+#elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
 DTKSHDIR = dtksh
 DTINFODIR = 
 #else
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] [EARLY PATCH] FreeBSD: Early support for the installer

2012-08-19 Thread Pascal Stumpf

On Thu, 16 Aug 2012 04:22:10 +0200, Marcin Cieslak wrote:
> This is work in progress - please
> do not merge into master yet.
> 
> Note to users: please check
> if you are affected by awk bug
> in udbParseLib.awk if you can.
> 
> Just remove this line:
> 
>   DUMMY = $0
> 
> and run "make clean all" in "databases"
> and see if generated files are small
> and contain only the error message.

It seems everyone using the "one true awk" is affected by this bug.
Have you made progress in tracking this down yet?  Why and how does that
line work around the problem?  It is probably worth reporting upstream.

FWIW, I've just been resorting to using GNU Awk for now.

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] fix localized build on OpenBSD

2012-08-19 Thread Pascal Stumpf

See patch.
>From 6dc2b168d18080e924334933fdae17574abe Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 19 Aug 2012 19:35:38 +0200
Subject: [PATCH] Fix localized build on OpenBSD.

Use the same set of langs as on Linux and FreeBSD (no Japanese), don't
redefine a needed macro as no-op, and unset LC_CTYPE in the environment
when building cat files.
---
 cde/config/cf/OpenBSD.cf  |4 
 cde/config/cf/site.def|2 +-
 cde/programs/localized/templates/header2.tmpl |2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index dab1cec..163c40b 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1024,10 +1024,6 @@ install:: fonts.alias
@@\
 
 #define BuildLibPathVarLD_LIBRARY_PATH
 
-#ifndef RandomMotifMessageCatalogRule
-#define RandomMotifMessageCatalogRule(target)
-#endif
-
 #ifndef KornShell
 #define KornShell   /usr/local/bin/ksh93
 #endif
diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index e18d4af..1c7643b 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -90,7 +90,7 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 
mgreess $
 
 XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
 XCOMM  or building non-C locales will cause build failures.
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 
it_IT.ISO8859-1
 #endif
 
diff --git a/cde/programs/localized/templates/header2.tmpl 
b/cde/programs/localized/templates/header2.tmpl
index 753f11b..a7d3019 100644
--- a/cde/programs/localized/templates/header2.tmpl
+++ b/cde/programs/localized/templates/header2.tmpl
@@ -14,6 +14,8 @@ target.cat : target.msg   
@@\
@echo "Running mkcatdefs for $@ with LANG set to $(LANG)"   @@\
( \ @@\
  rm -f $@ target.tmp.msg; \@@\
+ LC_CTYPE=""; \@@\
+ export LC_CTYPE; \@@\
  LANG=$(LANG); \   @@\
  export LANG; \@@\
  $(MKCATTOOL) $(@:.cat=) $(@:.cat=.msg) -h > target.tmp.msg; \ @@\
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] fix localized build on OpenBSD

2012-08-19 Thread Pascal Stumpf

On Sun, 19 Aug 2012 18:59:35 +, Marcin Cieslak wrote:
> On Sun, 19 Aug 2012, Pascal Stumpf wrote:
> 
> > See patch.
> 
> 
> Just curious, why is this:
> 
> + LC_CTYPE=""; \@@\
> + export LC_CTYPE; \@@\
> 
> necessary?
> 
> I build CDE having LANG=pl_PL.UTF-8 without visible issues.

Well, LANG already gets reset to a sensible value.  If it does indeed
work on FreeBSD with LC_CTYPE set, then this is probably an OS-dependent
problem.

> 
> //Marcin
> 
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] fix localized build on OpenBSD

2012-08-20 Thread Pascal Stumpf

On Sun, 19 Aug 2012 20:25:12 +, Marcin Cieslak wrote:
> On Sun, 19 Aug 2012, Pascal Stumpf wrote:
> 
> > Well, LANG already gets reset to a sensible value.  If it does indeed
> > work on FreeBSD with LC_CTYPE set, then this is probably an OS-dependent
> > problem.
> 
> No, I do not change any of LC_* variables.
> 
> I was not sure what is your goal here.

Fixing the build.  It breaks for me if I have LC_CTYPE set to something
like en_US.UTF-8.

> If we just want to avoid the user setting other LC_* variables,
> then LC_ALL is the solution; but I am not sure we should use
> that in the build scripts.

LC_CTYPE should be enough to change program behaviour.  Besides, this is
only in a subshell.  It does not tamper with the actual environment.

> //Marcin
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] [PATCH] Use KORNSHELL variable instead of /bin/ksh

2012-08-23 Thread Pascal Stumpf

On Thu, 23 Aug 2012 17:49:26 +0200, Marcin Cieslak wrote:
> This patch removes instances of hardcoded
> invocation of /bin/ksh and allows to
> replace it with, for, example,
> /usr/local/bin/ksh93
> 
> Also "ksh93" is accepted whenever "ksh" is.

Have you looked at whether ksh is actually required everywhere or if
it's trivial to use just a POSIX-compliant shell?  Should be easier to
test on FreeBSD.

Also,

execlp(KORNSHELL, "ksh", "-c", cmd, NULL);

this will require both a "ksh" and "ksh93" binary on FreeBSD ...

> Tested using the following /bin/ksh:
> 
> 8<
> WHAT=`ps -o command= -p $PPID`
> msg="Something tried to call /bin/ksh: $PPID: $WHAT"
> print -u2 "$msg"
> logger user.warn "$msg"
> exit 99
> 8<
> (Warning: first two lines are FreeBSD specific)
> 
> Scripts from Makefiles should now be executed either
> with
> 
> $(KORNSHELL) korn-shell-script
> 
> or
> 
> $(SHELL) bourne-shell-script
> 
> therefore #!/bin/ksh has not been changed everywhere.
> 
> /usr/dt/bin/ scripts have been converted (e.g. Xsession)
> 
> Whenever possible Imake and CPP facilities have been used.
> 
> For C and C++ programs KORNSHELL needs to be defined to
> "/path/to/your/ksh" (with quotes) so that it can make
> a valid C constant.
> 
> Therefore, when adding KORNSHELL to Imakefile for C files,
> you have to add
> 
> CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\"
> 
> or similar (for example, see programs/dtprintinfo)
> 
> But for simple shell script substitution we usually change
> 
>  LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
>  -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
>  -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP)
> 
> to:
> 
>  LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
>  -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
>  -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
>  -DKORNSHELL=$(KORNSHELL) \
>  -DXPROJECTROOT=X11ProjectRoot
> 
> since we don't want quotes for shell scripts.
> ---
>  cde/admin/IntegTools/dbTools/Imakefile |1 +
>  cde/admin/IntegTools/dbTools/dinstallCDE.src   |6 +++---
>  cde/admin/IntegTools/dbTools/installCDE.src|   12 ++--
>  cde/admin/IntegTools/dbTools/linksLast |2 +-
>  cde/admin/IntegTools/dbTools/uncomment |2 +-
>  cde/programs/dtappintegrate/Imakefile  |3 ++-
>  cde/programs/dtappintegrate/dtappintegrate.src |2 +-
>  cde/programs/dtfile/Find.c |2 +-
>  cde/programs/dtfile/Imakefile  |3 ++-
>  cde/programs/dtlogin/config/0015.sun.env.src   |2 +-
>  cde/programs/dtlogin/config/0050.dtxmodmap.src |2 +-
>  cde/programs/dtlogin/config/0060.dtsysenv.src  |2 +-
>  cde/programs/dtlogin/config/Imakefile  |1 +
>  cde/programs/dtlogin/config/Xreset.src |2 +-
>  cde/programs/dtlogin/config/Xsession.ow.src|2 +-
>  cde/programs/dtlogin/config/Xsession.ow2.src   |2 +-
>  cde/programs/dtlogin/config/Xsession.src   |   10 +-
>  cde/programs/dtlogin/config/Xsetup.src |2 +-
>  cde/programs/dtlogin/config/Xstartup.src   |2 +-
>  cde/programs/dtlogin/config/dtlslocale.src |2 +-
>  cde/programs/dtprintegrate/Imakefile   |3 ++-
>  cde/programs/dtprintegrate/dtprintegrate.src   |2 +-
>  cde/programs/dtprintinfo/libUI/MotifUI/Imakefile   |2 ++
>  .../dtprintinfo/libUI/MotifUI/MotifThread.C|2 +-
>  cde/programs/dtprintinfo/util/Imakefile|2 ++
>  cde/programs/dtprintinfo/util/Invoke.C |2 +-
>  cde/programs/dtsession/Imakefile   |1 +
>  cde/programs/dtsession/dtloadresources.src |2 +-
>  cde/programs/types/Imakefile   |3 ++-
>  cde/programs/types/unsupported.dt.src  |2 +-
>  cde/programs/types/uxstd.dt.src|   12 
>  cde/programs/types/xclients.dt.src |8 
>  32 files changed, 63 insertions(+), 40 deletions(-)
> 
> diff --git a/cde/admin/IntegTools/dbTools/Imakefile 
> b/cde/admin/IntegTools/dbTools/Imakefile
> index 2a9cb49..3885ac4 100644
> --- a/cde/admin/IntegTools/dbTools/Imakefile
> +++ b/cde/admin/IntegTools/dbTools/Imakefile
> @@ -3,6 +3,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/04/23 21:26:14 drk 
> $
>  LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
>  -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
>  -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
> +-DKORNSHELL=$(KORNSHELL) \
>  -Usun -Uusl -Uuxp -Uaix -Udec -UAIX -Uibm -Uhp
>  
>  AllTarget(installCDE dinstallCDE)
> diff --git a/cde/admin/IntegTools/dbTools/dinstallCDE.src 
> b/cde/admin/I

Re: [cdesktopenv-devel] [PATCH] Correction of paths for BSDs

2012-08-29 Thread Pascal Stumpf

Just one inline comment.

On Thu, 30 Aug 2012 02:35:35 +0200, Ulrich Wilkens wrote:
> This patch fixes some paths which are wrong for BSD systems.
> 
> -- 
> Ulrich Wilkens
> Email: m...@uwilkens.de
> 
> 
> >From 957de1fd41ff2ca5bd8c79f50e3d3919ea614487 Mon Sep 17 00:00:00 2001
> From: Ulrich Wilkens 
> Date: Thu, 30 Aug 2012 02:12:16 +0200
> Subject: [PATCH] Correction of paths for BSDs
> 
> ---
>  cde/.gitignore  |4 +
>  cde/osf/xmbind/0040.xmbind  |2 +-
>  cde/programs/dtcm/server/log.h  |4 +
>  cde/programs/dtimsstart/0020.dtims  |   91 --
>  cde/programs/dtimsstart/0020.dtims.src  |   92 
> +++
>  cde/programs/dtimsstart/Imakefile   |9 +++
>  cde/programs/dtlogin/config/Xservers.src|4 +
>  cde/programs/dtlogin/config/Xsession.src|   16 +
>  cde/programs/dtlogin/config/Xsetup.src  |6 ++-
>  cde/programs/dtlogin/config/Xstartup.src|8 +++
>  cde/programs/dtsearchpath/0010.dtpaths.src  |2 +-
>  cde/programs/dtsearchpath/0030.dttmpdir.src |2 +-
>  cde/programs/dtsearchpath/Imakefile |3 +-
>  13 files changed, 147 insertions(+), 96 deletions(-)
>  delete mode 100755 cde/programs/dtimsstart/0020.dtims
>  create mode 100755 cde/programs/dtimsstart/0020.dtims.src
> 
> diff --git a/cde/.gitignore b/cde/.gitignore
> index b7b872c..3d34ffa 100644
> --- a/cde/.gitignore
> +++ b/cde/.gitignore
> @@ -91,6 +91,7 @@ programs/dthelp/dthelpgen/dthelpgen
>  programs/dthelp/dthelpprint/dthelpprint
>  programs/dthelp/dthelpview/dthelpview
>  programs/dticon/dticon
> +programs/dtimsstart/0020.dtims
>  programs/dtimsstart/dtimsstart
>  programs/dtlogin/dtchooser
>  programs/dtlogin/dtgreet
> @@ -528,6 +529,7 @@ programs/dthelp/parser/pass2/util/fclndir
>  programs/dtinfo/clients/dtinfo_start/dtinfo_start
>  programs/dtinfo/clients/dtinfo_start/dtinfo_start.opnums
>  programs/dtinfo/dtinfo/install/lib/fonts/dtinfo.bdf
> +programs/dtinfo/dtinfo/install/lib/fonts/dtinfo.pcf.gz
>  programs/dtinfo/dtinfo/install/lib/fonts/dtinfo.pcf.Z
>  programs/dtinfo/dtinfo/src/Agents/Agents.d
>  programs/dtinfo/dtinfo/src/Agents/Agents.h
> @@ -1073,6 +1075,8 @@ programs/dtwm/sys.dtwmrc
>  # programs/fontaliases
>  programs/fontaliases/freebsd/C/dtinfo.bdf
>  programs/fontaliases/freebsd/C/dtinfo.pcf
> +programs/fontaliases/freebsd/C/dtinfo.pcf.gz
> +programs/fontaliases/freebsd/C/dtinfo.pcf.Z
>  programs/fontaliases/freebsd/C/fonts.dir
>  
>  # programs/ksh93
> diff --git a/cde/osf/xmbind/0040.xmbind b/cde/osf/xmbind/0040.xmbind
> index 1fbcd57..6aec74f 100755
> --- a/cde/osf/xmbind/0040.xmbind
> +++ b/cde/osf/xmbind/0040.xmbind
> @@ -1,4 +1,4 @@
> -#!/bin/ksh
> +#!/bin/sh
>  #
>  ###  File:  0040.xmbind
>  ###
> diff --git a/cde/programs/dtcm/server/log.h b/cde/programs/dtcm/server/log.h
> index 4510507..c93d5f1 100644
> --- a/cde/programs/dtcm/server/log.h
> +++ b/cde/programs/dtcm/server/log.h
> @@ -41,7 +41,11 @@
>  #define _DtCMS_DEFAULT_BAK   ".calbak"
>  #define _DtCMS_DEFAULT_TMP   ".caltmp"
>  #define _DtCMS_DEFAULT_DEL   ".caldel"
> +#if defined(CSRG_BASED)
> +#define  _DtCMS_DEFAULT_DIR  "/var/spool/calendar"
> +#else
>  #define  _DtCMS_DEFAULT_DIR  "/usr/spool/calendar"
> +#endif
>  #define  _DtCMS_DEFAULT_MODE (S_IRUSR|S_IRGRP|S_IWGRP)
>  
>  typedef enum {
> diff --git a/cde/programs/dtimsstart/0020.dtims 
> b/cde/programs/dtimsstart/0020.dtims
> deleted file mode 100755
> index 0cdc0f3..000
> --- a/cde/programs/dtimsstart/0020.dtims
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -#!/usr/bin/ksh
> -#
> -###  File:  0020.dtims
> -###
> -###  Default Location:  /usr/dt/config/Xsession.d/
> -###
> -###  Purpose:   Start desktop input method server if required
> -###
> -###  Description:
> -### This script is invoked by means of the Xsession file
> -### at user login. It starts an input method server as
> -### required for selected locales.
> -###
> -###  Invoked by:/usr/dt/bin/Xsession
> -###
> -###  Product:   @(#)Common Desktop Environment 1.0
> -###
> -###  Note:
> -###
> -###The /usr/dt/config/Xsession.d/0020.dtims file is a
> -###factory-default file and will be unconditionally overwritten upon
> -###subsequent installation. To customize input method server startup
> -###behavior, copy this file to the configuration directory,
> -###/etc/dt/config/Xsession.d and customize that version
> -###of the file.
> -###
> -###The value of DTSTARTIMS determines whether this file,
> -###/usr/dt/config/Xsession.d/0020.dtims, will start
> -###the specified input method server. Should an input method server
> -###be started from /etc/dt/config/Xsession.d/00

Re: [cdesktopenv-devel] [PATCH] Two fixes for dtmail

2012-08-30 Thread Pascal Stumpf

On Wed, 29 Aug 2012 22:06:05 -0400 (EDT), Christopher Turkel wrote:
> 
>  
> 
>  
> 
>  
> 
> -Original Message-
> From: Ulrich Wilkens 
> To: cdesktopenv-devel 
> Sent: Wed, Aug 29, 2012 9:52 pm
> Subject: [cdesktopenv-devel] [PATCH] Two fixes for dtmail
> 
> 
> This one fixes a bug where suid bit is needed for dtmail on BSD systems.
> It also fixes a bug where date/time is not displayed for some time zones.
> 
> 
> -- 
> Ulrich Wilkens
> Email: m...@uwilkens.de
> 
> 
> Does CDE build on OpenBSD yet? 

It builds, but does not run well yet on 64bit systems.  I'll be working
on runtime problems as soon as I've got more time at hand and the
majority of 64bit problems have been taken care of.  As soon as CDE is
sufficiently stable, I'll commit a port to OpenBSD CVS.

> --
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> ___
> cdesktopenv-devel mailing list
> cdesktopenv-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] OpenBSD

2012-09-09 Thread Pascal Stumpf

On Thu, 6 Sep 2012 19:31:02 -0400 (EDT), Christopher Turkel wrote:
> Hi
> 
> Can someone tell me the status of the OpenBSD port? If there are any
> special build instructions that should be on the wiki, etc.

I don't have time on my hands to work on it right now, but I'll try to
update my port in openbsd-wip in github to the new release in the next
week, but can't promise anything.

You will need xprintproto, libXp and Xprint support enabled in
openmotif, as well as a ksh93 port.  These are in the openbsd-wip repo
on github at the moment, but I hope to commit them soonish when I'm
back.

> 
> Thanks
> 
> --
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> ___
> cdesktopenv-devel mailing list
> cdesktopenv-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] [PATCH] dtfile: Add missing prototypes

2012-09-19 Thread Pascal Stumpf

On Tue, 18 Sep 2012 14:06:01 -0600 (MDT), Jon Trulson wrote:
> On Tue, 18 Sep 2012, Marcin Cieslak wrote:
> 
> > On Tue, 18 Sep 2012, Jon Trulson wrote:
> >
> >> Though I've added a follow on patch that disables building XmPrivate.h
> >> on Linux systems, where it will always fail since linux does not build
> >> with motif sources symlinked into imports/
> >
> > Ok, thank you.
> >
> > I don't think this is a Linux-specfic problem -
> > I did specify MLIBSRC in the command line.
> 
> Well, it will be a problem for anyone that does not have a built motif
> src tree symlinked into imports...
> 
> >
> > Does symplinking of "openmotif-2.3.3/lib"
> > in to "imports/motif/lib" work for you?
> >
> 
> I'm not sure how that would help... Perhaps you meant motif/include?
> 
> On Linux, we build with the Motif development packages rather than a
> motif source tree.  The Motif devel packages do not contain the
> private headers, so even symlinking motif's includes would not work.
> 
> > What normally happens in my tree is this:
> >
> > $ cd $cde/includes/Xm
> > $ make includes
> > + cd ../../exports/include/Xm
> > + rm -f XmPrivate.h
> > + ln -s ../../../include/Xm/XmPrivate.h .
> >
> > Is XmPrivate.h being rebuilt all the time in your tree?
> >
> 
> During the last git am of your patch, followed by a make World, the
> file was deleted, causing the build to fail.  Probably due to the fact
> that the awk script was updated, and the Imakefile makes XmPrivate.h
> dependant on the awk script.
> 
> I just disabled this altogether in Linux - though I think it should be
> disabled all of the time on all systems.
> 
> IMO, the awk script that generates XmPrivate.h should always only be
> run manually when it's needed, and never automatically.  The only way
> it can ever work automatically is with an openmotif source tree, built
> and symlinked into imports.
> 
> That will never be the usual case on Linux, and probably most other
> systems as well.  I think fbsd is special in this regard since it's
> all done via the ports system.
> 
> The Imakefile should probably just be:
> 
> #if defined(FreeBSDArchitecture)
> ..
> #endif
> 
> No idea about OpenBSD/NetBSD.

Without having tested anything, this should be disabled on OpenBSD too,
since I'm avoiding symlinking includes/sources altogether in my port.
Though I think the right solution is to do this via a "maintainer mode"
type of define.  No ordinary user compiling CDE will need to generate
XmPrivate.h.

> When all of these various prototype issues are fixed, I do not expect
> XmPrivate.h to be modified at all going forward.
> 
> > Both gmake and BSD make don't touch XmPrivate.h
> > for me in the fresh checkout.
> >
> 
> It was wiped on my first make World after applying the patch.
> 
> -- 
> Jon Trulson
> 
> The Higgs Field is what make atoms matter.
>  -- Tom L.
> 
> 
> 
> --
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> ___
> cdesktopenv-devel mailing list
> cdesktopenv-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
> 
> 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] fix CDE compilation with __guard_local on OpenBSD

2012-09-24 Thread Pascal Stumpf

>From 061fd82a233136724c3c5e591f379e58fcc5de0b Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 24 Sep 2012 21:50:19 +0200
Subject: [PATCH] Add csu objects to shared libraries on OpenBSD.

This is required by recent changes to the stack protector code in gcc,
generating references to __guard_local instead of __guard, defined in
crtbeginS.o.

This is a temporary solution; strictly speaking, we shouldn't invoke ld
directly at all but use cc instead.
---
 cde/config/cf/OpenBSD.cf |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 163c40b..ccde1f8 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1028,5 +1028,7 @@ install:: fonts.alias 
@@\
 #define KornShell   /usr/local/bin/ksh93
 #endif
 
+#define SharedLibraryLoadFlags -shared /usr/lib/crtbeginS.o /usr/lib/crtendS.o
+
 /* This must come last */
 #include 
-- 
1.7.6


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] fix CDE compilation with __guard_local on OpenBSD

2012-09-25 Thread Pascal Stumpf

On Mon, 24 Sep 2012 18:33:39 -0600 (MDT), Jon Trulson wrote:
> On Mon, 24 Sep 2012, Pascal Stumpf wrote:
> 
> This one would not apply (corrupt?)

Next try.

> 
> 
> -- 
> Jon Trulson
> 
> The Higgs Field is what make atoms matter.
>  -- Tom L.
> 
> 
> 
>From 061fd82a233136724c3c5e591f379e58fcc5de0b Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 24 Sep 2012 21:50:19 +0200
Subject: [PATCH 1/2] Add csu objects to shared libraries on OpenBSD.

This is required by recent changes to the stack protector code in gcc,
generating references to __guard_local instead of __guard, defined in
crtbeginS.o.

This is a temporary solution; strictly speaking, we shouldn't invoke ld
directly at all but use cc instead.
---
 cde/config/cf/OpenBSD.cf |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 163c40b..ccde1f8 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1028,5 +1028,7 @@ install:: fonts.alias 
@@\
 #define KornShell   /usr/local/bin/ksh93
 #endif
 
+#define SharedLibraryLoadFlags -shared /usr/lib/crtbeginS.o /usr/lib/crtendS.o
+
 /* This must come last */
 #include 
-- 
1.7.6

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] ToolTalk broken on OpenBSD

2012-10-14 Thread Pascal Stumpf

Something has seriously broken ttsession on OpenBSD (and anything using
it).  Either segfaulting and leaving zombie processes or immediately
locking up on startup.  I probably won't have time to look into it until
next weekend, but if anyone has an idea or wants to help debugging ...

--
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] ToolTalk broken on OpenBSD

2012-11-18 Thread Pascal Stumpf

On Mon, 15 Oct 2012 18:10:26 -0600 (MDT), Jon Trulson wrote:
> On Mon, 15 Oct 2012, Pascal Stumpf wrote:
> 
> > Something has seriously broken ttsession on OpenBSD (and anything using
> > it).  Either segfaulting and leaving zombie processes or immediately
> > locking up on startup.  I probably won't have time to look into it until
> > next weekend, but if anyone has an idea or wants to help debugging ...
> >
> 
> There have been a few changes there - cd into lib/tt and do a:
> 
> git log -p .
> 
> To see relevant commits.  Not sure what specifically might have been
> broken on CDE for OpenBSD...

I *think* this was it.

> -- 
> Jon Trulson
> 
> The Higgs Field is what make atoms matter.
>  -- Tom L.
> 
> 
> 
>From 005112a7deac32b9a3979c775b3ca4b6ca3222ea Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 18 Nov 2012 16:23:17 +0100
Subject: [PATCH] The svcfd_create() call is still needed at least on OpenBSD.

---
 cde/lib/tt/slib/mp_rpc_server.C |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cde/lib/tt/slib/mp_rpc_server.C b/cde/lib/tt/slib/mp_rpc_server.C
index 881d705..ec004b4 100644
--- a/cde/lib/tt/slib/mp_rpc_server.C
+++ b/cde/lib/tt/slib/mp_rpc_server.C
@@ -120,7 +120,7 @@ init(void (*service_fn)(struct svc_req *, SVCXPRT *))
unsigned int buffersize = (bufopt != (char *)0) ? atoi(bufopt) : 32000;
 
if (_socket != RPC_ANYSOCK) {
-#ifdef OPT_UNIX_SOCKET_RPC
+#if defined(OPT_UNIX_SOCKET_RPC) || defined(__OpenBSD__)
_transp = svcfd_create(_socket, buffersize, buffersize);
if (_transp == (SVCXPRT *)0) {
return(0);
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] AvoidNullMakeCommand on OpenBSD

2012-11-18 Thread Pascal Stumpf

Avoid make warnings.
>From c4a36262a853bd642712a05b0bcac76850ac5ab3 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 18 Nov 2012 18:25:07 +0100
Subject: [PATCH] set AvoidNullMakeCommand on OpenBSD to avoid make warnings

---
 cde/config/cf/OpenBSD.cf |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index ccde1f8..3b340f8 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1030,5 +1030,7 @@ install:: fonts.alias 
@@\
 
 #define SharedLibraryLoadFlags -shared /usr/lib/crtbeginS.o /usr/lib/crtendS.o
 
+#define AvoidNullMakeCommand   YES
+
 /* This must come last */
 #include 
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Don't add csu objects to linker cmd line on OpenBSD any more

2012-11-18 Thread Pascal Stumpf

See patch.
>From 73705ef733cb78741ab706fb6d0051585bed44b8 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 18 Nov 2012 18:36:48 +0100
Subject: [PATCH] Remove hack adding csu objects to the linker command line on
 OpenBSD.

This is no longer needed now that $(CC) is used to link shared libraries.
---
 cde/config/cf/OpenBSD.cf |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 3b340f8..afbb584 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1028,8 +1028,6 @@ install:: fonts.alias 
@@\
 #define KornShell   /usr/local/bin/ksh93
 #endif
 
-#define SharedLibraryLoadFlags -shared /usr/lib/crtbeginS.o /usr/lib/crtendS.o
-
 #define AvoidNullMakeCommand   YES
 
 /* This must come last */
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Motif manpages

2012-11-18 Thread Pascal Stumpf

We currently build and install an extra copy of all motif manpages.
This is unnecessary at best; this documentation should be packaged
with openmotif.  It might well be outdated too (haven't checked).
>From 8dad62f325824c8126dd14824807265e4f4692d2 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 18 Nov 2012 23:43:05 +0100
Subject: [PATCH] Do not build motif manpages any more.

---
 cde/doc/C/man/Imakefile |  559 +--
 1 files changed, 1 insertions(+), 558 deletions(-)

diff --git a/cde/doc/C/man/Imakefile b/cde/doc/C/man/Imakefile
index 67a1ef6..906b8d0 100644
--- a/cde/doc/C/man/Imakefile
+++ b/cde/doc/C/man/Imakefile
@@ -25,7 +25,7 @@ dst:  
@@\
echo .so src > $@
 
 /* get "line too long" on some systems if every file is in all:: */
-all:: dirs cde1 cde1m cde3a cde3b cde4 cde5 cde6 mot1 mot3a mot3b mot4 mot5
+all:: dirs cde1 cde1m cde3a cde3b cde4 cde5 cde6
 
 MakeDirectories(dirs,man1 man1m man3 man4 man5 man6)
 
@@ -695,560 +695,3 @@ 
CDEMan(5,../guides/man/man5/dtteract.sgm,man5/dttermaction.5)
 CDEMan(5,../guides/man/man5/dttexact.sgm,man5/dttextaction.5)
 CDEMan(5,../guides/man/man5/dttraact.sgm,man5/dttrashaction.5)
 CDEMan(6,../guides/man/man6/ttsnoop.sgm,man6/ttsnoop.6)
-
-MotifMan(1,../m-guides/man/PR1X/mwm.sgm,man1/mwm.1)
-MotifMan(1,../m-guides/man/PR1X/uil.sgm,man1/uil.1)
-MotifMan(1,../m-guides/man/PR1X/xmbind.sgm,man1/xmbind.1)
-MotifMan(3a,../m-guides/man/PR3X/Applic.sgm,man3/ApplicationShell.3)
-MotifMan(3a,../m-guides/man/PR3X/Compos.sgm,man3/Composite.3)
-MotifMan(3a,../m-guides/man/PR3X/Constrai.sgm,man3/Constraint.3)
-MotifMan(3a,../m-guides/man/PR3X/Core.sgm,man3/Core.3)
-MotifMan(3a,../m-guides/man/PR3X/Object.sgm,man3/Object.3)
-MotifMan(3a,../m-guides/man/PR3X/Override.sgm,man3/OverrideShell.3)
-MotifMan(3a,../m-guides/man/PR3X/RectObj.sgm,man3/RectObj.3)
-MotifMan(3a,../m-guides/man/PR3X/Shell.sgm,man3/Shell.3)
-MotifMan(3a,../m-guides/man/PR3X/TopLevel.sgm,man3/TopLevelShell.3)
-MotifMan(3a,../m-guides/man/PR3X/Transien.sgm,man3/TransientShell.3)
-MotifMan(3a,../m-guides/man/PR3X/Uil.sgm,man3/Uil.3)
-MotifMan(3a,../m-guides/man/PR3X/UilDumpS.sgm,man3/UilDumpSymbolTable.3)
-MotifMan(3a,../m-guides/man/PR3X/Vendor.sgm,man3/VendorShell.3)
-MotifMan(3a,../m-guides/man/PR3X/VirtBind.sgm,man3/VirtualBindings.3)
-MotifMan(3a,../m-guides/man/PR3X/WMShell.sgm,man3/WMShell.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/CloseHie.sgm,man3/MrmCloseHierarchy.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchBit.sgm,man3/MrmFetchBitmapLiteral.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchCol.sgm,man3/MrmFetchColorLiteral.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchIco.sgm,man3/MrmFetchIconLiteral.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchLit.sgm,man3/MrmFetchLiteral.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchSet.sgm,man3/MrmFetchSetValues.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchWiA.sgm,man3/MrmFetchWidget.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/FetchWiB.sgm,man3/MrmFetchWidgetOverride.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/Initiali.sgm,man3/MrmInitialize.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/OpenHieA.sgm,man3/MrmOpenHierarchy.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/OpenHieB.sgm,man3/MrmOpenHierarchyFromBuffer.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/OpenHieC.sgm,man3/MrmOpenHierarchyPerDisplay.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/RegisteA.sgm,man3/MrmRegisterClass.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/RegisteB.sgm,man3/MrmRegisterNames.3)
-MotifMan(3a,../m-guides/man/PR3X_Mrm/RegisteC.sgm,man3/MrmRegisterNamesInHierarchy.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/ActivP.sgm,man3/XmActivateProtocol.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/ActivW.sgm,man3/XmActivateWMProtocol.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/AddProtA.sgm,man3/XmAddProtocolCallback.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/AddProtB.sgm,man3/XmAddProtocols.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/AddTabGr.sgm,man3/XmAddTabGroup.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/AddToPos.sgm,man3/XmAddToPostFromList.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/AddWMPrA.sgm,man3/XmAddWMProtocolCallback.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/AddWMPrB.sgm,man3/XmAddWMProtocols.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/ArrowBuA.sgm,man3/XmArrowButton.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/ArrowBuB.sgm,man3/XmArrowButtonGadget.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/BulletB.sgm,man3/XmBulletinBoard.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/CascBA.sgm,man3/XmCascadeButton.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/CascBB.sgm,man3/XmCascadeButtonGadget.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/CascBC.sgm,man3/XmCascadeButtonGadgetHighlight.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/CascBD.sgm,man3/XmCascadeButtonHighlight.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/ChangeCo.sgm,man3/XmChangeColor.3)
-MotifMan(3a,../m-guides/man/PR3X_Xm/ClipbA.sgm,man3/XmClipboardCancelCopy.3)
-MotifMan(3a,../m-guides/man/PR

[cdesktopenv-devel] Use /usr/sbin/sendmail as mailer on OpenBSD

2012-11-18 Thread Pascal Stumpf

See patch.
>From d3b6c7761900ae0241cd446af4586442874d71d5 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 19 Nov 2012 00:26:54 +0100
Subject: [PATCH] Use /usr/sbin/sendmail as default mailer on OpenBSD.

---
 cde/programs/dtmail/libDtMail/RFC/RFCTransport.C |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C 
b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
index 7659ff8..72c9c59 100644
--- a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
@@ -740,6 +740,8 @@ RFCTransport::launchSendmail(DtMailEnv & error,
 if (error.isSet()) {
 #if defined(USL) || defined(__uxp__)
 mailer = "/usr/ucblib/sendmail";
+#elif defined(__OpenBSD__)
+   mailer = "/usr/sbin/sendmail";
 #else
 mailer = "/usr/lib/sendmail";
 #endif
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtfile(1): Use FILE_MAP_OPTIMIZE on OpenBSD

2012-11-19 Thread Pascal Stumpf

See patch.  Other OSes might want to do this as well ...
>From 3f0f3a4909692ededd08892260140fd6c8f97f7d Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 19 Nov 2012 16:22:47 +0100
Subject: [PATCH] On OpenBSD, use FILE_MAP_OPTIMIZED.

This has the effect of not performing a tt call each time in
ResolveLocalPathName() if we're on the local host anyway.  Drastically reduces
dtfile startup time.
---
 cde/programs/dtfile/Imakefile |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 1125112..279389c 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -24,6 +24,10 @@ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
 EXTRA_DEFINES = -D_TOOLTALK
 #endif
 
+#ifdef OpenBSDArchitecture
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
+#endif
+
 #if defined (SunArchitecture)
 EXTRA_CCOPTIONS = -xF
 #endif
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] pclose() -> fclose()

2012-11-19 Thread Pascal Stumpf

See patch.
>From cc22d0438465eb8d099acba27d3c4f6e382c920d Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 19 Nov 2012 16:29:10 +0100
Subject: [PATCH] pclose() -> fclose()

We're not doing anything with the exit status anyway, and waiting for the
shell to terminate sometimes hangs dtfile, at least on OpenBSD.
---
 cde/programs/dtfile/SharedProcs.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cde/programs/dtfile/SharedProcs.c 
b/cde/programs/dtfile/SharedProcs.c
index 7ec4645..bc70c6a 100644
--- a/cde/programs/dtfile/SharedProcs.c
+++ b/cde/programs/dtfile/SharedProcs.c
@@ -1656,7 +1656,7 @@ _DtPathFromInput(
  command[strlen(command)-1] = '\0';
  XtFree(path);
  path = XtNewString(command);
- pclose(pfp);
+ fclose(pfp);
 }
   }
}
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] ToolTalk broken on OpenBSD

2012-11-19 Thread Pascal Stumpf

On Mon, 19 Nov 2012 19:37:53 -0700 (MST), Jon Trulson wrote:
> On Sun, 18 Nov 2012, Pascal Stumpf wrote:
> 
> > On Mon, 15 Oct 2012 18:10:26 -0600 (MDT), Jon Trulson wrote:
> >> On Mon, 15 Oct 2012, Pascal Stumpf wrote:
> >>
> >>> Something has seriously broken ttsession on OpenBSD (and anything using
> >>> it).  Either segfaulting and leaving zombie processes or immediately
> >>> locking up on startup.  I probably won't have time to look into it until
> >>> next weekend, but if anyone has an idea or wants to help debugging ...
> >>>
> >>
> >> There have been a few changes there - cd into lib/tt and do a:
> >>
> >> git log -p .
> >>
> >> To see relevant commits.  Not sure what specifically might have been
> >> broken on CDE for OpenBSD...
> >
> > I *think* this was it.
> >
> 
> I'm not sure what you mean here... If you are saying that
> OPT_UNIX_SOCKET_RPC needs to be enabled for OpenBSD, then this should
> be done in tt/lib/tt_options.h (define it for OpenBSD)...
> 
> Or am I missing something?

No, I'm saying the svcfd_create() is still needed in the
!OPT_UNIX_SOCKET_RPC case.  I don't really understand how this works on
other OSes, but well ...

> -- 
> Jon Trulson
> 
> "Oh the land of the free, and the home of the brave.
>   Are you heaven on Earth, or the gloom of the grave."
>  -- Iron Sky
> 
> 
> 

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] pclose() -> fclose()

2012-11-20 Thread Pascal Stumpf

On Mon, 19 Nov 2012 19:46:48 -0700 (MST), Jon Trulson wrote:
> On Mon, 19 Nov 2012, Pascal Stumpf wrote:
> 
> > See patch.
> >
> 
> This one I'm not so sure about... pclose might be doing other cleanups
> under the hood, so should be used...  Can you determine why the shell
> sometimes hangs?
> 
> If not, then can we make this conditional on OpenBSD only?

Disregard that patch; it was a problem with signal handling.  There's
already code there for OSF that makes it work on OpenBSD too.
>From d95b222678bd607b2fe4c66f9ef3cebc4945768d Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 20 Nov 2012 10:09:16 +0100
Subject: [PATCH] Use same SIGCHLD handling for OpenBSD as for OSF.

---
 cde/programs/dtfile/Main.c |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index 0f077c4..be996ba 100644
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -116,7 +116,7 @@
 #include 
 #include 
 
-#ifdef __osf__
+#if defined(__osf__) || defined(__OpenBSD__)
 #include 
 #endif /* __osf__ */
 
@@ -975,7 +975,7 @@ XtActionsRec actionTable[] = {
 
 extern XtInputId ProcessToolTalkInputId;
 
-#ifdef __osf__
+#if defined(__osf__) || defined(__OpenBSD__)
 extern void sigchld_handler(int);
 #endif /* __osf__ */
 
@@ -1019,7 +1019,7 @@ main(
Tt_pattern requests2Handle;
Tt_message msg;
Tt_status status;
-#ifdef __osf__
+#if defined(__osf__) || defined(__OpenBSD__)
struct sigaction sa, osa;
 #endif /* __osf__ */
int session_flag = 0;
@@ -1031,7 +1031,7 @@ main(
(void) signal (SIGINT, (void (*)())Stop);
 
/* We don't want any zombie children, do we? */
-#ifdef __osf__
+#if defined(__osf__) || defined(__OpenBSD__)
 sa.sa_handler = sigchld_handler;
 sigemptyset(&sa.sa_mask);
 sa.sa_flags   =  0;
@@ -6292,7 +6292,7 @@ FinalizeToolTalkSession();
 exit (1);
 }
 
-#ifdef __osf__
+#if defined(__osf__) || defined(__OpenBSD__)
 extern void
 sigchld_handler(int signo)  /* Do not use the arg signo at the moment */
 {
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtgreet: do not crash if LANG is not set

2012-11-20 Thread Pascal Stumpf

See patch.
>From 45619657fa4d16f365e62cd8e25435ae58c7a650 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 20 Nov 2012 19:42:33 +0100
Subject: [PATCH] dtgreet: Do not crash if LANG is not set in the environment.

In that case, catopen() will have never been called, and we'd feed 0 as the
first argument to catgets().  This crashes, at least on OpenBSD.
---
 cde/programs/dtlogin/vgutil.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cde/programs/dtlogin/vgutil.c b/cde/programs/dtlogin/vgutil.c
index 1d7e73e..f38c777 100644
--- a/cde/programs/dtlogin/vgutil.c
+++ b/cde/programs/dtlogin/vgutil.c
@@ -791,7 +791,7 @@ unsigned char *
 ReadCatalog(int setn, int msgn, char *dflt)
 {
 OpenCatalog();
-if (0 > (int) nl_fd)
+if ((0 > (int) nl_fd) || (NULL == langenv))
   return (unsigned char*) dflt;
 else
   return (unsigned char*) catgets(nl_fd, setn, msgn, dflt);
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtlogin: Set NATIVEXBINDIR on OpenBSD

2012-11-20 Thread Pascal Stumpf

See patch.
>From 0b5f95e1faf6690e03490cf62d7433101518a08e Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 20 Nov 2012 20:08:34 +0100
Subject: [PATCH] Set NATIVEXBINDIR on OpenBSD.

---
 cde/programs/dtlogin/Imakefile |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 6bcab17..4ece5c7 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -196,6 +196,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 
 #if defined (SunArchitecture)
   NATIVEXBINDIR = /usr/openwin/bin
+#elif defined(OpenBSDArchitecture)
+  NATIVEXBINDIR = /usr/X11R6/bin
 #else
   NATIVEXBINDIR = /usr/bin/X11
 #endif
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] BSD: Correct path to xterm

2012-11-20 Thread Pascal Stumpf

See patch.
>From a7618c2b2eb9b35d5b9ef0d9236fb6527f42490b Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 20 Nov 2012 22:03:30 +0100
Subject: [PATCH] Correct paths to xterm as failsafe client on the BSDs.

---
 cde/programs/dtlogin/session.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index 41cf26d..0a2cd86 100644
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -1652,7 +1652,11 @@ StartClient( struct verify_info *verify, struct display 
*d, int *pidp )
 failsafeArgv[i++] = "/usr/X/bin/xterm";
 #elif defined(__hpux)
failsafeArgv[i++] = "/usr/bin/X11/hpterm";
-#elif defined(CSRG_BASED)
+#elif defined(__OpenBSD__)
+   failsafeArgv[i++] = "/usr/X11R6/bin/xterm";
+#elif defined(__NetBSD__)
+   failsafeArgv[i++] = "/usr/X11R7/bin/xterm";
+#elif defined(__FreeBSD__)
failsafeArgv[i++] = "/usr/local/bin/xterm";
 #else
failsafeArgv[i++] = "/usr/bin/X11/xterm";
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtlogin: Imakefile: Respect CDE_{INSTALL, CONFIGUR}ATION_TOP

2012-11-20 Thread Pascal Stumpf

Not sure about this one.  The comment says not to change the values
there, but there is no other way to change them.  FWIW, hardcoding
/etc/dt and /usr/dt is wrong.
>From 799c908071f5065e348c844db4b0404126c1fccb Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 20 Nov 2012 22:42:29 +0100
Subject: [PATCH] Respect CDE_CONFIGURATION_TOP and CDE_INSTALLATION_TOP.

Do not hardcode /etc/dt and /usr/dt.
---
 cde/programs/dtlogin/Imakefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 4ece5c7..33dc6f9 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -238,8 +238,8 @@ DEF_USER_PATH = 
DefaultUserPath:/usr/ccs/bin:$(NATIVEXBINDIR):$(XBINDIR)
 DEF_SYSTEM_PATH = DefaultSystemPath:$(NATIVEXBINDIR):$(XBINDIR)
 BOURNE_SHELL = DefaultSystemShell
 CPP_PROGRAM = CppCmd
-DEF_BM_PATH = 
/etc/dt/appconfig/icons/%L/%B%M.bm:/etc/dt/appconfig/icons/%L/%B%M.pm:/etc/dt/appconfig/icons/%L/%B:/etc/dt/appconfig/icons/C/%B%M.bm:/etc/dt/appconfig/icons/C/%B%M.pm:/etc/dt/appconfig/icons/C/%B:/usr/dt/appconfig/icons/%L/%B%M.bm:/usr/dt/appconfig/icons/%L/%B%M.pm:/usr/dt/appconfig/icons/%L/%B:/usr/dt/appconfig/icons/C/%B%M.bm:/usr/dt/appconfig/icons/C/%B%M.pm:/usr/dt/appconfig/icons/C/%B
-DEF_PM_PATH=/etc/dt/appconfig/icons/%L/%B%M.pm:/etc/dt/appconfig/icons/%L/%B%M.bm:/etc/dt/appconfig/icons/%L/%B:/etc/dt/appconfig/icons/C/%B%M.pm:/etc/dt/appconfig/icons/C/%B%M.bm:/etc/dt/appconfig/icons/C/%B:/usr/dt/appconfig/icons/%L/%B%M.pm:/usr/dt/appconfig/icons/%L/%B%M.bm:/usr/dt/appconfig/icons/%L/%B:/usr/dt/appconfig/icons/C/%B%M.pm:/usr/dt/appconfig/icons/C/%B%M.bm:/usr/dt/appconfig/icons/C/%B
+DEF_BM_PATH = 
$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B
+DEF_PM_PATH=$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B
 
 RES_DEFINES = '-DDEF_SERVER_LINE=":0 Local local $(DEF_SERVER) :0"' \
   '-DXRDB_PROGRAM="$(XBINDIR)/xrdb"' \
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] ToolTalk broken on OpenBSD

2012-11-21 Thread Pascal Stumpf

On Tue, 20 Nov 2012 17:14:19 -0700 (MST), Jon Trulson wrote:
> On Tue, 20 Nov 2012, Pascal Stumpf wrote:
> 
> > On Mon, 19 Nov 2012 19:37:53 -0700 (MST), Jon Trulson wrote:
> >> On Sun, 18 Nov 2012, Pascal Stumpf wrote:
> >>
> >>> On Mon, 15 Oct 2012 18:10:26 -0600 (MDT), Jon Trulson wrote:
> >>>> On Mon, 15 Oct 2012, Pascal Stumpf wrote:
> >>>>
> >>>>> Something has seriously broken ttsession on OpenBSD (and anything using
> >>>>> it).  Either segfaulting and leaving zombie processes or immediately
> >>>>> locking up on startup.  I probably won't have time to look into it until
> >>>>> next weekend, but if anyone has an idea or wants to help debugging ...
> >>>>>
> >>>>
> >>>> There have been a few changes there - cd into lib/tt and do a:
> >>>>
> >>>> git log -p .
> >>>>
> >>>> To see relevant commits.  Not sure what specifically might have been
> >>>> broken on CDE for OpenBSD...
> >>>
> >>> I *think* this was it.
> >>>
> >>
> >> I'm not sure what you mean here... If you are saying that
> >> OPT_UNIX_SOCKET_RPC needs to be enabled for OpenBSD, then this should
> >> be done in tt/lib/tt_options.h (define it for OpenBSD)...
> >>
> >> Or am I missing something?
> >
> > No, I'm saying the svcfd_create() is still needed in the
> > !OPT_UNIX_SOCKET_RPC case.  I don't really understand how this works on
> > other OSes, but well ...
> 
> Hmm... it should be all or nothing WRT OPT_UNIX_SOCKET_RPC... Could it
> have been this commit: 406fa95994e68bf8bf3004930d0498ce892412a3 ?

Nope, RPC_ANYSOCK is defined to -1 on OpenBSD, so that commit doesn't
change anything functionality-wise.

> Have you bisected?

Yes, it's definitely commit 44e384aedb3b8aabbd3c556af28848fc58c09c60.
So it seems the commit message is wrong and the code is indeed called
even in the !OPT_UNIX_SOCKET_RPC case.

Since about when does Linux have svcfd_create()?

> -- 
> Jon Trulson
> 
> "Oh the land of the free, and the home of the brave.
>   Are you heaven on Earth, or the gloom of the grave."
>  -- Iron Sky
> 
> 
> 

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Introduce DTKORNSHELL

2012-11-22 Thread Pascal Stumpf

See patch.
>From 05a7f71bd30d43dd4c041ff8c3e15ee48a16ebd7 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 22 Nov 2012 15:49:51 +0100
Subject: [PATCH] Introduce DTKORNSHELL, analogous to KORNSHELL.

DTKORNSHELL is used to specify the install location of dtksh on your system,
preventing hardcoding of /usr/dt/bin/dtksh in Shebang lines and such.
---
 cde/config/cf/Imake.tmpl |4 
 cde/config/cf/OpenBSD.cf |4 
 cde/programs/dtprintegrate/Imakefile |2 +-
 cde/programs/dtprintegrate/dtlp.src  |2 +-
 cde/programs/types/Imakefile |2 +-
 cde/programs/types/dt.dt.src |4 ++--
 cde/programs/types/error.ds.src  |2 +-
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cde/config/cf/Imake.tmpl b/cde/config/cf/Imake.tmpl
index db4a1b9..75fa291 100644
--- a/cde/config/cf/Imake.tmpl
+++ b/cde/config/cf/Imake.tmpl
@@ -183,6 +183,9 @@ XCOMM the platform-specific parameters - edit site.def to 
change
 #ifndef KornShell
 #define KornShell  /bin/ksh
 #endif
+#ifndef DtKornShell
+#define DtKornShell/usr/dt/bin/dtksh
+#endif
 #ifndef ConstructMFLAGS
 #if SystemV
 #define ConstructMFLAGSYES /* build MFLAGS from MAKEFLAGS 
*/
@@ -896,6 +899,7 @@ XCOMM the platform-specific parameters - edit site.def to 
change
   PATHSEP = PathSeparator
 SHELL = BourneShell
 KORNSHELL = KornShell
+  DTKORNSHELL = DtKornShell
 
   TOP = TOPDIR
   CURRENT_DIR = CURDIR
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index afbb584..1ebc7a0 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1028,6 +1028,10 @@ install:: fonts.alias
@@\
 #define KornShell   /usr/local/bin/ksh93
 #endif
 
+#ifndef DtKornShell
+#define DtKornShell/usr/local/dt/bin/dtksh
+#endif
+
 #define AvoidNullMakeCommand   YES
 
 /* This must come last */
diff --git a/cde/programs/dtprintegrate/Imakefile 
b/cde/programs/dtprintegrate/Imakefile
index 63baf8a..acb48f5 100644
--- a/cde/programs/dtprintegrate/Imakefile
+++ b/cde/programs/dtprintegrate/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:50:24 drk $
 
 CPP_DEFINES =   -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-   -DKORNSHELL=$(KORNSHELL)
+   -DKORNSHELL=$(KORNSHELL) -DDTKORNSHELL=$(DTKORNSHELL)
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
diff --git a/cde/programs/dtprintegrate/dtlp.src 
b/cde/programs/dtprintegrate/dtlp.src
index 9b7be11..bffa2f6 100755
--- a/cde/programs/dtprintegrate/dtlp.src
+++ b/cde/programs/dtprintegrate/dtlp.src
@@ -1,4 +1,4 @@
-XCOMM!/usr/dt/bin/dtksh
+XCOMM! DTKORNSHELL
 XCOMM $TOG: dtlp.src /main/17 1998/07/31 17:03:31 mgreess $
 XCOMM 
 XCOMM (c) Copyright 1996 Digital Equipment Corporation.
diff --git a/cde/programs/types/Imakefile b/cde/programs/types/Imakefile
index c776c31..73ddb01 100644
--- a/cde/programs/types/Imakefile
+++ b/cde/programs/types/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:52:31 drk $
 
 CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-   -DKORNSHELL=$(KORNSHELL)
+   -DKORNSHELL=$(KORNSHELL) -DDTKORNSHELL=$(DTKORNSHELL)
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
diff --git a/cde/programs/types/dt.dt.src b/cde/programs/types/dt.dt.src
index a960851..0752ede 100644
--- a/cde/programs/types/dt.dt.src
+++ b/cde/programs/types/dt.dt.src
@@ -135,13 +135,13 @@ DATA_CRITERIA DTKSH_SCRIPT2
 {
 DATA_ATTRIBUTES_NAME DTKSH_SCRIPT
MODEf&x
-CONTENT0 string #!/usr/dt/bin/dtksh
+CONTENT0 string #!DTKORNSHELL
 }
 DATA_CRITERIA DTKSH_SCRIPT3
 {
 DATA_ATTRIBUTES_NAME DTKSH_SCRIPT
MODEf&x
-CONTENT0 string #! /usr/dt/bin/dtksh
+CONTENT0 string #! DTKORNSHELL
 }
 ACTION Run
 {
diff --git a/cde/programs/types/error.ds.src b/cde/programs/types/error.ds.src
index f0ca398..189167a 100644
--- a/cde/programs/types/error.ds.src
+++ b/cde/programs/types/error.ds.src
@@ -1,4 +1,4 @@
-XCOMM! /usr/dt/bin/dtksh
+XCOMM! DTKORNSHELL
 XCOMM  $XConsortium: error.ds.src /main/3 1996/04/23 17:35:47 drk $
 XCOMM #
 XCOMM 
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p

[cdesktopenv-devel] Fix memory fault in instant(1) with OpenBSD's malloc(3) 'S'

2012-11-22 Thread Pascal Stumpf

option

See patch.
>From d3086c6ddf0b925a2f95f2cebd82b82f400179c5 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 22 Nov 2012 14:27:26 +0100
Subject: [PATCH] Keep track of the length of the string in ExpandVariables().

On OpenBSD, the 'S' option to malloc(3) enables guard pages (among other
things).  This loop could have triggered this trap when reading beyond the
buffer.  Also, the whole "while(*ip)" construct was based on the assumption that
the memory after the string is always zero-filled.
---
 cde/programs/dtdocbook/instant/translate.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/cde/programs/dtdocbook/instant/translate.c 
b/cde/programs/dtdocbook/instant/translate.c
index cb01270..9598335 100644
--- a/cde/programs/dtdocbook/instant/translate.c
+++ b/cde/programs/dtdocbook/instant/translate.c
@@ -197,14 +197,17 @@ ExpandVariables(
 char   *def_val, *s, *atval, *modifier;
 char   vbuf[500];
 intlev;
+size_t len = 0, totlen;
 
 ip = in;
 op = out;
-while (*ip) {
+totlen = strlen(ip);
+while (totlen >= len && *ip) {
/* start of regular variable? */
if (*ip == VDELIM && *(ip+1) == L_CURLY && *(ip+2) != '_') {
ip++;
ip++;   /* point at variable name */
+   len + 2;
vp = vbuf;
/*  Look for matching (closing) curly. (watch for nesting)
 *  We store the variable content in a tmp buffer, so we don't
@@ -216,11 +219,13 @@ ExpandVariables(
if (*ip == R_CURLY) {
if (lev == 0) {
ip++;
+   len++;
break;
}
else lev--;
}
*vp++ = *ip++;  /* copy to variable buffer */
+   len++;
}
*vp = EOS;
/* vbuf now contains the variable name (stuff between curlys). */
@@ -270,6 +275,7 @@ ExpandVariables(
}
}
*op++ = *ip++;
+   len++;
 }
 *op = EOS; /* terminate string */
 }
-- 
1.7.6

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtaction: sys group?

2012-11-22 Thread Pascal Stumpf

Dtaction is installed as group "sys".  Does anyone know why?  I assume
the group has a very different meaning on different Unices ...

--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Fix a dtterm crash

2012-11-27 Thread Pascal Stumpf

See patch.
>From 8df4600ea26b7b995378eb20fb000fa21293c8ea Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 27 Nov 2012 21:12:23 +0100
Subject: [PATCH] Avoid negative array subscript; break out of the loop if
 that happens.

---
 cde/lib/DtTerm/TermPrim/TermPrim.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cde/lib/DtTerm/TermPrim/TermPrim.c 
b/cde/lib/DtTerm/TermPrim/TermPrim.c
index f32f016..87c836d 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrim.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrim.c
@@ -894,6 +894,8 @@ GetMetaMask
for (i1 = 0; i1 < modifierMapping->max_keypermod; i1++) {
thisKeyCode = modifierMapping->modifiermap[mapIndex *
modifierMapping->max_keypermod + i1];
+   if (thisKeyCode < minKeycodes)
+   break;
thisKeySym = keyboardMapping[(thisKeyCode - minKeycodes) *
keysymsPerKeycode];
if ((thisKeySym == XK_Meta_L) || (thisKeySym == XK_Meta_R)) {
-- 
1.8.0

--
Keep yourself connected to Go Parallel: 
DESIGN Expert tips on starting your parallel project right.
http://goparallel.sourceforge.net___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] porting on Autotools initiative

2013-02-03 Thread Pascal Stumpf

On Sun, 3 Feb 2013 11:43:32 -0800 (PST), Oleksiy Ch wrote:
> HI,
> 
> I examined CDE it contains ancient Imakefiles. I think it must be ported on 
> Autotools as Motif did, but in a more wise way. I made some work in this way. 
> Currently I have lib dir ported on autotools completely. Actually the main 
> thing is configure.ac, it's 95% of code. It absorbed much from config/cf/*. 
> So with configure.ac the core part of porting is done. Current configure.ac 
> makes checks but don't abort on check fail. It's temporary.

As someone having to deal with auto* on a daily basis in OpenBSD ports,
please, please, please, please no.  It is a major pain to work with and
continues to waste hundreds of hours of developer time fighting with its
quirks and stupidities.  Imakefiles may not be the nicest or most modern
build system around, but they get the job done and do so in a much more
transparent manner than the monstrosity that is GNU auto*.

So, please point out your reasoning *why* you think replacing Imakefiles
is a necessity and why that replacement should be Autotools.

--
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Re: [cdesktopenv-devel] Crash in ttsession starting CDE on Ubuntu 12.04

2013-04-26 Thread Pascal Stumpf

On Fri, 26 Apr 2013 11:52:34 +, Marcin Cieslak wrote:
> On Wed, 10 Apr 2013, Isaac Dunham wrote:
> 
> > On Tue, 09 Apr 2013 12:36:19 +
> > 
> I suppose that's the real problem here:
> 
> > > *** buffer overflow detected ***: /usr/dt/bin/ttsession terminated
> 
> Running some kind of automatic stack protection stuff?

Yes, this message is from GCC's ProPolice, enabled by default on Ubuntu.
However, it's also on by default on OpenBSD, and I've never seen it
crash this way.  It would be interesting to get a backtrace to see which
function triggers the stack overflow.  You can just run ttsession on its
own for this.

> > Although how on earth are you getting display 1108?
> 
> My guess: some problem related to 64 bits...
> 
> //Marcin
> 
> --
> Try New Relic Now & We'll Send You this Cool Shirt
> New Relic is the only SaaS-based application performance monitoring service 
> that delivers powerful full stack analytics. Optimize and monitor your
> browser, app, & servers with just a few lines of code. Try New Relic
> and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
> ___
> cdesktopenv-devel mailing list
> cdesktopenv-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
> 
> 

--
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Warnings in DtSvc

2013-07-21 Thread Pascal Stumpf

See attached patch; there's a few TODOs left, but it's a start.
>From 9fc0ef60b8a2ab04ab4a4df20924195398b0ef50 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Sun, 21 Jul 2013 22:55:09 +0200
Subject: [PATCH] Kill lots of warnings in DtSvc.

---
 cde/lib/DtSvc/DtEncap/MemoryMgr.c|   6 +-
 cde/lib/DtSvc/DtEncap/Symbolic.c |   2 +
 cde/lib/DtSvc/DtEncap/connect.c  |  13 ++-
 cde/lib/DtSvc/DtEncap/local.c|   4 +-
 cde/lib/DtSvc/DtEncap/nls.c  |   1 +
 cde/lib/DtSvc/DtEncap/pty.c  |   7 +-
 cde/lib/DtSvc/DtEncap/remote.c   |   4 +-
 cde/lib/DtSvc/DtEncap/spc-env.c  |   1 +
 cde/lib/DtSvc/DtEncap/spc-error.c|  10 +-
 cde/lib/DtSvc/DtEncap/spc-exec.c |   8 +-
 cde/lib/DtSvc/DtEncap/spc-net.c  |   4 +
 cde/lib/DtSvc/DtEncap/spc-obj.c  |  10 ++
 cde/lib/DtSvc/DtEncap/spc-proto.c|   4 +-
 cde/lib/DtSvc/DtEncap/spc-sm.c   |   5 +
 cde/lib/DtSvc/DtEncap/spc-termio.c   | 192 +--
 cde/lib/DtSvc/DtEncap/spc-util.c |   3 +
 cde/lib/DtSvc/DtEncap/spc-xt.c   |   3 +-
 cde/lib/DtSvc/DtEncap/spc.c  |  22 +++-
 cde/lib/DtSvc/DtEncap/stringbuf.c|   4 +-
 cde/lib/DtSvc/DtUtil1/Action.c   |   3 +-
 cde/lib/DtSvc/DtUtil1/ActionDb.c |  59 +--
 cde/lib/DtSvc/DtUtil1/ActionFind.c   |  18 ++--
 cde/lib/DtSvc/DtUtil1/ActionTt.c |   1 +
 cde/lib/DtSvc/DtUtil1/ActionUtil.c   |   9 +-
 cde/lib/DtSvc/DtUtil1/CmdMain.c  |   1 +
 cde/lib/DtSvc/DtUtil1/DbReader.c |   2 +-
 cde/lib/DtSvc/DtUtil1/DbUtil.c   |   2 +-
 cde/lib/DtSvc/DtUtil2/ChkpntClient.c |   6 +-
 cde/lib/DtSvc/DtUtil2/ChkpntListen.c |   1 +
 cde/lib/DtSvc/DtUtil2/ChkpntP.h  |   8 +-
 cde/lib/DtSvc/DtUtil2/CmdUtility.c   |   1 +
 cde/lib/DtSvc/DtUtil2/DtEnvMap.c |   8 +-
 cde/lib/DtSvc/DtUtil2/DtNlUtils.c|   1 +
 cde/lib/DtSvc/DtUtil2/EnvControl.c   |   8 +-
 cde/lib/DtSvc/DtUtil2/Hash.c |   4 +-
 cde/lib/DtSvc/DtUtil2/MsgCat.c   |   1 +
 cde/lib/DtSvc/DtUtil2/PrintXErr.c|   3 +
 cde/lib/DtSvc/DtUtil2/SharedProcs.c  |   1 +
 cde/lib/DtSvc/DtUtil2/SmCreateDirs.c |  13 +--
 cde/lib/DtSvc/DtUtil2/Utility.c  |   4 +-
 cde/lib/DtSvc/DtUtil2/XlationSvc.c   |   2 +
 cde/lib/DtSvc/DtUtil2/XmWrap.c   |   1 +
 42 files changed, 275 insertions(+), 185 deletions(-)

diff --git a/cde/lib/DtSvc/DtEncap/MemoryMgr.c 
b/cde/lib/DtSvc/DtEncap/MemoryMgr.c
index 668854d..4644b85 100644
--- a/cde/lib/DtSvc/DtEncap/MemoryMgr.c
+++ b/cde/lib/DtSvc/DtEncap/MemoryMgr.c
@@ -36,6 +36,8 @@
 #include "/usr/include/apollo/shlib.h"
 #endif
 
+#include 
+
 #include  /* NOTE: sbport.h must be the first include. */
 
 #include 
@@ -55,8 +57,8 @@ void * XeMalloc( size_t size )
 XeString  ptr;
 
 if (!size) return 0;
-if (ptr = malloc(size)) {
-   *ptr = (XeChar)NULL;   /* Force first byte to NULL for bozos who */
+if ((ptr = malloc(size))) {
+   *ptr = (XeChar)0;   /* Force first byte to NULL for bozos who */
   /* think malloc zeros memory! */
return ptr;
 }
diff --git a/cde/lib/DtSvc/DtEncap/Symbolic.c b/cde/lib/DtSvc/DtEncap/Symbolic.c
index 76d978f..378ca89 100644
--- a/cde/lib/DtSvc/DtEncap/Symbolic.c
+++ b/cde/lib/DtSvc/DtEncap/Symbolic.c
@@ -36,6 +36,8 @@
 #define SBSTDINC_H_NO_REDEFINE
 #endif
 
+#include 
+
 #include /* NOTE: sbport.h must be the first 
include. */
 
 #include 
diff --git a/cde/lib/DtSvc/DtEncap/connect.c b/cde/lib/DtSvc/DtEncap/connect.c
index b9f0f09..2338f16 100644
--- a/cde/lib/DtSvc/DtEncap/connect.c
+++ b/cde/lib/DtSvc/DtEncap/connect.c
@@ -32,6 +32,8 @@
  * (c) Copyright 1993, 1994 Novell, Inc.   *
  */
 
+#include 
+
 #include /* NOTE: sbport.h must be the first 
include. */
 
 #include  / needed by gethostbyname et al */
@@ -208,6 +210,7 @@ UnParseFileString(XeString host, XeString path)
 
 
 /*+*/
+int
 XeParseFileString(XeString line,
  XeString *host_addr,
  XeString *path_addr)
@@ -261,7 +264,7 @@ GetDomainName(XeString buffer, unsigned int bufsize)
int status;

/* try to get domain name from hostname */
-   if (status = gethostname(tmpbuf, bufsize)) {
+   if ((status = gethostname(tmpbuf, bufsize))) {
   XeFree(tmpbuf);
   return status; /* failed gethostname */
}
@@ -287,7 +290,7 @@ GetDomainName(XeString buffer, unsigned int bufsize)
 _DtSvcProcessUnlock();
 return -1;
   }
-  if (ptr = strstr(host_ret->h_name, (XeString)".")) /* if dot in 
canonical name */
+  if ((ptr = strstr(host_ret->h_name, (XeString)"."))) /* if dot in 
canonical name */
 domainname = strdup(ptr);
}
 
@@ -308,9 +311,9 @@ Xegetshorthostname(XeString buffer, unsigned int bufsize)
XeString ptr;
int status;

-   if (status = gethostnam

[cdesktopenv-devel] -fpermissive in programs/nsgmls

2013-07-22 Thread Pascal Stumpf

see patch.
>From da96c25f0a9fbc1508918576ac2787df0d4734e8 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 13:07:00 +0200
Subject: [PATCH] Do not use -fpermissive in programs/nsgmls.  It's not needed.

---
 cde/programs/nsgmls/Imakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 989b4fd..6e07d98 100644
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -86,8 +86,7 @@ M4 = /bin/m4
  */
 CXXOPTIONS = \
   -DSP_VOLATILE=volatile -DSP_CONST=const -DSP_ANSI_CLASS_INST \
-  -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST -fno-implicit-templates \
-  -fpermissive
+  -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST -fno-implicit-templates
 
 /*
  * Flags passed into compile step when doing manual template instantiation.
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] sync warning flags between cc and c++ on OpenBSD

2013-07-22 Thread Pascal Stumpf

see patch
>From 232a01484abf338ee04265ef1c4a2a977913410d Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 13:38:58 +0200
Subject: [PATCH] sync warning flags betseen cc and c++ on OpenBSD

---
 cde/config/cf/OpenBSD.cf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 1ebc7a0..43d3114 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1019,6 +1019,8 @@ install:: fonts.alias 
@@\
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #define CplusplusLibC   -lstdc++
+#define CplusplusOptions   -Wall -Wpointer-arith -Wno-unused 
-Wno-write-strings -Wno-switch
+#define LibraryCplusplusOptions-Wall -Wpointer-arith -Wno-unused 
-Wno-write-strings -Wno-switch
 
 #define ArchitectureDefines-DOPENBSD_ARCHITECTURE
 
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] A few more warnings in DtPrint

2013-07-22 Thread Pascal Stumpf

See patch.
>From 59e8fe9e98c9dc38e1634911dd954ef8ca18eb7e Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 14:31:46 +0200
Subject: [PATCH] kill a few more warnings in DtPrint

---
 cde/include/Xm/XmPrivate.h  | 12 
 cde/include/Xm/extractprototype.awk |  3 +++
 cde/lib/DtPrint/PrintSetupB.c   |  2 ++
 cde/lib/DtPrint/PsubUtil.c  |  1 +
 4 files changed, 18 insertions(+)

diff --git a/cde/include/Xm/XmPrivate.h b/cde/include/Xm/XmPrivate.h
index c1f3233..46eb94d 100644
--- a/cde/include/Xm/XmPrivate.h
+++ b/cde/include/Xm/XmPrivate.h
@@ -33,8 +33,20 @@ extern XmWidgetExtData _XmGetWidgetExtData(
 #else
 unsigned char extType) ;
 #endif /* NeedWidePrototypes */
+/* Extracted from BulletinBI.h */
+extern void _XmBulletinBoardSizeUpdate(
+Widget wid) ;
+extern void _XmBulletinBoardSetDynDefaultButton(
+Widget wid,
+Widget newDefaultButton) ;
 /* Extracted from IconFileP.h */
 extern void XmeFlushIconFileCache(String   path);
+/* Extracted from ManagerI.h */
+extern void _XmManagerHelp(
+Widget wid,
+XEvent *event,
+String *params,
+Cardinal *num_params) ;
 /* Extracted from MenuStateI.h */
 extern void _XmSetInDragMode(
 Widget widget,
diff --git a/cde/include/Xm/extractprototype.awk 
b/cde/include/Xm/extractprototype.awk
index 1f0aa14..d6c46ed 100644
--- a/cde/include/Xm/extractprototype.awk
+++ b/cde/include/Xm/extractprototype.awk
@@ -66,4 +66,7 @@ function proto() {
 /_XmPrimitiveLeave/ { proto(); }
 /_XmPrimitiveFocusOut/ { proto(); }
 /_XmPrimitiveFocusIn\(/ { proto(); }
+/_XmBulletinBoardSetDynDefaultButton/ { proto(); }
+/_XmBulletinBoardSizeUpdate/ { proto(); }
+/_XmManagerHelp/ { proto(); }
 /XmeFlushIconFileCache/ { proto(); }
diff --git a/cde/lib/DtPrint/PrintSetupB.c b/cde/lib/DtPrint/PrintSetupB.c
index 5835b0e..f640eaa 100644
--- a/cde/lib/DtPrint/PrintSetupB.c
+++ b/cde/lib/DtPrint/PrintSetupB.c
@@ -45,6 +45,7 @@
 #undef MAXINT
 #endif
 
+#include 
 #include 
 #if defined(CSRG_BASED)
 #define MAXINT INT_MAX
@@ -58,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/cde/lib/DtPrint/PsubUtil.c b/cde/lib/DtPrint/PsubUtil.c
index 6bca3a7..5d6b72c 100644
--- a/cde/lib/DtPrint/PsubUtil.c
+++ b/cde/lib/DtPrint/PsubUtil.c
@@ -38,6 +38,7 @@
  * Include Files
  *
  */
+#include 
 #include 
 #include 
 #include 
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Do not hardcode /usr/dt in print.dt.

2013-07-22 Thread Pascal Stumpf

See patch.
>From 83f8b45219b5f06c85149db3024c3f91da0d43ad Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 21:56:37 +0200
Subject: [PATCH] Do not hardcode /usr/dt in print.dt.

---
 cde/programs/types/print.dt.src | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cde/programs/types/print.dt.src b/cde/programs/types/print.dt.src
index ff4205d..e8dfd97 100644
--- a/cde/programs/types/print.dt.src
+++ b/cde/programs/types/print.dt.src
@@ -52,14 +52,14 @@ ACTION Print
ARG_TYPE*
TYPECOMMAND
WINDOW_TYPE NO_STDIO
-   EXEC_STRING /usr/dt/bin/dtlp "%(File)Arg_1%"
+   EXEC_STRING CDE_INSTALLATION_TOP/bin/dtlp "%(File)Arg_1%"
DESCRIPTION %|nls-7010-#This#|
 }
 ACTION PrintRaw
 {
TYPECOMMAND
WINDOW_TYPE NO_STDIO
-   EXEC_STRING /usr/dt/bin/dtlp -w "%(File)Arg_1%"
+   EXEC_STRING CDE_INSTALLATION_TOP/bin/dtlp -w "%(File)Arg_1%"
 }
 
 XCOMM 
@@ -82,7 +82,7 @@ ACTION DtPrintManager
 ICONFpPrtmg
 TYPECOMMAND
WINDOW_TYPE NO_STDIO
-EXEC_STRING /usr/dt/bin/dtprintinfo -all
+EXEC_STRING CDE_INSTALLATION_TOP/bin/dtprintinfo -all
DESCRIPTION %|nls-7024-#The#|
 }
 
@@ -95,7 +95,7 @@ ACTION Dtprintinfo
 ICONFpprnt
 TYPECOMMAND
WINDOW_TYPE NO_STDIO
-EXEC_STRING /usr/dt/bin/dtprintinfo -p "%(String)Arg_1%"
+EXEC_STRING CDE_INSTALLATION_TOP/bin/dtprintinfo -p 
"%(String)Arg_1%"
DESCRIPTION %|nls-7012-#The#|
 }
 
@@ -106,7 +106,7 @@ ACTION Dtprintinfo
 ICONFpprnt
 TYPECOMMAND
WINDOW_TYPE NO_STDIO
-EXEC_STRING /usr/dt/bin/dtprintinfo
+EXEC_STRING CDE_INSTALLATION_TOP/bin/dtprintinfo
DESCRIPTION %|nls-7012-#The#|
 }
 
@@ -126,7 +126,7 @@ ACTION DtPrint
 ICON   Fpprnt
TYPECOMMAND
WINDOW_TYPE NO_STDIO
-   EXEC_STRING /usr/dt/bin/dtaction Print "%(File)Arg_1%"
+   EXEC_STRING CDE_INSTALLATION_TOP/bin/dtaction Print "%(File)Arg_1%"
DESCRIPTION %|nls-7010-#The#|
 }
 
@@ -164,7 +164,7 @@ ACTION Printer_Trash
 {
 TYPECOMMAND
 WINDOW_TYPE NO_STDIO
-EXEC_STRING /usr/dt/bin/dterror.ds \
+EXEC_STRING CDE_INSTALLATION_TOP/bin/dterror.ds \
 "%|nls-7018-#Putting a#|" \
 "%|nls-7019-#Delete Printer#|" \
 "%|nls-6-#OK#|"
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Xreset.src: do not hardcode /usr/dt

2013-07-22 Thread Pascal Stumpf

See patch.
>From 02cd31e286597a38a3194819969aeb470a639249 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 21:59:15 +0200
Subject: [PATCH] Xreset.src: Do not hardcode /usr/dt.

---
 cde/programs/dtlogin/config/Xreset.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtlogin/config/Xreset.src 
b/cde/programs/dtlogin/config/Xreset.src
index d238798..6abe414 100644
--- a/cde/programs/dtlogin/config/Xreset.src
+++ b/cde/programs/dtlogin/config/Xreset.src
@@ -40,9 +40,9 @@ XCOMM
 XCOMM  Update action types for any printers created during the session  
 XCOMM
 
-if [ -x /usr/dt/bin/dtprintinfo ] 
+if [ -x CDE_INSTALLATION_TOP/bin/dtprintinfo ] 
 then
-   /usr/dt/bin/dtprintinfo -populate
+   CDE_INSTALLATION_TOP/bin/dtprintinfo -populate
 fi
 
 XCOMM
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Remove hardcoded /usr/dt from dtlogin/config

2013-07-22 Thread Pascal Stumpf

See patch.
>From 25a49969a94615a7e4abcc000332caa1704a0b17 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 22:14:45 +0200
Subject: [PATCH] s,/usr/dt,CDE_INSTALLATION_TOP,g in dtlogin/config

---
 cde/programs/dtlogin/config/0015.sun.env.src|  4 ++--
 cde/programs/dtlogin/config/Xconfig.src |  4 ++--
 cde/programs/dtlogin/config/Xresources.ow.src   |  2 +-
 cde/programs/dtlogin/config/Xresources.src  |  2 +-
 cde/programs/dtlogin/config/Xsession.ow.src | 10 +-
 cde/programs/dtlogin/config/Xsession.src| 10 +-
 cde/programs/dtlogin/config/Xsetup.src  |  4 ++--
 cde/programs/dtlogin/config/current.session.src |  4 ++--
 cde/programs/dtlogin/config/display.current.session.src |  4 ++--
 cde/programs/dtlogin/config/display.home.session.src|  4 ++--
 cde/programs/dtlogin/config/home.session.src|  4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/cde/programs/dtlogin/config/0015.sun.env.src 
b/cde/programs/dtlogin/config/0015.sun.env.src
index f9af9fa..d57d6dc 100644
--- a/cde/programs/dtlogin/config/0015.sun.env.src
+++ b/cde/programs/dtlogin/config/0015.sun.env.src
@@ -60,9 +60,9 @@ XCOMM 
##
   HASH
   if [ -z "$AB_CARDCATALOG" ]
   then
-  export AB_CARDCATALOG=/usr/dt/share/answerbooks/$LANG/ab_cardcatalog
+  export 
AB_CARDCATALOG=CDE_INSTALLATION_TOP/share/answerbooks/$LANG/ab_cardcatalog
   else
-  export 
AB_CARDCATALOG=/usr/dt/share/answerbooks/$LANG/ab_cardcatalog:$AB_CARDCATALOG
+  export 
AB_CARDCATALOG=CDE_INSTALLATION_TOP/share/answerbooks/$LANG/ab_cardcatalog:$AB_CARDCATALOG
   fi
 
   HASH
diff --git a/cde/programs/dtlogin/config/Xconfig.src 
b/cde/programs/dtlogin/config/Xconfig.src
index 16cbe4b..57f0ec9 100644
--- a/cde/programs/dtlogin/config/Xconfig.src
+++ b/cde/programs/dtlogin/config/Xconfig.src
@@ -136,9 +136,9 @@ XCOMM
 XCOMM  Dtlogin*userPath:  
 
 #if defined(linux)
-Dtlogin*userPath:  /bin:/usr/bin:/sbin:/usr/sbin:/usr/dt/bin
+Dtlogin*userPath:  
/bin:/usr/bin:/sbin:/usr/sbin:CDE_INSTALLATION_TOP/bin
 #elif defined(CSRG_BASED)
-Dtlogin*userPath:  
/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/dt/bin
+Dtlogin*userPath:  
/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:CDE_INSTALLATION_TOP/bin
 #endif
 
 
diff --git a/cde/programs/dtlogin/config/Xresources.ow.src 
b/cde/programs/dtlogin/config/Xresources.ow.src
index 86ac7ae..42f1d27 100644
--- a/cde/programs/dtlogin/config/Xresources.ow.src
+++ b/cde/programs/dtlogin/config/Xresources.ow.src
@@ -18,5 +18,5 @@ Dtlogin*altDtsIncrement:  True
 
 Dtlogin*altDtName: %|nls-291-#OpenWindows#|
 Dtlogin*altDtKey:  /usr/openwin/bin/olwm
-Dtlogin*altDtStart:/usr/dt/config/Xsession.ow
+Dtlogin*altDtStart:CDE_INSTALLATION_TOP/config/Xsession.ow
 Dtlogin*altDtLogo: OWlogo
diff --git a/cde/programs/dtlogin/config/Xresources.src 
b/cde/programs/dtlogin/config/Xresources.src
index 9930c98..65cd558 100644
--- a/cde/programs/dtlogin/config/Xresources.src
+++ b/cde/programs/dtlogin/config/Xresources.src
@@ -185,7 +185,7 @@ Dtlogin*preeditType:
 !!  languages available on the login screen. The Dtlogin*languageList
 !!  resource takes precidence over this resource.
 !!
-Dtlogin*languageListCmd: /usr/dt/bin/dtlslocale
+Dtlogin*languageListCmd: CDE_INSTALLATION_TOP/bin/dtlslocale
 
 #undef C
 XCOMM undef C
diff --git a/cde/programs/dtlogin/config/Xsession.ow.src 
b/cde/programs/dtlogin/config/Xsession.ow.src
index 9d277c7..5dba57a 100644
--- a/cde/programs/dtlogin/config/Xsession.ow.src
+++ b/cde/programs/dtlogin/config/Xsession.ow.src
@@ -16,7 +16,7 @@ XCOMM ##
 XCOMM 
 
 
-DTDSPMSG=/usr/dt/bin/dtdspmsg
+DTDSPMSG=CDE_INSTALLATION_TOP/bin/dtdspmsg
 
 if [ -z "$SESSIONTYPE" ]
 then
@@ -30,19 +30,19 @@ fi
 
 if [ -z "$SDT_ALT_SESSION" ]
 then
-   export SDT_ALT_SESSION="/usr/dt/config/Xsession.ow2"
+   export SDT_ALT_SESSION="CDE_INSTALLATION_TOP/config/Xsession.ow2"
 fi
 
 if [ -z "$SDT_ALT_HELLO" ]
 then
   if [ -x $DTDSPMSG ]; then 
- export SDT_ALT_HELLO="/usr/dt/bin/dthello -string '`$DTDSPMSG -s 37 
/usr/dt/lib/nls/msg/$LANG/dthello.cat 1 'Starting the OpenWindows Desktop'`' &"
+ export SDT_ALT_HELLO="CDE_INSTALLATION_TOP/bin/dthello -string 
'`$DTDSPMSG -s 37 CDE_INSTALLATION_TOP/lib/nls/msg/$LANG/dthello.cat 1 
'Starting the OpenWindows Desktop'`' &"
   else
- export SDT_ALT_HELLO="/usr/dt/bin/dthello -string 'Starting the 
OpenWindows Desktop' &"
+ export SDT_ALT_HELLO="CDE_INSTALLATION_TOP/bin/dthello -string 'Starting 
the OpenWindows Desktop' &"
   fi
 fi
 
 e

[cdesktopenv-devel] Simplify programs/Imakefile

2013-07-22 Thread Pascal Stumpf

See patch.
>From cffb50d896a962f1183fef1e9b5575c234be27df Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 22:03:34 +0200
Subject: [PATCH] Simplify programs/Imakefile a bit.  dtksh, dtlogin and dtcm
 build everywhere.

---
 cde/programs/Imakefile | 22 +-
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index b04800f..b95ee85 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -8,43 +8,31 @@ NSGMLSDIR = nsgmls
 EXTRADIRS = types localized tttypes $(NSGMLSDIR) util
 
 XCOMM some of these cannot be built on linux yet.
-XCOMM dtksh dtinfo
+XCOMM dtinfo
 #if defined(LinuxArchitecture)
-DTKSHDIR = dtksh
 DTINFODIR = 
-DTCMDIR = dtcm
-DTLOGINDIR = dtlogin
 #elif defined(OpenBSDArchitecture)
-DTKSHDIR = dtksh
 DTINFODIR = 
-DTCMDIR = dtcm
-DTLOGINDIR = dtlogin
 #elif defined(FreeBSDArchitecture)
-DTKSHDIR = dtksh
 DTINFODIR =
-DTCMDIR = dtcm
-DTLOGINDIR = dtlogin
 #else
-DTKSHDIR = dtksh
 DTINFODIR = dtinfo
-DTCMDIR = dtcm
-DTLOGINDIR = dtlogin
 #endif
 
 
-SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm $(DTLOGINDIR) \
+SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
dtcalc dtaction dtspcd \
-   dtscreen $(DTKSHDIR) $(DTCMDIR) dtsearchpath \
+   dtscreen dtksh dtcm dtsearchpath \
 dtappbuilder dtappintegrate dtprintegrate dtconfig \
 dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
 
-LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile $(DTLOGINDIR) dtwm \
+LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
dtcalc dtaction dtcreate \
-   dtscreen $(DTKSHDIR) $(DTCMDIR) dtsearchpath \
+   dtscreen dtksh dtcm dtsearchpath \
 dtappbuilder dtappintegrate dtprintegrate dtprintinfo dtdspmsg \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] adapt _common.ksh.src

2013-07-22 Thread Pascal Stumpf

See patch.
>From 358cc571410cabcb40c2734d3cf59679aa7b3e1d Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Mon, 22 Jul 2013 23:39:13 +0200
Subject: [PATCH] Adapt dtlogin/config/_common.ksh.src for OpenBSD:

* ps(1) is totally different on BSD and Linux.  The OSF commandline works fine.
* fontpath is in /usr/X11R6 on OpenBSD.
---
 cde/programs/dtlogin/config/_common.ksh.src | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtlogin/config/_common.ksh.src 
b/cde/programs/dtlogin/config/_common.ksh.src
index 6386d13..37cc227 100644
--- a/cde/programs/dtlogin/config/_common.ksh.src
+++ b/cde/programs/dtlogin/config/_common.ksh.src
@@ -32,11 +32,11 @@
   HASH
   HASH Determine Xsession parent
   HASH
-#if defined (__osf__)
+#if defined (__osf__) || defined(__OpenBSD__)
   pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
 #elif defined(USL) && (OSMAJORVERSION > 1)
   pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $6}')
-#elif defined(linux) || defined(CSRG_BASED) && !defined(__FreeBSD__)
+#elif defined(linux)
   pexec=$(LC_TIME=C /bin/ps -p $PPID 2>/dev/null | awk 'NR==2 {print $4}')
 #elif defined(__FreeBSD__)
   pexec=$(LC_TIME=C /bin/ps -o comm= -p $PPID 2>/dev/null)
@@ -499,7 +499,11 @@ SetKeyboardMap()
 #ifdef cpp_Xsetup
 if [ "$DTXSERVERLOCATION" != "remote" ]; then
   fontpath=
+#if defined(__FreeBSD__)
   FONTLIB=/usr/local/lib/X11/fonts
+#elif defined(__OpenBSD__)
+  FONTLIB=/usr/X11R6/lib/X11/fonts
+#endif
   for i in misc 75dpi 100dpi Speedo Type1 PJE
   do
 if [ -f $FONTLIB/$i/fonts.dir ];  then
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] error.ds.src: don't hardcode /usr/dt

2013-07-22 Thread Pascal Stumpf

See patch.
>From c44219dedcaf7102752a480a987ae82e9023c758 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 23 Jul 2013 00:19:04 +0200
Subject: [PATCH] error.ds.src: don't hardcode /usr/dt

---
 cde/programs/types/error.ds.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cde/programs/types/error.ds.src b/cde/programs/types/error.ds.src
index 189167a..7230134 100644
--- a/cde/programs/types/error.ds.src
+++ b/cde/programs/types/error.ds.src
@@ -24,7 +24,7 @@ QuitCB()
 XCOMM  When the Help button is pressed, map a help window.
 HelpCB()
 {
-/usr/dt/bin/dthelpview -helpVolume Misctopic -locationId 
ConfigurePrintersSubpanelTA
+CDE_INSTALLATION_TOP/bin/dthelpview -helpVolume Misctopic -locationId 
ConfigurePrintersSubpanelTA
 }
 
 XCOMM # Create the Main UI #
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] security fix for dtappintegrate

2013-07-22 Thread Pascal Stumpf

see patch.
>From 30cf6ace3e74a135dd98f8dcbcad70b6f605edb7 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 23 Jul 2013 00:59:23 +0200
Subject: [PATCH] SECURITY fix for dtappintegrate: Use mktemp(1) to generate a
 template.

Using a fixed filename in /tmp is just begging for a symlink attack ...
---
 cde/programs/dtappintegrate/dtappintegrate.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cde/programs/dtappintegrate/dtappintegrate.src 
b/cde/programs/dtappintegrate/dtappintegrate.src
index 6a4f8ab..3006a87 100755
--- a/cde/programs/dtappintegrate/dtappintegrate.src
+++ b/cde/programs/dtappintegrate/dtappintegrate.src
@@ -300,7 +300,7 @@ FRONTPANEL_FILES=*.fp
 APPMAN_FILES="(*)"
 
 ID=$(id)
-LOGFILE=/tmp/dtappint.log
+LOGFILE=$(mktemp /tmp/dtappint.log)
 PATH=CDE_INSTALLATION_TOP/bin:/usr/bin
 
 XCOMM ---
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] iostream.h deprecation warnings in dtsearchpath

2013-07-23 Thread Pascal Stumpf

See patch.
>From a14899dc8d36ab1cd0b72f8a891aed01c38bcc88 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 23 Jul 2013 13:21:51 +0200
Subject: [PATCH] Kill iostream.h deprecation warnings on *BSD.

---
 cde/programs/dtsearchpath/libCliSrv/TTFile.C  | 6 +++---
 cde/programs/dtsearchpath/libCliSrv/TTFile.h  | 2 +-
 cde/programs/dtsearchpath/libCliSrv/UnixEnv.C | 2 +-
 cde/programs/dtsearchpath/libCliSrv/cstring.C | 2 +-
 cde/programs/dtsearchpath/libCliSrv/cstring.h | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cde/programs/dtsearchpath/libCliSrv/TTFile.C 
b/cde/programs/dtsearchpath/libCliSrv/TTFile.C
index 2a0ec64..d55efac 100644
--- a/cde/programs/dtsearchpath/libCliSrv/TTFile.C
+++ b/cde/programs/dtsearchpath/libCliSrv/TTFile.C
@@ -95,7 +95,7 @@ TTFile & TTFile::operator=
 return *this;
 }
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 std::ostream & operator<<
(
std::ostream & os,
@@ -110,7 +110,7 @@ ostream & operator<<
 #endif
 {
 if (file.ttFileOpFailed())
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
return os << "Error in filename mapping; status = " 
  << file.getStatus() << std::endl;
 #else
@@ -118,7 +118,7 @@ ostream & operator<<
  << file.getStatus() << endl;
 #endif
 else
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
return os << file.data() << std::endl;
 #else
return os << file.data() << endl;
diff --git a/cde/programs/dtsearchpath/libCliSrv/TTFile.h 
b/cde/programs/dtsearchpath/libCliSrv/TTFile.h
index b5f0e8a..67f3f79 100644
--- a/cde/programs/dtsearchpath/libCliSrv/TTFile.h
+++ b/cde/programs/dtsearchpath/libCliSrv/TTFile.h
@@ -65,7 +65,7 @@ class TTFile : public CString {
   };
 #else
   void TT_Exception (char *);
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   friend std::ostream & operator<< (std::ostream &, TTFile &);
 #else
   friend ostream & operator<< (ostream &, TTFile &);
diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C 
b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
index e00bb2c..63e1f98 100644
--- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
+++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
@@ -37,7 +37,7 @@
 #endif
 #include 
 #include 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #include 
diff --git a/cde/programs/dtsearchpath/libCliSrv/cstring.C 
b/cde/programs/dtsearchpath/libCliSrv/cstring.C
index dc735e2..da5e5b0 100644
--- a/cde/programs/dtsearchpath/libCliSrv/cstring.C
+++ b/cde/programs/dtsearchpath/libCliSrv/cstring.C
@@ -566,7 +566,7 @@ int i;
 }
 }
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 std::ostream & operator<<
(
std::ostream &   os,
diff --git a/cde/programs/dtsearchpath/libCliSrv/cstring.h 
b/cde/programs/dtsearchpath/libCliSrv/cstring.h
index 8de0ba8..8133f7f 100644
--- a/cde/programs/dtsearchpath/libCliSrv/cstring.h
+++ b/cde/programs/dtsearchpath/libCliSrv/cstring.h
@@ -32,7 +32,7 @@
 #ifndef _CSTRING_H_
 #define _CSTRING_H_
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include 
 #else
 #include 
@@ -72,7 +72,7 @@ class CString {
   int   isNull() const;
   void  replace (const CString &, const CString &);
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   friend std::ostream & operator<< (std::ostream &, const CString &);
 #else
   friend ostream & operator<< (ostream &, const CString &);
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] ttsnoop warnings

2013-07-23 Thread Pascal Stumpf

See patch.
>From c13ad5f7e0ff04c49033710eb85372c136932022 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 23 Jul 2013 13:49:26 +0200
Subject: [PATCH] ttsnoop: deal with iostream.h and missing sentinels.

Replacing strstream may be possible, but requires more work and a better
understanding of the code.
---
 cde/programs/ttsnoop/DtTt.C  |  4 ++--
 cde/programs/ttsnoop/argChooser_stubs.C.src  | 30 
 cde/programs/ttsnoop/callbackChooser_stubs.C.src | 18 +++---
 cde/programs/ttsnoop/fileChooser_stubs.C.src |  8 +++
 cde/programs/ttsnoop/messageProps_stubs.C.src| 22 -
 cde/programs/ttsnoop/tt_c++.h|  2 +-
 cde/programs/ttsnoop/ttsnoop.C.src   |  2 +-
 7 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/cde/programs/ttsnoop/DtTt.C b/cde/programs/ttsnoop/DtTt.C
index 0f55c75..ee000a7 100644
--- a/cde/programs/ttsnoop/DtTt.C
+++ b/cde/programs/ttsnoop/DtTt.C
@@ -455,7 +455,7 @@ DtTtSetLabel(
return TT_OK;
 }
 XmString labelXmString = XmStringCreateLocalized( (String)string );
-XtVaSetValues( labelWidget, XmNlabelString, labelXmString, 0 );
+XtVaSetValues( labelWidget, XmNlabelString, labelXmString, NULL );
 XmStringFree( labelXmString );
 return TT_OK;
 }
@@ -730,7 +730,7 @@ _DtHelped(
 )
 {
char *topics;
-   XtVaGetValues( helpDialog, DtNstringData, &topics, 0 );
+   XtVaGetValues( helpDialog, DtNstringData, &topics, NULL );
if (! _DtCanHelp( topics )) {
return False;
}
diff --git a/cde/programs/ttsnoop/argChooser_stubs.C.src 
b/cde/programs/ttsnoop/argChooser_stubs.C.src
index 52028a3..e001515 100644
--- a/cde/programs/ttsnoop/argChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/argChooser_stubs.C.src
@@ -76,7 +76,7 @@ _DtArgChooserSet(
modeChoice = instance->modeChoice_items.INOUT_item;
break;
}
-   XtVaSetValues( instance->modeChoice, XmNmenuHistory, modeChoice, 0 );
+   XtVaSetValues( instance->modeChoice, XmNmenuHistory, modeChoice, NULL );
 
Widget valType = instance->argValTypeChoice_items.None_item;
if (! noValue) {
@@ -88,11 +88,11 @@ _DtArgChooserSet(
argValTypeChoice_items.int_item;
}
}
-   XtVaSetValues( instance->argValTypeChoice, XmNmenuHistory, valType, 0 );
+   XtVaSetValues( instance->argValTypeChoice, XmNmenuHistory, valType, 
NULL);
 
XmTextFieldSetString( instance->vtypeText, vtype );
-   XtVaSetValues( instance->argIvalBox, DtNposition, ival, 0 );
-   XtVaSetValues( instance->argValText, XmNvalue, val, 0 );
+   XtVaSetValues( instance->argIvalBox, DtNposition, ival, NULL );
+   XtVaSetValues( instance->argValText, XmNvalue, val, NULL );
 
_DtArgChooserSet( choice, entity, nth );
 }
@@ -152,16 +152,16 @@ _DtArgChooserSet(
}
 
DtTtSetLabel( instance->argChooserOkButton, okString );
-   XtVaSetValues( instance->argChooser, XmNtitle, title, 0 );
+   XtVaSetValues( instance->argChooser, XmNtitle, title, NULL );
DtTtSetLabel( instance->vtypeText_label, vtypeLabel );
XtSetSensitive( instance->vtypeText, vtypeActive );
XtSetSensitive( instance->modeChoice, modeActive );
 
// Remember dialog mode, entity, nth
-   XtVaSetValues( instance->argChooserOkButton, XmNuserData, choice, 0 );
+   XtVaSetValues( instance->argChooserOkButton, XmNuserData, choice, NULL 
);
XtVaSetValues( instance->argChooserCancelButton,
-  XmNuserData, entity, 0 );
-   XtVaSetValues( instance->argChooserHelpButton, XmNuserData, nth, 0 );
+  XmNuserData, entity, NULL );
+   XtVaSetValues( instance->argChooserHelpButton, XmNuserData, nth, NULL );
 
if (vtypeActive) {
// Pre-select vtype text
@@ -393,12 +393,12 @@ argOkayed(
 _DtArgChooserAction choice = _DtArgChooseNone;
 
 XtPointer pval;
-XtVaGetValues( instance->argChooserOkButton, XmNuserData, &pval, 0 );
+XtVaGetValues( instance->argChooserOkButton, XmNuserData, &pval, NULL );
 choice = (_DtArgChooserAction) (long) pval;
-XtVaGetValues( instance->argChooserCancelButton, XmNuserData, &pval, 0 );
+XtVaGetValues( instance->argChooserCancelButton, XmNuserData, &pval, NULL 
);
 msg = (Tt_message)pval;
 pat = (Tt_pattern)pval;
-XtVaGetValues( instance->argChooserHelpButton, XmNuserData, &pval, 0 );
+XtVaGetValues( instance->argChooserHelpButton, XmNuserData, &pval, NULL );
 nth = (int) (long) pval;
 
 char *vtype = XmTextFieldGetString( instance->vtypeText );
@@ -408,7 +408,7 @@ argOkayed(
 }
 
 Widget modeWidget;
-XtVaGetValues( instance->modeChoice, XmNmenuHistory, &m

[cdesktopenv-devel] OpenBSD.cf patch

2013-07-23 Thread Pascal Stumpf

See patch.
>From 4b0a4e16261b741bd19b2d48e0f4fc897693ee7c Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 23 Jul 2013 22:32:35 +0200
Subject: [PATCH] OpenBSD.cf: don't include xorg.cf (leftover)

---
 cde/config/cf/OpenBSD.cf | 12 
 1 file changed, 12 deletions(-)

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 43d3114..a376473 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -458,7 +458,6 @@ install:: fonts.alias   
@@\
 
 # endif /* XorgServer */
 
-# include 
 
 #endif /* AlphaArchitecture */
 
@@ -495,7 +494,6 @@ install:: fonts.alias   
@@\
 # ifndef HasX86Support
 #  define HasX86SupportYES
 # endif
-/* # include  */
 
 #endif /* AMD64Architecture */
 
@@ -573,7 +571,6 @@ install:: fonts.alias   
@@\
 #  define HasX86SupportUseElfFormat
 # endif
 
-# include 
 
 #endif /* i386Architecture */
 
@@ -609,7 +606,6 @@ install:: fonts.alias   
@@\
 
 # define ServerExtraDefines-DXFree86Server
 
-# include 
 
 #endif /* AmigaArchitecture */
 
@@ -630,7 +626,6 @@ install:: fonts.alias   
@@\
 
 # define ServerExtraDefines-DXFree86Server
 
-#include 
 
 #endif /* Hp300Architecture */
 
@@ -646,7 +641,6 @@ install:: fonts.alias   
@@\
 
 # define ServerExtraDefines-DXFree86Server
 
-# include 
 
 #endif /* mac68kArchitecture */
 
@@ -662,7 +656,6 @@ install:: fonts.alias   
@@\
 
 # define ServerExtraDefines-DXFree86Server
 
-# include 
 
 #endif /* Mvme68kArchitecture */
 
@@ -712,7 +705,6 @@ install:: fonts.alias   
@@\
 #  define XFree86ConsoleDefines -DWSCONS_SUPPORT
 # endif
 
-# include 
 
 #endif /* MipsArchitecture */
 
@@ -764,7 +756,6 @@ install:: fonts.alias   
@@\
 
 # endif /* XorgServer */
 
-# include 
 
 #endif /* PpcArchitecture */
 
@@ -835,7 +826,6 @@ install:: fonts.alias   
@@\
 # ifndef BuildXInputExt
 #  define BuildXInputExt   NO
 # endif
-# include 
 
 #endif /* SparcArchitecture */
 
@@ -865,7 +855,6 @@ install:: fonts.alias   
@@\
 #   define XFree86ConsoleDefines -DWSCONS_SUPPORT
 # endif
 
-# include 
 
 #endif /* Sparc64Architecture */
 
@@ -892,7 +881,6 @@ install:: fonts.alias   
@@\
 # define BuildGlxExt   NO
 # define BuildGLXLibrary   NO
 
-# include 
 
 #endif /* VaxArchitecture */
  
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtksh on OpenBSD/powerpc

2013-07-23 Thread Pascal Stumpf

See patch.
>From 5b66a72464c5a626071232cb5c7eedf074bf1a11 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Tue, 23 Jul 2013 23:19:16 +0200
Subject: [PATCH] Make dtksh build on OpenBSD/powerpc.

---
 cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c | 4 ++--
 cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c 
b/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
index e483420..a31c87a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
@@ -214,7 +214,7 @@ hashalloc __PARAM__((Hash_table_t* ref, ...), (va_alist)) 
__OTORP__(va_dcl)
tab->flags |= HASH_STATIC;
break;
case HASH_va_list:
-#if defined(CSRG_BASED) && !defined(__LP64__)
+#if defined(CSRG_BASED) && defined(__i386__)
if (vp < &va[elementsof(va)]) *vp++ = ap;
ap = va_arg(ap, va_list);
 #else
@@ -230,7 +230,7 @@ hashalloc __PARAM__((Hash_table_t* ref, ...), (va_alist)) 
__OTORP__(va_dcl)
case 0:
if (vp > va)
{
-#if defined(CSRG_BASED) && !defined(__LP64__)
+#if defined(CSRG_BASED) && defined(__i386__)
ap = *--vp;
 #else
vp--;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c 
b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
index 7ec0b91..bcc1c80 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
@@ -319,7 +319,7 @@ loop_fa :
default :   /* unknown directive */
if(extf)
{
-#if defined(CSRG_BASED) && !defined(__LP64__)
+#if defined(CSRG_BASED) && defined(__i386__)
va_list savarg = args;  /* is this portable? */
 #else
va_list savarg; /* is this portable?   
Sorry .. NO. */
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] fix dtdocbook on powerpc

2013-07-23 Thread Pascal Stumpf

See patch.
>From c92585e7135656a3874cc3226e94580de106 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Wed, 24 Jul 2013 00:55:59 +0200
Subject: [PATCH] include unistd.h for read(2) prototype.  Fixes dtdocbook on
 PowerPC.

There are a lot more warnings here, but this one was an actual bug.  Full
treatment pending ...
---
 cde/programs/dtdocbook/instant/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cde/programs/dtdocbook/instant/main.c 
b/cde/programs/dtdocbook/instant/main.c
index 5f06797..7cd0f95 100644
--- a/cde/programs/dtdocbook/instant/main.c
+++ b/cde/programs/dtdocbook/instant/main.c
@@ -78,6 +78,7 @@ static char *CopyRt =
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "LocaleXlate.h"
 #include "XlationSvc.h"
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] Add a TODO file.

2013-07-24 Thread Pascal Stumpf

See patch.  Feel free to add stuff/work on anything on the list. :)
>From 557d0b9b5008e05bf8dfe1fddd6d8d940158950d Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Wed, 24 Jul 2013 14:54:53 +0200
Subject: [PATCH] Add TODO.

---
 cde/TODO | 79 
 1 file changed, 79 insertions(+)
 create mode 100644 cde/TODO

diff --git a/cde/TODO b/cde/TODO
new file mode 100644
index 000..a7fee2c
--- /dev/null
+++ b/cde/TODO
@@ -0,0 +1,79 @@
+General:
+* get rid of all remaining warnings.  Goal is to be able to use -Wall without
+  too much annoying garbage in the build logs; especially:
+  * Replace strstream usage in ttsnoop
+  * LOTS of "string constant to char* conversions"
+  * unused variables
+  * 64bit problems.  The most obnoxious cases are where pointers are converted
+to ints and then used as array subscript.  Currently worked around by using
+longs, but of course, that is far from optimal.  We need something better
+(some sort of standardised hashtables?).
+* Usage of unsafe functions like strcpy, strcat, sprintf, mktemp, tmpnam etc.
+  The OpenBSD linker warns about those.  They should be replaced, and, if
+  necessary for your OS, an implementation of safe alternatives (strlcpy etc.)
+  should be provided.
+* Likewise, some scripts have been using temporary files in an unsafe way.
+  This can mostly be avoided by using mktemp(1) - someone should check *all*
+  scripts.
+* Many times, it it assumed that malloc(3) zeroes allocated memory.  Also, many
+  malloc(3) calls are vulnerable to int overflows (i.e. malloc(n * sz)).  Both
+  problems can be avoided by using calloc(3).  As these problems are somewhat
+  hard to detect, a complete audit should be performed ...
+
+* PREFIX cleanliness/FHS: Historically, /usr/dt has been the standard location
+  of CDE.  This value is hardcoded in many places still.  Find them and replace
+  with CDE_INSTALLATION_TOP.
+* Pending further discussion: Do not require a separate prefix for the CDE
+  hierarchy at all, but instead use customisable variables for BINDIR, SHAREDIR
+  etc.
+
+OS support:
+* CDE currently works on modern *BSD and Linux.  I think we ought to keep the
+  possibility to extend that support to most other Unices, even the ones that
+  were dropped by the upstream vendor (IRIX, OSF ...).  However, keeping
+  support for ancient versions of these OSes is debatable.  Dropping those
+  might really serve to disentangle #ifdef mazes.
+* Hunt down abuses of processor macros (i.e. __ppc__, __sparc__) to test for
+  OS features
+
+Man pages / Documentation:
+* Japanese documentation does not build.
+* Section numbering follows SVR4 conventions.  However, *BSD and most Linux
+  distributions follow BSD conventions.  This should be configurable at build
+  time, changing e.g. 1m -> 8, 4 -> 5 ...
+* Many pages generate "table width larger than line length" warnings in groff.
+  Don't know if it's possible to work around.
+* For the crazy: Write a doctomdoc program to generate pages in a much nicer
+  language.
+
+Icons/Wallpapers/Artwork:
+* They pretty much suck on any halfway modern monitor.  Provide better
+  resolutions.  (Or better yet, somehow hack SVG support into CDE, haha).
+
+Printing:
+* Remove requirement for Xprint.  It is obsolete, and many distributions do
+  not provide a Motif package linked against libXp any more.
+* Write a BSD lpr(1) backend.  Currently, there is only support for the various
+  SVR4 lp(1) implementations, and BSD lpr(1) is substantially different.
+* Test CUPS as a backend.  This is likely a lot easier than BSD'd LPD, but may
+  still need a few tweaks.
+
+DtMail:
+* Write support for lockspool(1) mailbox locking on OpenBSD (halfway done).
+
+DtKsh:
+* Investigate build against newer ksh93.  This is problematic due to license
+  reasons (EPL is incompatible to (L)GPL).
+
+Dtinfo:
+* Get it working :)
+
+Dtsession:
+* Requiring suid root just for the screensaver SUCKS.  Flesh out the 
screensaver
+  bits into a smaller dtscreensaver program, perhaps, or just use xlock(1) or
+  xscreensaver(1) with customised CDE themes.
+
+OS-specific problems:
+* OpenBSD:
+dtlogin(1): Keyboard does not work at login screen.
+dtsession(1): Apparently, keyboard layout is borked in the screensaver.
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] dtlogin: correct path to getty on OpenBSD

2013-07-25 Thread Pascal Stumpf

See patch.
>From 3d0308efe8544503baec6ad2005226b0c47a1b46 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf 
Date: Thu, 25 Jul 2013 12:28:33 +0200
Subject: [PATCH] dtlogin: correct path to getty.

---
 cde/programs/dtlogin/dm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index 87fab04..ca5c21c 100644
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -1494,6 +1494,8 @@ SetTitle( char *name, char *ptr )
 
 #if defined (_AIX) && defined (_POWER) || defined (__osf__)
 #define GETTYPATH "/usr/sbin/getty"
+#elif defined(__OpenBSD__)
+#define GETTYPATH "/usr/libexec/getty"
 #elif !defined (__apollo)
 #define GETTYPATH "/etc/getty"
 #endif
-- 
1.8.3.1

--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

1 2 >

1 - 100 of 115 matches

Mail list logo