Changeset 432 for branches/thune

Timestamp:

07/16/07 03:30:31 (17 months ago)

Author:

krobillard

Message:

Replaced clean-path with full-path. Improved uc_whatDir().

Location:

branches/thune/thread_safe

Files:

• doc/UserManual (modified) (3 diffs)
• files.c (modified) (2 diffs)
• tests/Makefile (modified) (1 diff)
• tests/local (added)
• tests/local/file.t (added)
• unix/os.c (modified) (2 diffs)
• win32/os.c (modified) (5 diffs)

branches/thune/thread_safe/doc/UserManual

@@ -481 +481 @@
 appen        (ser val -- )           Append and drop.
 map          (ser comb -- )          Transform each element of a series.
-split-path   (full -- path file)     Split full path into path & file.
-dirize       (str -- str)            Ensure trailing slash is present.
 replace.all  (ser old new -- ser)    Find & Replace 
 ===========  ======================  =================
@@ -567 +565 @@
 seek         (port pos -- port)      Set port stream position.
 getenv       (name -- var)           Get environment variable.
+full-path    (path -- full)          Makes a relative directory path absolute.
 system.run   (cmd -- status)         Execute program.
 to-hex       (int -- int)            Flag integer to display in hexadecimal.
@@ -572 +571 @@
 checksum     (bin type -- digest)    Compute 'crc16 or 'sha1 checksum.
 ===========  ======================  ======================
+
+
+Input/Output Helpers
+~~~~~~~~~~~~~~~~~~~~
+
+==========   ======================  =================
+Word         Stack Usage             Function
+==========   ======================  =================
+split-path   (full -- path file)     Split full path into path & file.
+dirize       (str -- str)            Ensure trailing slash is present.
+==========   ======================  =================
 
 

branches/thune/thread_safe/files.c

@@ -545 +545 @@
 
 
-char* ur_cleanPath( const char* src, const char* end, char* clean )
-{
-    char* dst = clean;
-    while( src != end )
-    {
-        if( *src == '\\' || *src == '/' )
-        {
-            int len = end - src;
-            if( (len > 2) && (src[1] == '.') && (src[2] == '.') )
-            {
-                src += 3;
-                while( dst != clean )
+#define IS_SLASH(c)  (((c) == '/') || ((c) == '\\'))
+
+static char* upDir( char* start, char* it )
+{
+    char* oit = it;
+    if( it != start )
+    {
+        if( IS_SLASH(*it) )
+            --it;
+        while( it != start )
+        {
+            if( IS_SLASH(*it) )
+            {
+                if( it != oit )
+                    ++it;
+                break;
+            }
+            --it;
+        }
+    }
+    return it;
+}
+
+
+/*
+  (path -- absolute)
+*/
+UR_CALL( uc_fullPath )
+{
+    char* cpA;
+    char* cpB;
+
+    if( ur_stringSlice(ut, tos, &cpA, &cpB) )
+    {
+#ifdef _WIN32
+        if( ((cpB - cpA) > 1) && (cpA[1] == ':') )
+            return;
+#endif
+        if( (*cpA != '/') && (*cpA != '\\') )
+        {
+            uc_whatDir( ut, tos );
+            UR_S_NIP;
+
+            if( cpA != cpB )
+            {
+                UString* str;
+                char* dst;
+                int len;
+
+                str = ur_bin( tos );
+                ur_arrayReserve( str, 1, str->used + (cpB - cpA) );
+                dst = str->ptr.c + str->used;
+
+#define INC_A   ++cpA; if(cpA == cpB) break;
+
+                while( cpA != cpB )
                 {
-                    --dst;
-                    if( *dst == '/' )
-                        break;
+                    if( *cpA == '.' )
+                    {
+                        len = cpB - cpA;
+                        if( len > 1 )
+                        {
+                            if( IS_SLASH(cpA[1]) )
+                            {
+                                cpA += 2;
+                                continue;
+                            }
+                            else if( (len > 2) &&
+                                     (cpA[1] == '.') &&
+                                     IS_SLASH(cpA[2]) )
+                            {
+                                cpA += 3;
+                                dst = upDir( str->ptr.c, dst - 1 );
+                                continue;
+                            }
+                        }
+                    }
+                    else if( IS_SLASH(*cpA) )
+                    {
+                        if( IS_SLASH(dst[-1]) )
+                        {
+                            ++cpA;
+                            continue;
+                        }
+                    }
+                    *dst++ = *cpA++;
                 }
-            }
-            else
-            {
-                ++src;
-                *dst++ = '/';
-            }
-        }
-        else
-        {
-            *dst++ = *src++;
-        }
-    }
-    return dst;
-}
-
-
-// (filename -- filename)
-UR_CALL( uc_cleanPath )
-{
-    UString* str;
-    UString* clean;
-    UIndex binN;
-    char* dst;
-
-    UR_CALL_UNUSED_TH
-
-    if( ur_is(tos, UT_STRING) )
-    {
-        str = ur_bin(tos);
-
-        binN = ur_makeBinary( str->used - tos->series.it );
-        clean = ur_binPtr( binN );
-
-        dst = ur_cleanPath( str->ptr.c + tos->series.it,
-                            str->ptr.c + str->used, clean->ptr.c );
-        clean->used = dst - clean->ptr.c;
-
-        ur_setSeries( tos, binN, 0 );
+
+                str->used = dst - str->ptr.c;
+            }
+        }
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "full-path expected string!" );
     }
 }
@@ -1231 +1271 @@
     { uc_file_info,  "file-info" },
     { uc_getenv,     "getenv" },
-    { uc_cleanPath,  "clean-path" },
+    { uc_fullPath,   "full-path" },
     { uc_checksum,   "checksum" },
 #ifdef UR_CONFIG_BZIP2

branches/thune/thread_safe/tests/Makefile

@@ -1 +1 @@
 # Makefile 
 
-.PHONY: grind clean
+.PHONY: local grind clean
 
 test:
         @./run_test working/*.t
 
+local:
+        @./run_test local/*.t
+
 grind:
-        @./grind working/*.t
+        @./grind working/*.t local/*.t
 
 clean:

branches/thune/thread_safe/unix/os.c

@@ -64 +64 @@
     char tmp[ 512 ];
 
-    UR_S_GROW;
-    tos = UR_TOS;
-
     if( getcwd( tmp, sizeof(tmp) ) )
     {
@@ -74 +71 @@
        
         len = strLen( tmp );
-        if( len > 0 )
-        {
-            binN = ur_makeBinary( len + 1 );
-            str = ur_binPtr( binN );
-            str->used = len;
-            memCpy( str->ptr.c, tmp, len );
-
-            if( tmp[ len - 1 ] != '/' )
-            {
-                str->ptr.c[ len ] = '/';
-                ++str->used;
-            }
-
-            ur_initType( tos, UT_STRING /*UT_FILE*/ );
-            ur_setSeries( tos, binN, 0 );
-            return;
-        }
-    }
-    ur_setFalse( tos );
+        assert( len > 0 );
+
+        binN = ur_makeBinary( len + 1 );
+        str = ur_binPtr( binN );
+        str->used = len;
+        memCpy( str->ptr.c, tmp, len );
+
+        if( tmp[ len - 1 ] != '/' )
+        {
+            str->ptr.c[ len ] = '/';
+            ++str->used;
+        }
+
+        UR_S_GROW;
+        tos = UR_TOS;
+        ur_initString( tos, binN, 0 );  // UT_FILE
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_ACCESS, strerror(errno) );
+    }
 }
 

branches/thune/thread_safe/win32/os.c

@@ -59 +59 @@
     char tmp[ 512 ];
 
-    UR_S_GROW;
-    tos = UR_TOS;
-
     if( _getcwd( tmp, sizeof(tmp) ) )
     {
@@ -69 +66 @@
        
         len = strLen( tmp );
-        if( len > 0 )
-        {
-            binN = ur_makeBinary( len + 1 );
-            str = ur_binPtr( binN );
-            str->used = len;
-            memCpy( str->ptr.c, tmp, len );
-
-            if( tmp[ len - 1 ] != '\\' )
-            {
-                str->ptr.c[ len ] = '\\';
-                ++str->used;
-            }
-
-            ur_initType( tos, UT_STRING /*UT_FILE*/ );
-            ur_setSeries( tos, binN, 0 );
-            return;
-        }
-    }
-    ur_setFalse( tos );
+        assert( len > 0 );
+
+        binN = ur_makeBinary( len + 1 );
+        str = ur_binPtr( binN );
+        str->used = len;
+        memCpy( str->ptr.c, tmp, len );
+
+        if( tmp[ len - 1 ] != '\\' )
+        {
+            str->ptr.c[ len ] = '\\';
+            ++str->used;
+        }
+
+        UR_S_GROW;
+        tos = UR_TOS;
+        ur_initString( tos, binN, 0 );  // UT_FILE
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_ACCESS, strerror(errno) );
+    }
 }
 
@@ -220 +219 @@
         if( fh == INVALID_HANDLE_VALUE )
         {
-            ur_throwErr( ur_thread, UR_EX_ACCESS, "FindFirstFile" );
+            ur_throwErr( UR_ERR_ACCESS, "FindFirstFile" );
             return;
         }
@@ -264 +263 @@
         if( (err != ERROR_FILE_EXISTS) || (ur_isDir(str->ptr.c) != 1) )
         {
-            ur_throwErr( ur_thread, UR_EX_ACCESS,
-                         "CreateDirectory error (%d)", err );
+            ur_throwErr( UR_ERR_ACCESS, "CreateDirectory error (%d)", err );
             return;
         }
@@ -275 +273 @@
         if( (errno != EEXIST) || (orIsDir(str->ptr.c) != 1) )
         {
-            ur_throwErr( ur_thread, UR_EX_ACCESS, strerror/*_r*/(errno) );
+            ur_throwErr( UR_ERR_ACCESS, strerror/*_r*/(errno) );
             return;
         }