From ad91f4d51448c77cb74f2e2ab2e529b3aad8ce79 Mon Sep 17 00:00:00 2001
From: Jean-Claude Wippler <jcw@equi4.com>
Date: Tue, 14 Nov 2006 13:46:45 +0000
Subject: [PATCH] removed mkclvfs.tcl from tclvfs

---
 ChangeLog           |   5 ++
 Makefile.in         |   2 +-
 library/mkclvfs.tcl | 162 --------------------------------------------
 pkgIndex.tcl.in     |   1 -
 4 files changed, 6 insertions(+), 164 deletions(-)
 delete mode 100644 library/mkclvfs.tcl

diff --git a/ChangeLog b/ChangeLog
index 4a659cf..633bd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-14  Jean-Claude Wippler  <jcw@equi4.com>
+
+	* library/mkclvfs.tcl: removed, now part of the vlerq extension again
+	* library/pkgIndex.tcl, pkgIndex.tcl.in, Makefile.in: removed mkcl
+
 2006-11-10  Steve Huntley  <stephen.huntley@alum.mit.edu>
 
 	* library/template/templatevfs.tcl: file delete on vfs mount 
diff --git a/Makefile.in b/Makefile.in
index 06788db..1d68c35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ PKG_TCL_SOURCES = @PKG_TCL_SOURCES@ \
 		  tarvfs.tcl tclprocvfs.tcl testvfs.tcl \
 		  vfsUrl.tcl vfsUtils.tcl vfslib.tcl \
 		  webdavvfs.tcl zipvfs.tcl tclIndex \
-		  tkvfs.tcl mkclvfs.tcl
+		  tkvfs.tcl
 
 #========================================================================
 # This is a list of public header files to be installed, if any.
diff --git a/library/mkclvfs.tcl b/library/mkclvfs.tcl
deleted file mode 100644
index 642e4ab..0000000
--- a/library/mkclvfs.tcl
+++ /dev/null
@@ -1,162 +0,0 @@
-# mkclvfs.tcl -- Metakit Compatible Lite Virtual File System driver
-# Rewritten from mk4vfs.tcl, orig by by Matt Newman and Jean-Claude Wippler 
-
-# 1.0	initial release
-# 1.1	view size renamed to count
-# 1.2	replace view calls by vget (simpler and faster)
-# 1.3	modified to use the vlerq extension i.s.o. thrive
-# 1.4 minor cleanup
-
-package provide vfs::mkcl 1.4
-package require vfs
-package require vlerq
-
-namespace eval vfs::mkcl {
-  namespace eval v {
-    variable seq 0  ;# used to generate a unique db handle
-    variable rootv  ;# maps handle to root view (well, actually "dirs")
-    variable dname  ;# maps handle to cached list of directory names
-    variable prows  ;# maps handle to cached list of parent row numbers
-  }
-
-# public
-  proc Mount {mkfile local args} {
-    set db mkclvfs[incr v::seq]
-    set v::rootv($db) [view $mkfile mapf | get 0 dirs]
-    set v::dname($db) [vget $v::rootv($db) * name]
-    set v::prows($db) [vget $v::rootv($db) * parent]
-    ::vfs::filesystem mount $local [list ::vfs::mkcl::handler $db]
-    ::vfs::RegisterMount $local [list ::vfs::mkcl::Unmount $db]
-    return $db
-  }
-  proc Unmount {db local} {
-    ::vfs::filesystem unmount $local
-    unset v::rootv($db) v::dname($db) v::prows($db)
-  }
-# private
-  proc handler {db cmd root path actual args} {
-    #puts [list MKCL $db <$cmd> r: $root p: $path a: $actual $args]
-    switch $cmd {
-      matchindirectory	{ eval [linsert $args 0 $cmd $db $path $actual] }
-      fileattributes	{ eval [linsert $args 0 $cmd $db $root $path] } 
-      default		{ eval [linsert $args 0 $cmd $db $path] }
-    }
-  }
-  proc fail {code} {
-    ::vfs::filesystem posixerror $::vfs::posix($code)
-  }
-  proc lookUp {db path} {
-    set dirs $v::rootv($db)
-    set parent 0
-    set elems [file split $path]
-    set remain [llength $elems]
-    foreach e $elems {
-      set r ""
-      foreach r [lsearch -exact -int -all $v::prows($db) $parent] {
-      	if {$e eq [lindex $v::dname($db) $r]} {
-      	  set parent $r
-      	  incr remain -1
-      	  break
-      	}
-      }
-      if {$parent != $r} {
-      	if {$remain == 1} {
-      	  set files [vget $dirs $parent files]
-      	  if 1 {
-       	    set i [lsearch -exact [vget $files * name] $e]
-        	  if {$i >= 0} {
-        	    # evaluating this 3-item result returns the info about one file
-        	    return [list vget $files $i]
-        	  }
-        	} else {
-            view $files loop {
-              if {$(name) eq $e} {
-                # evaluating this 3-item result returns the info about one file
-                return [list vget $files $(#)]
-              }
-            }
-          }
-      	}
-      	fail ENOENT
-      }
-    }
-    # evaluating this 4-item result returns the files subview
-    return [list vget $dirs $parent files]
-  }
-  proc isDir {tag} {
-    return [expr {[llength $tag] == 4}]
-  }
-# methods
-  proc matchindirectory {db path actual pattern type} {
-    set o {}
-    if {$type == 0} { set type 20 }
-    set tag [lookUp $db $path]
-    if {$pattern ne ""} {
-      set c {}
-      if {[isDir $tag]} {
-      	# collect file names
-      	if {$type & 16} {
-      	  set c [eval [linsert $tag end * 0]]
-      	}
-      	# collect directory names
-      	if {$type & 4} {
-      	  foreach r [lsearch -exact -int -all $v::prows($db) [lindex $tag 2]] {
-      	    lappend c [lindex $v::dname($db) $r]
-      	  }
-      	}
-      }
-      foreach x $c {
-      	if {[string match $pattern $x]} {
-      	  lappend o [file join $actual $x]
-      	}
-      }
-    } elseif {$type & ([isDir $tag]?4:16)} {
-      set o [list $actual]
-    }
-    return $o
-  }
-  proc fileattributes {db root path args} {
-    switch -- [llength $args] {
-      0 { return [::vfs::listAttributes] }
-      1 { set index [lindex $args 0]
-      	  return [::vfs::attributesGet $root $path $index] }
-      2 { fail EROFS }
-    }
-  }
-  proc open {db file mode permissions} {
-    if {$mode ne "" && $mode ne "r"} { fail EROFS }
-    set tag [lookUp $db $file]
-    if {[isDir $tag]} { fail ENOENT }
-    foreach {name size date contents} [eval $tag *] break
-    if {[string length $contents] != $size} {
-      set contents [vfs::zip -mode decompress $contents]
-    }
-    set fd [vfs::memchan]
-    fconfigure $fd -translation binary
-    puts -nonewline $fd $contents
-    fconfigure $fd -translation auto
-    seek $fd 0
-    return [list $fd]
-  }
-  proc access {db path mode} {
-    if {$mode & 2} { fail EROFS }
-    lookUp $db $path
-  }
-  proc stat {db path} {
-    set tag [lookUp $db $path]
-    set l 1
-    if {[isDir $tag]} {
-      set t directory
-      set s 0
-      set d 0
-      set c ""
-      incr l [eval [linsert $tag -1 #]]
-      incr l [llength [lsearch -exact -int -all $v::prows($db) [lindex $tag 2]]]
-    } else {
-      set t file
-      foreach {n s d c} [eval $tag *] break
-    }
-    return [list type $t size $s atime $d ctime $d mtime $d nlink $l \
-		  csize [string length $c] gid 0 uid 0 ino 0 mode 0777]
-  }
-}
diff --git a/pkgIndex.tcl.in b/pkgIndex.tcl.in
index 6984f58..04a58ff 100644
--- a/pkgIndex.tcl.in
+++ b/pkgIndex.tcl.in
@@ -40,7 +40,6 @@ package ifneeded zipvfs       1.0 [list source [file join $dir zipvfs.tcl]]
 package ifneeded vfs::ftp     1.0 [list source [file join $dir ftpvfs.tcl]]
 package ifneeded vfs::http    0.5 [list source [file join $dir httpvfs.tcl]]
 package ifneeded vfs::mk4     1.10 [list source [file join $dir mk4vfs.tcl]]
-package ifneeded vfs::mkcl    1.4 [list source [file join $dir mkclvfs.tcl]]
 package ifneeded vfs::ns      0.5 [list source [file join $dir tclprocvfs.tcl]]
 package ifneeded vfs::tar     0.9 [list source [file join $dir tarvfs.tcl]]
 package ifneeded vfs::test    1.0 [list source [file join $dir testvfs.tcl]]
-- 
2.23.0