Skip to content

Make :ssh-unknown-hostkey public and support output stream in scp-get #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simkoc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make :ssh-unknown-hostkey public and support output stream in scp-get #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88722f3
made ssh-unknown-hostkey a public exception in packages
Jun 17, 2016
ada5dff
added support for streams in the scp-get function
Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/package.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,13 @@
:WITH-EXECUTE*
:WITH-SCP-INPUT
:WITH-SCP-OUTPUT
:scp-get
:scp-get
:scp-put

;; CONDITIONS & SLOTS
:KNOWN-HOSTS-READING-ERROR
:HOST-NOT-ALLOWED-TO-CONNECT
:SSH-UNKNOWN-HOSTKEY
:+TRACE-OPTIONS+
:+DISCONNECT-CODE+
:+ERROR-CODE+
Expand Down
17 changes: 15 additions & 2 deletions src/scp.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

(in-package :libssh2)

(defun scp-get (remote-name local-name &optional (connection *ssh-connection*))
(defmethod scp-get (remote-name (local string) &optional (connection *ssh-connection*))
(with-scp-input (in connection remote-name stat)
(with-open-file (out local-name
(with-open-file (out local
:direction :output
:if-exists :supersede
:if-does-not-exist :create
Expand All @@ -18,3 +18,16 @@
(with-scp-output (out connection remote-name
(file-length in))
(cl-fad:copy-stream in out))))


(defmethod scp-get (remote-name (local stream) &optional (connection *ssh-connection*))
(when (not (output-stream-p local))
(error 'ssh-generic-error
:code "BAD-STREAM-DIRECTION"
:message "the given stream has to support output"))
(when (not (equalp (stream-element-type local) '(unsigned-byte 8)))
(error 'ssh-generic-error
:code "BAD-STREAM-ELEMENT-TYPE"
:message "the given stream must have element type (unsigned-byte 8)"))
(with-scp-input (in connection remote-name stat)
(cl-fad:copy-stream in local)))