Changeset 506

Timestamp:

08/30/05 11:47:07 (8 years ago)

Author:

max

Message:

 

Files:

• ossie/trunk/ossie/framework/FileSystem_impl.cpp (modified) (5 diffs)

ossie/trunk/ossie/framework/FileSystem_impl.cpp

@@ -23 +23 @@
 /* SCA */
 
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif
-
 #include <fcntl.h>
 
+#include <string.h>
+#ifdef __linux__
+        #include <dirent.h>
+#else
+        #include "ossie/dirent.h"
+        #include <direct.h>
+#endif
+
+#include "ossie/FileSystem_impl.h"
+
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
-#include "ossie/FileSystem_impl.h"
+        #include <unistd.h>
+#else
+        #include <iostream>
+        #include <io.h>
+//      #include <process.h>
+//      #include <stdexcept>
+//      #include <io.h>
+//      #include <string.h>
+        using namespace std;
+#endif
 
 FileSystem_impl::FileSystem_impl ()
 {
     root = new char[MAX_CWD_LEN];
+#ifdef __linux__
     root = getcwd (root, MAX_CWD_LEN);
+#else
+    root = _getcwd (root, MAX_CWD_LEN);
+#endif
+
     init ();
 }
@@ -83 +90 @@
 
     PortableServer::ObjectId_var oid = _root_poa->activate_object (this);
+
+        cout<<"Finished File System init"<<endl;
 };
 
@@ -245 +254 @@
 /* designate hard-coded security permissions, may need something else here */
     
-    int fp = creat (fileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+#ifdef __linux__
+        int fp = creat (fileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+#else
+    int fp = _creat (fileName, S_IREAD | S_IWRITE);
+#endif
 
     if (fp >= 0)
@@ -285 +298 @@
         oFlag = O_WRONLY;
 
-    int fp = ::open (fileName, oFlag, 0, NULL);
+#ifdef __linux__
+        int fp = ::open (fileName, oFlag, 0, NULL);
+#else
+    int fp = _open (fileName, oFlag, 0, NULL);
+#endif
 
     CF::File_ptr file = NULL;
@@ -315 +332 @@
     char *dname = this->appendFileName (this->root, directoryName);
 
-    int check = ::mkdir (dname, 0755);
+#ifdef __linux__
+        int check = ::mkdir (dname, 0755);
+#else
+        int check = _mkdir (dname);
+#endif
 
     delete dname;