Merge pull request #3 from OmniBlade/stdfile

Implements most stdfile.c functions.

src/BRSRC13/CORE/STD/stdfile.c

@@ -1,13 +1,29 @@
 #include "stdfile.h"
+#include <stdio.h>
 
 // Global variables
-br_filesystem *_BrDefaultFilesystem;
-br_filesystem BrStdioFilesystem;
-char rscid[52];
+br_filesystem BrStdioFilesystem == {
+    "Standard IO",
+    BrStdioAttributes,
+    BrStdioOpenRead,
+    BrStdioOpenWrite,
+    BrStdioClose,
+    BrStdioEof,
+    BrStdioGetChar,
+    BrStdioPutChar,
+    BrStdioRead,
+    BrStdioWrite,
+    BrStdioGetLine,
+    BrStdioPutLine,
+    BrStdioAdvance
+};
+br_filesystem *_BrDefaultFilesystem = &BrStdioFilesystem;
+char rscid[52]; // $Id: stdfile.c 2.7 1996/11/20 18:07:52 STEVEW Exp $
 
 // Offset: 18
 // Size: 40
 br_uint_32 BrStdioAttributes() {
+    return BR_FS_ATTR_READABLE | BR_FS_ATTR_WRITEABLE | BR_FS_ATTR_HAS_TEXT | BR_FS_ATTR_HAS_BINARY | BR_FS_ATTR_HAS_ADVANCE;
 }
 
 // Offset: 74
@@ -20,57 +36,87 @@ void* BrStdioOpenRead(char *name, br_size_t n_magics, br_mode_test_cbfn *identif
   char *cp;
   br_uint_8 magics[16];
   int open_mode;
+  // Needs BrSystemConfigQueryString
 }
 
 // Offset: 686
 // Size: 82
 void* BrStdioOpenWrite(char *name, int mode) {
-  FILE *fh;
+    FILE *fh;
+
+    if(text == BR_FS_MODE_TEXT) {
+        fh = fopen(name, "w");
+    } else {
+        fh = fopen(name, "wb");  
+    }
+
+    return fh;
 }
 
 // Offset: 781
 // Size: 38
 void BrStdioClose(void *f) {
+    fclose(f);
 }
 
 // Offset: 830
 // Size: 45
 int BrStdioEof(void *f) {
+    return feof(f);
 }
 
 // Offset: 890
 // Size: 117
 int BrStdioGetChar(void *f) {
+    return fgetc(f);
 }
 
 // Offset: 1022
 // Size: 41
 void BrStdioPutChar(int c, void *f) {
+    fputc(c, f);
 }
 
 // Offset: 1075
 // Size: 53
 br_size_t BrStdioRead(void *buf, br_size_t size, unsigned int n, void *f) {
+    return fread(buf, size, nelems, f);
 }
 
 // Offset: 1141
 // Size: 53
 br_size_t BrStdioWrite(void *buf, br_size_t size, unsigned int n, void *f) {
+    return fwrite(buf, size, nelems, f);
 }
 
 // Offset: 1209
 // Size: 141
 br_size_t BrStdioGetLine(char *buf, br_size_t buf_len, void *f) {
-  br_size_t l;
+    br_size_t l;
+    
+    if (fgets(buf, buf_len, f) == NULL) {
+        return 0;
+    }
+
+    l = strlen(buf);
+
+    if (l != 0 && buf[l - 1] == '\n') {
+        buf[--l] = '\0';
+    }
+
+    return l;
 }
 
 // Offset: 1365
 // Size: 54
 void BrStdioPutLine(char *buf, void *f) {
+    fputs(buf, f);
+    fputc('\n', f);
 }
 
 // Offset: 1434
 // Size: 46
 void BrStdioAdvance(br_size_t count, void *f) {
+    fseek(f, count, SEEK_CUR);
 }
 

src/BRSRC13/CORE/STD/stdfile.h

@@ -1,5 +1,8 @@
 #include "dr_types.h"
 #include "br_types.h"
+
+extern br_filesystem *_BrDefaultFilesystem;
+
 // Offset: 18
 // Size: 40
 br_uint_32 BrStdioAttributes();