hbytes xor

[chiark-tcl.git] / base / hook.c

diff --git a/base/hook.c b/base/hook.c
index 61593aba5a1bd5abb6a40c7040308772a2ce9978..a9d0316f0c90089cce1f1383caa5030b30dfc8f0 100644 (file)
--- a/base/hook.c
+++ b/base/hook.c
@@ -6,8 +6,9 @@
 #include "hbytes.h"
 #include "tables.h"
 
-int staticerr(Tcl_Interp *ip, const char *m) {
+int staticerr(Tcl_Interp *ip, const char *m, const char *ec) {
   Tcl_SetResult(ip, (char*)m, TCL_STATIC);
+  if (ec) Tcl_SetObjErrorCode(ip, Tcl_NewStringObj(ec,-1));
   return TCL_ERROR;
 }
 
@@ -146,7 +147,7 @@ static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
     objfreeir(o);
 
     if (l & 1) return staticerr(ip, "hbytes: conversion from hex:"
-                               " odd length in hex");
+                               " odd length in hex", "HBYTES SYNTAX");
 
     startbytes= bytes= hbytes_arrayspace(OBJ_HBYTES(o), l/2);
 
@@ -158,7 +159,7 @@ static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
       if (ep != cbuf+2) {
        hbytes_free(OBJ_HBYTES(o));
        return staticerr(ip, "hbytes: conversion from hex:"
-                        " bad hex digit");
+                        " bad hex digit", "HBYTES SYNTAX");
       }
       l -= 2;
     }
@@ -213,9 +214,11 @@ int do_hbytes_overwrite(ClientData cd, Tcl_Interp *ip,
 
   sub_l= hbytes_len(&sub);
   if (start < 0)
-    return staticerr(ip, "hbytes overwrite start -ve");
+    return staticerr(ip, "hbytes overwrite start -ve",
+                    "HBYTES LENGTH RANGE");
   if (start + sub_l > hbytes_len(v.hb))
-    return staticerr(ip, "hbytes overwrite out of range");
+    return staticerr(ip, "hbytes overwrite out of range",
+                    "HBYTES LENGTH UNDERRUN");
   memcpy(hbytes_data(v.hb) + start, hbytes_data(&sub), sub_l);
   return TCL_OK;
 }
@@ -239,8 +242,9 @@ int do_hbytes_repeat(ClientData cd, Tcl_Interp *ip,
   const Byte *sub_d;
 
   sub_l= hbytes_len(&sub);
-  if (count < 0) return staticerr(ip, "hbytes repeat count -ve");
-  if (count > INT_MAX/sub_l) return staticerr(ip, "hbytes repeat too long");
+  if (count < 0) return staticerr(ip, "hbytes repeat count -ve",
+                                 "HBYTES LENGTH RANGE");
+  if (count > INT_MAX/sub_l) return staticerr(ip, "hbytes repeat too long", 0);
 
   data= hbytes_arrayspace(result, sub_l*count);
   sub_d= hbytes_data(&sub);
@@ -251,6 +255,22 @@ int do_hbytes_repeat(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }  
 
+int do_hbytes_xor(ClientData cd, Tcl_Interp *ip,
+                 HBytes_Var v, HBytes_Value d) {
+  int l;
+  Byte *dest;
+  const Byte *source;
+
+  l= hbytes_len(v.hb);
+  if (hbytes_len(&d) != l) return
+    staticerr(ip, "hbytes xor lengths do not match", "HBYTES LENGTH MISMATCH");
+
+  dest= hbytes_data(v.hb);
+  source= hbytes_data(&d);
+  memxor(dest,source,l);
+  return TCL_OK;
+}
+  
 int do_hbytes_zeroes(ClientData cd, Tcl_Interp *ip,
                     int length, HBytes_Value *result) {
   Byte *space;
@@ -286,8 +306,11 @@ int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
   int l;
 
   l= hbytes_len(&v);
-  if (start<0 || size<0 || l<start+size)
-    return staticerr(ip, "hbytes range subscripts out of range");
+  if (start<0 || size<0)
+    return staticerr(ip,"hbytes range subscript(s) -ve","HBYTES LENGTH RANGE");
+  if (l<start+size)
+    return staticerr(ip, "hbytes range subscripts too big",
+                    "HBYTES LENGTH UNDERRUN");
 
   data= hbytes_data(&v);
   hbytes_array(result, data+start, size);
@@ -303,7 +326,8 @@ int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,
 
   l= hbytes_len(&hex);
   if (l>2)
-    return staticerr(ip, "hbytes h2ushort input more than 4 hex digits");
+    return staticerr(ip, "hbytes h2ushort input more than 4 hex digits",
+                    "HBYTES VALUE OVERFLOW");
 
   data= hbytes_data(&hex);
   *result= data[l-1] | (l>1 ? data[0]<<8 : 0);
@@ -315,7 +339,8 @@ int do_hbytes_ushort2h(ClientData cd, Tcl_Interp *ip,
   uint16_t us;
 
   if (input > 0x0ffff)
-    return staticerr(ip, "hbytes ushort2h input >2^16");
+    return staticerr(ip, "hbytes ushort2h input >2^16",
+                    "HBYTES VALUE OVERFLOW");
 
   us= htons(input);
   hbytes_array(result,(const Byte*)&us,2);
@@ -363,7 +388,7 @@ int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
     return posixerr(ip,errno,"read " URANDOM);
   } else {
     assert(feof(urandom));
-    return staticerr(ip, URANDOM " gave eof!");
+    return staticerr(ip, URANDOM " gave eof!", 0);
   }
 }