=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.32 retrieving revision 1.35 diff -u -p -r1.32 -r1.35 --- OpenXM/src/kan96xx/Kan/ext.c 2004/09/17 12:32:11 1.32 +++ OpenXM/src/kan96xx/Kan/ext.c 2005/06/09 05:46:57 1.35 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.31 2004/09/16 23:53:44 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.34 2004/12/21 03:25:04 takayama Exp $ */ #include #include #include @@ -312,6 +312,18 @@ struct object Kextension(struct object obj) printObject(obj2,0,fp); fclose(fp); rob = NullObject; + }else if (strcmp(key,"getAttributeList")==0) { + if (size != 2) errorKan1("%s\n","[(getAttributeList) ob] extension rob"); + rob = KgetAttributeList(getoa(obj,1)); + }else if (strcmp(key,"putAttributeList")==0) { + if (size != 3) errorKan1("%s\n","[(putAttributeList) ob attrlist] extension rob"); + rob = KputAttributeList(getoa(obj,1), getoa(obj,2)); + }else if (strcmp(key,"getAttribute")==0) { + if (size != 3) errorKan1("%s\n","[(getAttribute) ob key] extension rob"); + rob = KgetAttribute(getoa(obj,1),getoa(obj,2)); + }else if (strcmp(key,"putAttribute")==0) { + if (size != 4) errorKan1("%s\n","[(putAttributeList) ob key value] extension rob"); + rob = KputAttribute(getoa(obj,1), getoa(obj,2),getoa(obj,3)); }else if (strcmp(key,"hilbert")==0) { if (size != 3) errorKan1("%s\n","[(hilbert) obgb obvlist] extension."); rob = hilberto(getoa(obj,1),getoa(obj,2)); @@ -382,6 +394,29 @@ struct object Kextension(struct object obj) } } } + }else if (strcmp(key,"read")==0) { + if (size != 3) errorKan1("%s\n","[(read) fd size] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sinteger) errorKan1("%s\n","[(read) fd size] extension. fd must be an integer."); + obj2 = getoa(obj,2); + if (obj2.tag != Sinteger) errorKan1("%s\n","[(read) fd size] extension. size must be an integer."); + { + int total, n, fd; + char *s; char *s0; + fd = KopInteger(obj1); + total = KopInteger(obj2); + if (total <= 0) errorKan1("%s\n","[(read) ...]; negative size has not yet been implemented."); + /* Return a string. todo: implement SbyteArray case. */ + s0 = s = (char *) sGC_malloc(total+1); + if (s0 == NULL) errorKan1("%s\n","[(read) ...]; no more memory."); + while (total >0) { + n = read(fd, s, total); + if (n < 0) { perror("read"); errorKan1("%s\n","[(read) ...]; read error.");} + s[n] = 0; + total -= n; s = &(s[n]); + } + rob = KpoString(s0); + } }else if (strcmp(key,"regionMatches")==0) { if (size != 3) errorKan1("%s\n","[(regionMatches) str strArray] extension."); obj1 = getoa(obj,1); @@ -446,12 +481,17 @@ struct object Kextension(struct object obj) if (size == 3) obj3 = newObjectArray(0); else obj3 = getoa(obj,3); rob = oregexec(obj1,obj2,obj3); - + }else if (strcmp(key,"unlink")==0) { + if (size != 2) errorKan1("%s\n","[(unlink) filename] extension b"); + obj1 = getoa(obj,1); + if (obj1.tag != Sdollar) errorKan1("%s\n","unlink, the first argument should be a string (filename)."); + rob = KpoInteger(oxDeleteFile(KopString(obj1))); } #include "plugin.hh" #include "Kclass/tree.hh" else{ - errorKan1("%s\n","Unknown tag for extension."); + fprintf(stderr,"key=%s; ",key); + errorKan1("%s\n","Unknown key for extension."); }