Overview
Comment: | Start of data/directory handling |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
32b55a907bc5d78337415004706c61d9 |
User & Date: | rkeene on 2019-05-02 19:58:27 |
Other Links: | manifest | tags |
Context
2019-05-02
| ||
21:08 | Minimal support to be loaded and not crash the process check-in: e5b6962adf user: rkeene tags: trunk | |
19:58 | Start of data/directory handling check-in: 32b55a907b user: rkeene tags: trunk | |
14:40 | Pass interp to the register command check-in: 69e476dcd5 user: rkeene tags: trunk | |
Changes
Modified lib/xvfs/xvfs.tcl from [5ab6120f9c] to [926dd90266].
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | } set char }] ""] return $output } proc ::xvfs::binaryToCHex {binary {prefix ""} {width 10}} { binary scan $binary H* binary set output [list] set width [expr {$width * 2}] set stopAt [expr {$width - 1}] | > > > > > > > > > > > > > > > > > > > > > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | } set char }] ""] return $output } proc ::xvfs::sanitizeCStringList {list {prefix ""} {width 80}} { set lines [list] set row [list] foreach item $list { lappend row "\"[sanitizeCString $item]\"" set rowString [join $row {, }] set rowString "${prefix}${rowString}" if {[string length $rowString] > $width} { set row [list] lappend lines $rowString unset rowString } } if {[info exists rowString]} { lappend lines $rowString } return [join $lines "\n"] } proc ::xvfs::binaryToCHex {binary {prefix ""} {width 10}} { binary scan $binary H* binary set output [list] set width [expr {$width * 2}] set stopAt [expr {$width - 1}] |
︙ | ︙ | |||
67 68 69 70 71 72 73 | fconfigure $fd -encoding binary -translation binary -blocking true set data [read $fd] set size [string length $data] set data [string trimleft [binaryToCHex $data "\t\t\t"]] close $fd } "directory" { | < > | > > > > > > > > > > | > > > > > > > > > > > > > > > > > > < < < < < < < < < | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | fconfigure $fd -encoding binary -translation binary -blocking true set data [read $fd] set size [string length $data] set data [string trimleft [binaryToCHex $data "\t\t\t"]] close $fd } "directory" { set type "XVFS_FILE_TYPE_DIR" set children $fileInfo(children) set size [llength $children] if {$size == 0} { set children "NULL" } else { set children [string trimleft [sanitizeCStringList $children "\t\t\t"]] # This initializes it using a C99 compound literal, C99 is required set children "(const char *\[\]) \{$children\}" } } default { return -code error "Unable to process $inputFile, unknown type: $fileInfo(type)" } } puts "\t\{" puts "\t\t.name = \"[sanitizeCString $outputFile]\"," puts "\t\t.type = $type," puts "\t\t.size = $size," switch -exact -- $fileInfo(type) { "file" { puts "\t\t.data.fileContents = (const unsigned char *) $data" } "directory" { puts "\t\t.data.dirChildren = $children" } } puts "\t\}," } proc ::xvfs::processDirectory {fsName directory {subDirectory ""}} { set subDirectories [list] set outputFiles [list] set workingDirectory [file join $directory $subDirectory] set outputDirectory $subDirectory if {$subDirectory eq ""} { set isTopLevel true } else { set isTopLevel false } if {$isTopLevel} { puts "static struct xvfs_file_data xvfs_${fsName}_data\[\] = \{" } # XXX:TODO: Include hidden files ? set children [list] foreach file [glob -nocomplain -tails -directory $workingDirectory *] { if {$file in {. ..}} { continue } set inputFile [file join $workingDirectory $file] set outputFile [file join $outputDirectory $file] unset -nocomplain fileInfo catch { file lstat $inputFile fileInfo } if {![info exists fileInfo]} { puts stderr "warning: Unable to access $inputFile, skipping" } lappend children [file tail $file] if {$fileInfo(type) eq "directory"} { lappend subDirectories $outputFile continue } processFile $fsName $inputFile $outputFile [array get fileInfo] lappend outputFiles $outputFile } foreach subDirectory $subDirectories { lappend outputFiles {*}[processDirectory $fsName $directory $subDirectory] } set inputFile $directory set outputFile $outputDirectory unset -nocomplain fileInfo file stat $inputFile fileInfo set fileInfo(children) $children processFile $fsName $inputFile $outputFile [array get fileInfo] lappend outputFiles $outputFile if {$isTopLevel} { puts "\};" } return $outputFiles } proc ::xvfs::main {argv} { # Main entry point |
︙ | ︙ | |||
186 187 188 189 190 191 192 | if {[llength $errors] != 0} { printHelp stderr $errors exit 1 } ## 3. Start processing directory and producing initial output | | | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | if {[llength $errors] != 0} { printHelp stderr $errors exit 1 } ## 3. Start processing directory and producing initial output set ::xvfs::outputFiles [processDirectory $fsName $rootDirectory] set ::xvfs::fsName $fsName set ::xvfs::rootDirectory $rootDirectory } package provide xvfs 1 |
Modified xvfs-core.c from [b20c01ceb7] to [1f3798f743].
1 2 3 | #include <xvfs-core.h> #include <tcl.h> | > > > > > > > > > > > > > | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | #include <xvfs-core.h> #include <tcl.h> /* * There are three (3) modes of operation for Xvfs_Register: * 1. standalone -- We register our own Tcl_Filesystem * and handle requests under `//xvfs:/<fsName>` * 2. client -- A single Tcl_Filesystem is registered for the * interp to handle requests under `//xvfs:/` which * then dispatches to the appropriate registered * handler * 3. flexible -- Attempts to find a core Xvfs instance for the * process at runtime, if found do #2, otherwise * fallback to #1 * */ static int Xvfs_Register_Standalone(Tcl_Interp *interp, const char *fsName, int protocolVersion, xvfs_proc_getChildren_t getChildrenProc, xvfs_proc_getData_t getDataProc) { Tcl_SetResult(interp, "Not implemented", NULL); return(TCL_ERROR); } int Xvfs_Register(Tcl_Interp *interp, const char *fsName, int protocolVersion, xvfs_proc_getChildren_t getChildrenProc, xvfs_proc_getData_t getDataProc) { return(Xvfs_Register_Standalone(interp, fsName, protocolVersion, getChildrenProc, getDataProc)); } |
Modified xvfs-core.h from [939655efee] to [ac0a17191f].
1 2 3 4 5 6 7 | #ifndef XVFS_COMMON_H_1B4B28D60EBAA11D5FF85642FA7CA22C29E8E817 #define XVFS_COMMON_H_1B4B28D60EBAA11D5FF85642FA7CA22C29E8E817 1 #include <tcl.h> #define XVFS_PROTOCOL_VERSION 1 | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | #ifndef XVFS_COMMON_H_1B4B28D60EBAA11D5FF85642FA7CA22C29E8E817 #define XVFS_COMMON_H_1B4B28D60EBAA11D5FF85642FA7CA22C29E8E817 1 #include <tcl.h> #define XVFS_PROTOCOL_VERSION 1 typedef const char **(*xvfs_proc_getChildren_t)(const char *path, Tcl_WideInt *count); typedef const unsigned char *(*xvfs_proc_getData_t)(const char *path, Tcl_WideInt start, Tcl_WideInt *length); int Xvfs_Register(Tcl_Interp *interp, const char *fsName, int protocolVersion, xvfs_proc_getChildren_t getChildrenProc, xvfs_proc_getData_t getDataProc); #endif |
Modified xvfs.c.rvt from [4c4e9cea0a] to [8333f0cfa8].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | #include <xvfs-core.h> #include <unistd.h> #include <tcl.h> typedef enum { XVFS_FILE_TYPE_REG, XVFS_FILE_TYPE_DIR } xvfs_file_type_t; typedef Tcl_WideInt xvfs_size_t; struct xvfs_file_data { const char *name; xvfs_file_type_t type; xvfs_size_t size; | > > > > > | > > > > > | > > > > > > > > > > > | > > > > > > > | | | > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | #include <xvfs-core.h> #include <unistd.h> #include <string.h> #include <tcl.h> #define XVFS_NAME_LOOKUP_ERROR (-1) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) typedef enum { XVFS_FILE_TYPE_REG, XVFS_FILE_TYPE_DIR } xvfs_file_type_t; typedef Tcl_WideInt xvfs_size_t; struct xvfs_file_data { const char *name; xvfs_file_type_t type; xvfs_size_t size; union { const unsigned char *fileContents; const char **dirChildren; } data; }; <? package require xvfs xvfs::main $argv ?> static long xvfs_<?= $::xvfs::fsName ?>_nameToIndex(const char *path) { if (path == NULL) { return(XVFS_NAME_LOOKUP_ERROR); } <? for {set index 0} {$index < [llength $::xvfs::outputFiles]} {incr index} { set outputFile [lindex $::xvfs::outputFiles $index] ?> if (strcmp(path, "<?= [::xvfs::sanitizeCString $outputFile] ?>") == 0) { return(<?= $index ?>); } <? } ?> return(XVFS_NAME_LOOKUP_ERROR); } static const char **xvfs_<?= $::xvfs::fsName ?>_getChildren(const char *path, Tcl_WideInt *count) { struct xvfs_file_data *fileInfo; long inode; /* * Validate input parameters */ if (count == NULL) { return(NULL); } /* * Get the inode from the lookup function */ inode = xvfs_<?= $::xvfs::fsName ?>_nameToIndex(path); if (inode == XVFS_NAME_LOOKUP_ERROR) { return(NULL); } fileInfo = &xvfs_<?= $::xvfs::fsName ?>_data[inode]; /* * Ensure this is a directory */ if (fileInfo->type != XVFS_FILE_TYPE_DIR) { return(NULL); } *count = fileInfo->size; return(fileInfo->data.dirChildren); } static const unsigned char *xvfs_<?= $::xvfs::fsName ?>_getData(const char *path, Tcl_WideInt start, Tcl_WideInt *length) { struct xvfs_file_data *fileInfo; Tcl_WideInt resultLength; long inode; /* * Validate input parameters */ if (start < 0) { return(NULL); } if (length == NULL) { return(NULL); } if (*length < 0) { return(NULL); } /* * Get the inode from the lookup function */ inode = xvfs_<?= $::xvfs::fsName ?>_nameToIndex(path); if (inode == XVFS_NAME_LOOKUP_ERROR) { return(NULL); } fileInfo = &xvfs_<?= $::xvfs::fsName ?>_data[inode]; /* * Ensure this is a file that can be read */ if (fileInfo->type != XVFS_FILE_TYPE_REG) { return(NULL); } /* * Validate the length */ if (start > fileInfo->size) { *length = -1; return(NULL); } if (*length == 0) { resultLength = fileInfo->size - start; } else { resultLength = MIN(fileInfo->size - start, *length); } *length = resultLength; /* * Return the data */ return(fileInfo->data.fileContents + start); } int Xvfs_<?= $::xvfs::fsName ?>_Init(Tcl_Interp *interp) { int register_ret; /* XXX:TODO: Stubs */ register_ret = Xvfs_Register(interp, "<?= $::xvfs::fsName ?>", XVFS_PROTOCOL_VERSION, xvfs_<?= $::xvfs::fsName ?>_getChildren, xvfs_<?= $::xvfs::fsName ?>_getData); if (register_ret != TCL_OK) { return(register_ret); } return(TCL_OK); |
︙ | ︙ |