Changeset 131 for trunk/thune/unix

Timestamp:

05/01/06 16:17:35 (3 years ago)

Author:

krobillard

Message:

Thune - now builds on Windows.

Files:

• trunk/thune/unix/os.c (modified) (5 diffs)

trunk/thune/unix/os.c

@@ -24 +24 @@
 #include <sys/stat.h>
 #include <dirent.h>
+#include <errno.h>
 #include <unistd.h>
 #include <signal.h>
@@ -29 +30 @@
 #include "os.h"
 #include "urlan.h"
+#include "internal.h"
 
 
@@ -42 +44 @@
 /*
    change-dir
-*/
-void uc_changeDir( UCell* tos )
+   (dir -- logic)
+*/
+UR_CALL_PUB( uc_changeDir )
 {
     int logic = 0;
-    UString* str = ur_binPtr( tos->series.n );
+    UString* str = ur_bin( tos );
+
+    UR_CALL_UNUSED_TH;
 
     ur_termCStr( str );
@@ -61 +66 @@
    ( -- path)
 */
-void uc_whatDir( UCell* tos )
+UR_CALL_PUB( uc_whatDir )
 {
     char tmp[ 512 ];
 
-    if( getcwd( tmp, 512 ) )
+    UR_S_GROW;
+    tos = UR_TOS;
+
+    if( getcwd( tmp, sizeof(tmp) ) )
     {
         int len;
@@ -127 +135 @@
 
 
-#if 0
-#define REF_TIME    a1
-
-void uc_now( UCell* a1 )
-{
-    UCell* res;
+/*
+  (dir-name -- )
+  No error if directory exists.
+*/
+UR_CALL_PUB( uc_makeDir )
+{
+    int err;
+    UString* str = ur_bin(tos);
+    ur_termCStr(str);
+    err = mkdir( str->ptr.c, 0755 );
+    if( err )
+    {
+        if( (errno != EEXIST) || (ur_isDir(str->ptr.c) != 1) )
+        {
+            ur_throwErr( ur_thread, UR_EX_ACCESS, strerror/*_r*/(errno) );
+            return;
+        }
+    }
+    UR_S_DROP;
+}
+
+
+// ( -- time)
+UR_CALL_PUB( uc_now )
+{
     struct timeval tp;
 
+    UR_S_GROW;
+    tos = UR_TOS;
+
     gettimeofday( &tp, 0 );
-
-    //printf( "sizeof(timeval.tv_sec) %d %d\n",
-    //        sizeof(tp.tv_sec), sizeof(tp.tv_usec) );
-
-    res = orRESULT;
-    if( orRefineSet( REF_TIME ) )
-        orSetTF( res, OT_TIME );
-    else
-        orSetTF( res, OT_DATE );
-
-    res->time.sec  = tp.tv_sec;
-    res->time.usec = tp.tv_usec;
-}
-#endif
+    ur_seconds(tos) = ((double) tp.tv_sec) + ((double) tp.tv_usec) * 0.000001;
+
+    ur_setType( tos, UT_TIME );
+}