===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/str.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM_contrib2/asir2000/engine/str.c	2000/08/21 08:31:28	1.2
+++ OpenXM_contrib2/asir2000/engine/str.c	2018/03/29 01:32:52	1.6
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/str.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/str.c,v 1.5 2004/02/26 07:06:32 noro Exp $ 
 */
 #include "ca.h"
 
@@ -54,16 +54,45 @@ VL vl;
 STRING a,b;
 STRING *c;
 {
-	char *buf;
+  char *buf;
 
-	buf = (char *)MALLOC(strlen(BDY(a))+strlen(BDY(b))+1);
-	sprintf(buf,"%s%s",BDY(a),BDY(b));
-	MKSTR(*c,buf); 
+  buf = (char *)MALLOC_ATOMIC(strlen(BDY(a))+strlen(BDY(b))+1);
+  sprintf(buf,"%s%s",BDY(a),BDY(b));
+  MKSTR(*c,buf); 
 }
 
 int compstr(vl,a,b)
 VL vl;
 STRING a,b;
 {
-	return a ? (b?strcmp(BDY(a),BDY(b)):1) : (b?-1:0);
+  return a ? (b?strcmp(BDY(a),BDY(b)):1) : (b?-1:0);
+}
+
+/* primitive functions for BYTEARRAY */
+
+int compbytearray(vl,a,b)
+VL vl;
+BYTEARRAY a,b;
+{
+  int i;
+
+  if ( !a )
+    if ( b )
+      return -1;
+    else
+      return 0;
+  else if ( !b )
+    return 1;
+  else if ( a->len > b->len )
+    return 1;
+  else if ( a->len < b->len )
+    return -1;
+  else {
+    for ( i = 0; i < a->len; i++ )
+      if ( a->body[i] > b->body[i] )
+        return 1;
+      else if ( a->body[i] < b->body[i] )
+        return -1;
+    return 0;
+  }
 }