X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Flib%2FDtTerm%2FTerm%2FTermParse.c;h=594b3c62a4519c26c84f8c937d8d23d4e895ab2b;hb=aa1bfc0ab33ff7b8863a3623c599c015263bf1d2;hp=554c6a2461c1215fabf6d20c5122082b2e9dd923;hpb=0ecef859cfacb5118ef489be5b09b2cde7a70195;p=oweals%2Fcde.git

diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c
index 554c6a24..594b3c62 100644
--- a/cde/lib/DtTerm/Term/TermParse.c
+++ b/cde/lib/DtTerm/Term/TermParse.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -36,6 +36,8 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $"
  * (c) Copyright 1996 Hitachi.						*
  */
 
+#include <wctype.h>
+
 #include "TermHeader.h"
 #include "TermPrimDebug.h"
 #include "TermPrimP.h"
@@ -50,6 +52,8 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $"
 #include "TermFunctionKey.h"
 #include "TermParseTableP.h"
 #include "TermBufferP.h"
+#include "TermPrimUtil.h"
+#include "TermPrimParseTable.h"
 
 #if defined (__hpux)
 /*
@@ -63,11 +67,6 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $"
 #include  <values.h>
 #endif
 
-#if defined(USL) || defined(__uxp__)
-#include <ctype.h>
-#include <wctype.h>
-#endif
-
 /*****************************************************************************/
 
 #define NPARAM  16
@@ -274,7 +273,7 @@ _DtTermPModeSet(Widget w)   /*  DECSET CSI?ph */
           /* case 2:  can't return from vt52 mode */
           case 3: /* Column (132) */
                    if ( vtw->vt.c132 )  {  /* xterm allow 132 mode */
-                     (void) _DtTermFuncClearBuffer(w, NULL, fromParser);
+                     (void) _DtTermFuncClearBuffer(w, 0, fromParser);
                      vtw->term.tpd->cursorRow = TOPROW(vtw) ;
                      vtw->term.tpd->cursorColumn = FIRSTCOLUMN(vtw) ;
                      vtw->term.tpd->scrollLockTopRow = TOPROW(vtw);
@@ -362,7 +361,7 @@ _DtTermPModeReset(Widget w)   /* DECRST CSI?pl */
           /* case 2:   ** set vt52 mode */
           case 3: /* Column (80) */
                   if (vtw->vt.c132)  {   /* allow 132 mode */
-                    (void) _DtTermFuncClearBuffer(w, NULL, fromParser);
+                    (void) _DtTermFuncClearBuffer(w, 0, fromParser);
                     vtw->term.tpd->cursorRow = TOPROW(vtw) ;
                     vtw->term.tpd->cursorColumn = FIRSTCOLUMN(vtw) ;
                     vtw->term.tpd->scrollLockTopRow = TOPROW(vtw);
@@ -2197,7 +2196,7 @@ _DtTermParseSunMisc  /*  Misc sun esc seqs  */
 	s = XtMalloc(strlen(icon) + strlen(fmt) + 1);
       else 
 	s = buf;
-      sprintf(s,fmt);
+      sprintf(s, "%s", fmt);
       sendEscSequence(w,s) ;
       if (s != buf) XtFree(s);
       break ;
@@ -2208,7 +2207,7 @@ _DtTermParseSunMisc  /*  Misc sun esc seqs  */
 	s = XtMalloc(strlen(icon) + strlen(fmt) + 1);
       else 
 	s = buf;
-      sprintf(s,fmt);
+      sprintf(s, "%s", fmt);
       sendEscSequence(w,s) ;
       if (s != buf) XtFree(s);
       break ;