===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/sm1stackmachine.c,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM/src/kxx/sm1stackmachine.c	2001/05/06 07:53:01	1.3
+++ OpenXM/src/kxx/sm1stackmachine.c	2005/07/18 10:55:16	1.5
@@ -3,6 +3,8 @@
 #include "ox_kan.h"
 #include "serversm.h"
 extern int OXprintMessage;
+extern char *MsgStackTrace;
+extern char *MsgSourceTrace;
 
 /*  server stack machine */
 
@@ -57,8 +59,8 @@ int Sm1_setMathCap(ox_stream os) {
   /* Set the mathcap data of the client in the server. */
   /*  sm1 <====== ox_sm1  mathcap is set in ox_stream = FILE2 * */
   /* The mathcap data is on the stack. */
-  struct object ob;
-  struct object ob2;
+  struct object ob = OINIT;
+  struct object ob2 = OINIT;
   int n,i;
   ob = KSpop();
   KSpush(ob);  KSexecuteString(" (mathcap data is ) message message ");
@@ -93,7 +95,7 @@ char *Sm1_popString(void) {
 int Sm1_setName(void)
 {
   char *s;
-  struct object ob;
+  struct object ob = OINIT;
   s = Sm1_popString();
   if (s == NULL) {
     printf("NULL argument for setName.\n");
@@ -109,7 +111,7 @@ int Sm1_setName(void)
 int Sm1_evalName(void)
 {
   char *s;
-  struct object ob;
+  struct object ob = OINIT;
   s = Sm1_popString();
   if (s == NULL) {
     printf("NULL argument for evalName.\n");
@@ -137,8 +139,39 @@ int Sm1_popCMO(ox_stream fp,int serial)
 
 int Sm1_pushError2(int serial, int no, char *s)
 {
-  struct object ob;
-  ob = KnewErrorPacket(serial,no,s);
+  struct object ob = OINIT;
+  char *ss;
+  char *error_message="<ox103:error_message>";
+  char *message="<ox103:message>";
+  char *stack_trace="<ox103:stack_trace>";
+  char *source_trace="<ox103:source_trace>";
+  char *error_message2="</ox103:error_message>";
+  char *message2="</ox103:message>";
+  char *stack_trace2="</ox103:stack_trace>";
+  char *source_trace2="</ox103:source_trace>";
+  ss = (char *) sGC_malloc(strlen(s)+strlen(MsgStackTrace)+
+                           strlen(MsgSourceTrace)+
+                           strlen(error_message)+strlen(error_message2)+
+                           strlen(message)+strlen(message2)+
+                           strlen(stack_trace)+strlen(stack_trace2)+
+                           strlen(source_trace)+strlen(source_trace2)+2);
+
+  strcat(ss,error_message);
+  strcat(ss,message);
+  strcat(ss,s);
+  strcat(ss,message2);
+  if (MsgStackTrace != NULL) {
+	strcat(ss,stack_trace);
+	strcat(ss,MsgStackTrace);
+	strcat(ss,stack_trace2);
+  }
+  if (MsgSourceTrace != NULL) {
+	strcat(ss,source_trace);
+	strcat(ss,MsgSourceTrace);
+	strcat(ss,source_trace2);
+  }
+  strcat(ss,error_message2);
+  ob = KnewErrorPacket(serial,no,ss);
   KSpush(ob);
 }
 
@@ -177,7 +210,7 @@ void Sm1_dupErrors(void) {
 }
 
 void Sm1_pushCMOtag(int serial) {
-  struct object obj;
+  struct object obj = OINIT;
   int t;
   obj = KSpeek(0);
   t = KgetCmoTagOfObject(obj);