OpenBSD patches for dtpdmd and dtprintinfo.

Casts, #ifdefs, SIGCLD ...

diff --git a/cde/programs/dtpdmd/manager.c b/cde/programs/dtpdmd/manager.c
index 55af0458b167225354588af7813ab706f400fb26..1893f5d13063d0208c5c09642a440ecf7cb42a14 100644 (file)
--- 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 94bc42387a43b866651d7b3184edd77f8e22f675..a93fbdad6c7a810960d5346944a0f1a7d2a5a52d 100644 (file)
--- 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 a0e593d701559ce78b6c49662f804695ac6df7d8..b2a978574950980c0d71e7ef464d9dbaf01ebf17 100644 (file)
--- 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 82780c34bd6e50d2f83edce956c4bbe54bba9b42..e5d5b4c084f48ce110df1b2b7f5ed9aeac674c6f 100644 (file)
--- 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 f02c903b51902ccc1ad8d18063c888e403a383ae..0a83a9f8e4c47109d993ee2f52386962d343ebaa 100644 (file)
--- 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 boolean int

diff --git a/cde/programs/dtprintinfo/objects/BaseObj.h b/cde/programs/dtprintinfo/objects/BaseObj.h
index 1b7a6e3e5fb182613c93a795de12855eaf839dd0..7925eec86058ee8ec4f44df19bc7b475f770e3c0 100644 (file)
--- a/cde/programs/dtprintinfo/objects/BaseObj.h
+++ b/cde/programs/dtprintinfo/objects/BaseObj.h
@@ -41,7 +41,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 boolean int

diff --git a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
index 71c756b919d10e1920d3148bacbe0d02a1dc21ce..7a32fdf18dccbfcf632e149f91cc2c332fde74a2 100644 (file)
--- a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
+++ b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
@@ -774,7 +774,7 @@ void LocalPrintJobs(char *printer, char **return_job_list, int *return_n_jobs)
 }
 #endif // HP LOCAL PARSER
 
-#if defined(__osf__) || defined(linux)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 //
 // DEC/OSF1 PARSER - Output from "lpstat -o<printer>
 //
@@ -870,7 +870,7 @@ void LocalPrintJobs(char *printer, char **return_job_list, int *return_n_jobs)
 #if defined(__osf__)
    sprintf(buf, "lpstat -o%s", printer);
 #endif
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
    sprintf(buf, "lpq -P%s", printer);
 #endif
 

diff --git a/cde/programs/dtprintinfo/util/Invoke.C b/cde/programs/dtprintinfo/util/Invoke.C
index 590adb7c2ee6fdf61914e7941b37ac8697eda345..838009fec74298f2b8faa9d70a5792d4d86e63c9 100644 (file)
--- a/cde/programs/dtprintinfo/util/Invoke.C
+++ b/cde/programs/dtprintinfo/util/Invoke.C
@@ -38,7 +38,9 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <errno.h>
+#if !defined(CSRG_BASED)
 #include <values.h>
+#endif
 #ifdef _AIX
 #include <strings.h>           /* need to get bzero defined */
 #endif /* _AIX */