Merge branch 'master' into autotools-conversion

diff --cc cde/programs/dtsession/SrvPalette.c
index 75a64b3bffae4f8b1d082bfedebbc0434d1e16c9,55b722c968974afda91b5d35aa13d38245897709..f75b69296955091a68b4146ee1b0b438bf59fcfc
--- 1/cde/programs/dtsession/SrvPalette.c
--- 2/cde/programs/dtsession/SrvPalette.c
+++ b/cde/programs/dtsession/SrvPalette.c
@@@ -541,28 -541,29 +541,28 @@@ CheckMonitor
     /* cycle through each screen */
      for(screen_number=0;screen_number != colorSrv.NumOfScreens;screen_number++)
      {
-        sprintf(screenStr,"%d",screen_number);
+        snprintf(screenStr, sizeof(screenStr), "%d", screen_number);
         n = 0;
 -       XtSetArg(args[n], XmNbackground, 
 +       XtSetArg(args[n], XmNbackground,
             BlackPixelOfScreen(DefaultScreenOfDisplay(dpy))); n++;
         XtSetArg(args[n], XmNmappedWhenManaged, False); n++;
         XtSetArg (args[n], XmNwidth, 1); n++;
         XtSetArg (args[n], XmNheight, 1); n++;
 -       shell[screen_number] = XtAppCreateShell(screenStr, XmSCOLOR_SRV_NAME, 
 -                                               applicationShellWidgetClass, 
 +       shell[screen_number] = XtAppCreateShell(screenStr, XmSCOLOR_SRV_NAME,
 +                                               applicationShellWidgetClass,
                                                 dpy, args, n);
  
 -       /* 
 -      * widget needs to be realized for the window ID for 
 -      * selections to work 
 +       /*
 +      * widget needs to be realized for the window ID for
 +      * selections to work
        */
 -       
 +
         XtRealizeWidget(shell[screen_number]);
- 
-        sprintf(cust_msg,"%s%d", XmSCUSTOMIZE_DATA, screen_number);
-        colorSrv.XA_CUSTOMIZE[screen_number] =
 -       
+        snprintf(cust_msg, sizeof(cust_msg), "%s%d",
+                 XmSCUSTOMIZE_DATA, screen_number);
+        colorSrv.XA_CUSTOMIZE[screen_number] = 
           XInternAtom(dpy, cust_msg, FALSE);
 -       
 +
         /* go set ownership of the pixel set atoms */
         result = XtOwnSelection(shell[screen_number],
                               colorSrv.XA_CUSTOMIZE[screen_number],
@@@ -608,11 -614,15 +613,23 @@@
                 (struct _palette *) SRV_MALLOC( sizeof(struct _palette) + 1 );
  
             /*  allocate enough space for the name */
++<<<<<<< HEAD
 +           strcpy(tmpPalette, pColorSrvRsrc.MonochromePalette);
 +           for (token1=tmpPalette; *token1; token1++);
 +           while (token1!=tmpPalette && *token1!='.') token1--;
 +         if (!strcmp(token1,PALETTE_SUFFIX)) *token1 = '\0';
 +           colorSrv.pCurrentPalette[screen_number]->name =
++=======
+            snprintf(tmpPalette, SRVBUFSIZE, "%s",
+                     pColorSrvRsrc.MonochromePalette);
+            for (token1=tmpPalette; *token1; token1++)
+                ;
+            while (token1 != tmpPalette && *token1 != '.')
+                token1--;
+          if (!strcmp(token1, PALETTE_SUFFIX))
+                *token1 = '\0';
+            colorSrv.pCurrentPalette[screen_number]->name = 
++>>>>>>> master
                 (char *)SRV_MALLOC(strlen(tmpPalette) + 1);
             strcpy(colorSrv.pCurrentPalette[screen_number]->name,
                    (char *) tmpPalette);
@@@ -627,8 -637,10 +644,10 @@@
        /* write out the color or monochrome palette resource for the screen */
  
         xrdb_string = XtMalloc(BUFSIZ);
+        if (!xrdb_string)
+            return -1;
  
 -       if (colorSrv.TypeOfMonitor[0] == XmCO_HIGH_COLOR || 
 +       if (colorSrv.TypeOfMonitor[0] == XmCO_HIGH_COLOR ||
             colorSrv.TypeOfMonitor[0] == XmCO_MEDIUM_COLOR ||
             colorSrv.TypeOfMonitor[0] == XmCO_LOW_COLOR)
         {