Changeset 81 for cpp/gdk/stdiofile.cpp

Timestamp:

02/08/13 03:29:17 (11 years ago)

Author:

Maciej Komosinski

Message:

improved parsing of properties (e.g. in f0 genotypes)

File:

• cpp/gdk/stdiofile.cpp (modified) (1 diff)

cpp/gdk/stdiofile.cpp

@@ -4 +4 @@
 
 #include "stdiofile.h"
-#include "nonstd.h"
-#include "nonstd_io.h"
+#include "nonstd_dir.h"
+#include "nonstd_stdio.h"
+#include "framsg.h"
 
 VirtFILE* StdioFileSystem::Vfopen(const char* path,const char*mode)
 {
-FILE *f=fopen(path,mode);
-if (f) return new StdioFILE(f,path); else return 0;
+        //FMprintf("Vfopen %s %s",path,mode);
+        FILE *f=fopen(path,mode);
+        //FMprintf("%p",f);
+        if (f) return new StdioFILE(f,path); else return 0;
 }
 
 VirtDIR* StdioFileSystem::Vopendir(const char* path)
 {
-#ifndef _MSC_VER
-DIR *d=opendir(path);
-if (d) return new StdioDIR(d); else
-#endif
-return 0;
+        //FMprintf("Vopendir %s",path);
+        DIR *d=opendir(path);
+        //FMprintf("%p",d);
+        if (d) return new StdioDIR(d); else return 0;
 }
 
 int StdioFileSystem::Vfexists(const char* path)
-{return fileExists(path);}
+{
+        return fileExists(path);
+}
 
 void StdioFILE::setStdio()
 {
-static StdioFILEDontClose si(stdin);
-static StdioFILEDontClose so(stdout);
-static StdioFILEDontClose se(stderr);
-setVstdin(&si);
-setVstdout(&so);
-setVstderr(&se);
+        static StdioFILEDontClose si(stdin);
+        static StdioFILEDontClose so(stdout);
+        static StdioFILEDontClose se(stderr);
+        setVstdin(&si);
+        setVstdout(&so);
+        setVstderr(&se);
 }
 
-#ifndef _MSC_VER
 dirent* StdioDIR::Vreaddir()
 {
-return readdir(dir);
+        //FMprintf("Vreaddir %s",dir);
+        return readdir(dir);
 }
-#endif