mirror of https://codeberg.org/cage/tinmop/
- [kami] removed setf' of global variables.
This commit is contained in:
cage
parent
8d3ed466ee
commit
8e5c2bb91a
|
|
@ -10,6 +10,11 @@
|
|||
|
||||
(defparameter *root-fid* nil)
|
||||
|
||||
(defstruct 9p-parameters
|
||||
(message-sent)
|
||||
(fid)
|
||||
(tag))
|
||||
|
||||
(defmacro with-open-ssl-stream ((ssl-stream socket host port
|
||||
client-certificate
|
||||
certificate-key)
|
||||
|
|
@ -37,8 +42,19 @@
|
|||
(when ,clunk-cloned-fid
|
||||
(9p:9p-clunk ,stream ,cloned-fid)))))
|
||||
|
||||
(defun expand-node (stream root-fid)
|
||||
(defmacro with-9p-params ((params) &body body)
|
||||
`(let* ((9p:*tag* (9p-parameters-tag ,params))
|
||||
(9p:*fid* (9p-parameters-fid ,params))
|
||||
(9p:*messages-sent* (9p-parameters-message-sent ,params)))
|
||||
(unwind-protect
|
||||
(progn ,@body)
|
||||
(setf (9p-parameters-tag ,params) 9p:*tag*)
|
||||
(setf (9p-parameters-fid ,params) 9p:*fid*)
|
||||
(setf (9p-parameters-message-sent ,params) 9p:*messages-sent*))))
|
||||
|
||||
(defun expand-node (stream root-fid params)
|
||||
(lambda (node)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid)
|
||||
(path (tree-path (data node))))
|
||||
|
|
@ -62,29 +78,32 @@
|
|||
(let ((absolute-path (text-utils:strcat path (9p:stat-name file))))
|
||||
(add-child node
|
||||
(make-instance 'm-tree
|
||||
:data (make-node-data absolute-path nil))))))))
|
||||
node))
|
||||
:data (make-node-data absolute-path nil))))))
|
||||
node)))))
|
||||
|
||||
(defun rename-node (stream root-fid)
|
||||
(defun rename-node (stream root-fid params)
|
||||
(lambda (node new-path)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid)
|
||||
(path (tree-path (data node))))
|
||||
(assert path)
|
||||
(with-cloned-root-fid (*stream* cloned-root-fid)
|
||||
(9p:move-file *stream* cloned-root-fid path new-path)))))
|
||||
(9p:move-file *stream* cloned-root-fid path new-path))))))
|
||||
|
||||
(defun delete-node (stream root-fid)
|
||||
(defun delete-node (stream root-fid params)
|
||||
(lambda (node)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid)
|
||||
(path (tree-path (data node))))
|
||||
(assert path)
|
||||
(with-cloned-root-fid (*stream* cloned-root-fid)
|
||||
(9p:remove-path *stream* cloned-root-fid path)))))
|
||||
(9p:remove-path *stream* cloned-root-fid path))))))
|
||||
|
||||
(defun create-node (stream root-fid)
|
||||
(defun create-node (stream root-fid params)
|
||||
(lambda (path dirp)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid))
|
||||
(assert path)
|
||||
|
|
@ -99,13 +118,14 @@
|
|||
(text-utils:strcat path "/"))))
|
||||
(setf created-fid
|
||||
(9p:create-path *stream* cloned-root-fid path)))
|
||||
(9p:9p-clunk *stream* created-fid))))))
|
||||
(9p:9p-clunk *stream* created-fid)))))))
|
||||
|
||||
(defun download-node (stream root-fid)
|
||||
(defun download-node (stream root-fid params)
|
||||
(lambda (node
|
||||
&optional
|
||||
(destination-file
|
||||
(make-temporary-file-from-node node)))
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid)
|
||||
(path (tree-path (data node))))
|
||||
|
|
@ -126,10 +146,11 @@
|
|||
(permissions (9p:permissions-original-value (9p:stat-mode info-source-node)))
|
||||
(destination-file-mode (logand permissions #x7ff)))
|
||||
(fs:change-path-permissions destination-file destination-file-mode)))
|
||||
destination-file)))
|
||||
destination-file))))
|
||||
|
||||
(defun upload-node (stream root-fid)
|
||||
(defun upload-node (stream root-fid params)
|
||||
(lambda (source-path destination-path)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid))
|
||||
(let ((source-permissions (fs:get-stat-mode source-path)))
|
||||
|
|
@ -154,10 +175,11 @@
|
|||
(9p:change-mode *stream*
|
||||
cloned-root-fid
|
||||
destination-path source-permissions)
|
||||
(9p:read-all-pending-messages stream)))))))
|
||||
(9p:read-all-pending-messages stream))))))))
|
||||
|
||||
(defun query-path (stream root-fid)
|
||||
(defun query-path (stream root-fid params)
|
||||
(lambda (path what)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid))
|
||||
(with-cloned-root-fid (*stream* cloned-root-fid)
|
||||
|
|
@ -175,10 +197,11 @@
|
|||
(_ "User: ~a Group: ~a Others ~a")
|
||||
(9p:permissions-user-string mode)
|
||||
(9p:permissions-group-string mode)
|
||||
(9p:permissions-others-string mode))))))))))
|
||||
(9p:permissions-others-string mode)))))))))))
|
||||
|
||||
(defun collect-tree (stream root-fid)
|
||||
(defun collect-tree (stream root-fid params)
|
||||
(lambda (path)
|
||||
(with-9p-params (params)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* root-fid)
|
||||
(all-files nil)
|
||||
|
|
@ -188,29 +211,32 @@
|
|||
(9p:collect-tree *stream* cloned-root-fid path)
|
||||
(setf all-files files)
|
||||
(setf all-dirs directories)))
|
||||
(values all-files all-dirs))))
|
||||
(values all-files all-dirs)))))
|
||||
|
||||
(defun generate-filesystem-window-handlers (path host port
|
||||
query fragment
|
||||
client-certificate client-key)
|
||||
(setf 9p:*tag* 8)
|
||||
(setf 9p:*fid* 1)
|
||||
(setf 9p:*messages-sent* '())
|
||||
(with-open-ssl-stream (stream socket host port client-certificate client-key)
|
||||
(let* ((*stream* stream)
|
||||
(*root-fid* (9p:mount *stream* "/")))
|
||||
(let* ((9p:*tag* 10)
|
||||
(9p:*fid* 1)
|
||||
(9p:*messages-sent* '())
|
||||
(*stream* stream)
|
||||
(*root-fid* (9p:mount *stream* "/"))
|
||||
(parameters (make-9p-parameters :message-sent 9p:*messages-sent*
|
||||
:fid 9p:*fid*
|
||||
:tag 9p:*tag*)))
|
||||
(list :query query
|
||||
:fragment fragment
|
||||
:socket socket
|
||||
:path path
|
||||
:filesystem-expand-function (expand-node *stream* *root-fid*)
|
||||
:filesystem-rename-function (rename-node *stream* *root-fid*)
|
||||
:filesystem-delete-function (delete-node *stream* *root-fid*)
|
||||
:filesystem-create-function (create-node *stream* *root-fid*)
|
||||
:filesystem-download-function (download-node *stream* *root-fid*)
|
||||
:filesystem-upload-function (upload-node *stream* *root-fid*)
|
||||
:filesystem-query-path-function (query-path *stream* *root-fid*)
|
||||
:filesystem-collect-tree (collect-tree *stream* *root-fid*)
|
||||
:filesystem-expand-function (expand-node *stream* *root-fid* parameters)
|
||||
:filesystem-rename-function (rename-node *stream* *root-fid* parameters)
|
||||
:filesystem-delete-function (delete-node *stream* *root-fid* parameters)
|
||||
:filesystem-create-function (create-node *stream* *root-fid* parameters)
|
||||
:filesystem-download-function (download-node *stream* *root-fid* parameters)
|
||||
:filesystem-upload-function (upload-node *stream* *root-fid* parameters)
|
||||
:filesystem-query-path-function (query-path *stream* *root-fid* parameters)
|
||||
:filesystem-collect-tree (collect-tree *stream* *root-fid* parameters)
|
||||
:filesystem-close-connection-function (lambda ()
|
||||
(9p:close-client socket))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@
|
|||
(defun function-name (data)
|
||||
"Implementation dependent"
|
||||
(assert (functionp data))
|
||||
(conditions:with-default-on-error ((_ "Anonymous function"))
|
||||
(conditions:with-default-on-error ((config:_ "Anonymous function"))
|
||||
(multiple-value-bind (x y name)
|
||||
(function-lambda-expression data)
|
||||
(declare (ignore x y))
|
||||
|
|
|
|||
Loading…
Reference in New Issue