Changeset 53

Timestamp:

01/17/06 22:51:03 (3 years ago)

Author:

gnue

Message:

- cleaned up a warning
- the symbols for seek are now seek_set, seek_cur and seek_end since end conflicted with end keyword
- got seek to actually work (replaced == with NewtRefEqual, removed quotes for the symbols)
- added getc, putc and write (write writes a binary just like read reads a binary)
- added a sample code for NSOF I/O.

contribute patch by Paul Guyot

Location:

NEWT0/trunk

Files:

• ext/protoFILE/protoFILE.c (modified) (3 diffs)
• sample/nsof.newt (added)
• src/newt_core/NewtIconv.c (modified) (1 diff)

NEWT0/trunk/ext/protoFILE/protoFILE.c

@@ -98 +98 @@
         return NewtThrow(kNErrNotASymbol, whence);
 
-    if (whence == NSSYM("set"))
+    if (NewtRefEqual(whence, NSSYM(seek_set)))
         wh = SEEK_SET;
-    else if (whence == NSSYM("curr"))
+    else if (NewtRefEqual(whence, NSSYM(seek_cur)))
         wh = SEEK_CUR;
-    else if (whence == NSSYM("end"))
+    else if (NewtRefEqual(whence, NSSYM(seek_end)))
         wh = SEEK_END;
     else
@@ -391 +391 @@
 }
 
+newtRef MyGetc(newtRefArg rcvr)
+{
+    newtRefVar stream;
+    FILE* theFile;
+    int theResult;
+    
+    stream = NcGetSlot(rcvr, NSSYM(_stream));
+    if (NewtRefIsNIL(stream))
+        return kNewtRefUnbind;
+
+    theFile = NewtRefToFILE(stream);
+    theResult = fgetc(theFile);
+    return NewtMakeInteger(theResult);
+}
+
+newtRef MyPutc(newtRefArg rcvr, newtRefArg byte)
+{
+    newtRefVar stream;
+    FILE* theFile;
+    char theByte;
+    int theResult;
+    
+    stream = NcGetSlot(rcvr, NSSYM(_stream));
+    if (NewtRefIsNIL(stream))
+        return kNewtRefUnbind;
+
+    theFile = NewtRefToFILE(stream);
+    theByte = NewtRefToInteger(byte);
+    theResult = fputc(theByte, theFile);
+    return NewtMakeInteger(theResult);
+}
+
+newtRef MyWrite(newtRefArg rcvr, newtRefArg binary)
+{
+    newtRefVar stream;
+    FILE* theFile;
+    void* data;
+    int len;
+    int theResult;
+    
+    stream = NcGetSlot(rcvr, NSSYM(_stream));
+    if (NewtRefIsNIL(stream))
+        return kNewtRefUnbind;
+
+    theFile = NewtRefToFILE(stream);
+    data = NewtRefToBinary(binary);
+    len = NewtBinaryLength(binary);
+    theResult = fwrite(data, len, 1, theFile);
+
+    return NewtMakeInteger(theResult);
+}
 
 /*------------------------------------------------------------------------*/
@@ -423 +474 @@
     NcSetSlot(r, NSSYM(Print),      NewtMakeNativeFunc(MyPrint,     1, "Print(str)"));
     NcSetSlot(r, NSSYM(Gets),       NewtMakeNativeFunc(MyGets,      0, "Gets()"));
+    NcSetSlot(r, NSSYM(Getc),       NewtMakeNativeFunc(MyGetc,      0, "Getc()"));
+    NcSetSlot(r, NSSYM(Putc),       NewtMakeNativeFunc(MyPutc,      1, "Putc(byte)"));
+    NcSetSlot(r, NSSYM(Write),      NewtMakeNativeFunc(MyWrite,     1, "Write(binary)"));
 
     NcSetSlot(r, NSSYM(_stream),    kNewtRefNIL);

NEWT0/trunk/src/newt_core/NewtIconv.c

@@ -38 +38 @@
         if (dst)
         {
-            char *  inbuf_p = src;
+            const char *    inbuf_p = src;
             char *  outbuf_p = dst;
             size_t  inbytesleft = srclen;