* psftp.c: front end for PSFTP.
*/
-#include <windows.h>
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#define PUTTY_DO_GLOBALS
#include "putty.h"
+#include "psftp.h"
#include "storage.h"
#include "ssh.h"
#include "sftp.h"
static int sftp_cmd_lcd(struct sftp_command *cmd)
{
- char *currdir;
- int len;
+ char *currdir, *errmsg;
if (cmd->nwords < 2) {
printf("lcd: expects a local directory name\n");
return 0;
}
- if (!SetCurrentDirectory(cmd->words[1])) {
- LPVOID message;
- int i;
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR)&message, 0, NULL);
- i = strcspn((char *)message, "\n");
- printf("lcd: unable to change directory: %.*s\n", i, (LPCTSTR)message);
- LocalFree(message);
+ errmsg = psftp_lcd(cmd->words[1]);
+ if (errmsg) {
+ printf("lcd: unable to change directory: %s\n", errmsg);
+ sfree(errmsg);
return 0;
}
- currdir = snewn(256, char);
- len = GetCurrentDirectory(256, currdir);
- if (len > 256)
- currdir = sresize(currdir, len, char);
- GetCurrentDirectory(len, currdir);
+ currdir = psftp_getcwd();
printf("New local directory is %s\n", currdir);
sfree(currdir);
static int sftp_cmd_lpwd(struct sftp_command *cmd)
{
char *currdir;
- int len;
- currdir = snewn(256, char);
- len = GetCurrentDirectory(256, currdir);
- if (len > 256)
- currdir = sresize(currdir, len, char);
- GetCurrentDirectory(len, currdir);
+ currdir = psftp_getcwd();
printf("Current local directory is %s\n", currdir);
sfree(currdir);
* in ASCII order.
*/
{
- "!", TRUE, "run a local Windows command",
+ "!", TRUE, "run a local command",
"<command>\n"
- " Runs a local Windows command. For example, \"!del myfile\".\n",
+ /* FIXME: this example is crap for non-Windows. */
+ " Runs a local command. For example, \"!del myfile\".\n",
sftp_cmd_pling
},
{
}
/*
- * Be told what socket we're supposed to be using.
- */
-static SOCKET sftp_ssh_socket;
-char *do_select(SOCKET skt, int startup)
-{
- if (startup)
- sftp_ssh_socket = skt;
- else
- sftp_ssh_socket = INVALID_SOCKET;
- return NULL;
-}
-extern int select_result(WPARAM, LPARAM);
-
-/*
* In psftp, all agent requests should be synchronous, so this is a
* never-called stub.
*/
}
while (outlen > 0) {
- fd_set readfds;
-
- FD_ZERO(&readfds);
- FD_SET(sftp_ssh_socket, &readfds);
- if (select(1, &readfds, NULL, NULL, NULL) < 0)
+ if (ssh_sftp_loop_iteration() < 0)
return 0; /* doom */
- select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ);
}
return 1;
}
/*
- * Loop through the ssh connection and authentication process.
- */
-static void ssh_sftp_init(void)
-{
- if (sftp_ssh_socket == INVALID_SOCKET)
- return;
- while (!back->sendok(backhandle)) {
- fd_set readfds;
- FD_ZERO(&readfds);
- FD_SET(sftp_ssh_socket, &readfds);
- if (select(1, &readfds, NULL, NULL, NULL) < 0)
- return; /* doom */
- select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ);
- }
-}
-
-/*
- * Initialize the Win$ock driver.
- */
-static void init_winsock(void)
-{
- WORD winsock_ver;
- WSADATA wsadata;
-
- winsock_ver = MAKEWORD(1, 1);
- if (WSAStartup(winsock_ver, &wsadata)) {
- fprintf(stderr, "Unable to initialise WinSock");
- cleanup_exit(1);
- }
- if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) {
- fprintf(stderr, "WinSock version is incompatible with 1.1");
- cleanup_exit(1);
- }
-}
-
-/*
* Short description of parameters.
*/
static void usage(void)
logctx = log_init(NULL, &cfg);
back->provide_logctx(backhandle, logctx);
console_provide_logctx(logctx);
- ssh_sftp_init();
+ while (!back->sendok(backhandle)) {
+ if (ssh_sftp_loop_iteration() < 0) {
+ fprintf(stderr, "ssh_init: error during SSH connection setup\n");
+ return 1;
+ }
+ }
if (verbose && realhost != NULL)
printf("Connected to %s\n", realhost);
return 0;
/*
* Main program. Parse arguments etc.
*/
-int main(int argc, char *argv[])
+int psftp_main(int argc, char *argv[])
{
int i;
int portnumber = 0;
flags = FLAG_STDERR | FLAG_INTERACTIVE | FLAG_SYNCAGENT;
cmdline_tooltype = TOOLTYPE_FILETRANSFER;
ssh_get_line = &console_get_line;
- init_winsock();
sk_init();
userhost = user = NULL;
back->special(backhandle, TS_EOF);
sftp_recvdata(&ch, 1);
}
- WSACleanup();
random_save_seed();
return 0;
--- /dev/null
+/*
+ * winsftp.c: the Windows-specific parts of PSFTP.
+ */
+
+#include <windows.h>
+
+#include "putty.h"
+#include "psftp.h"
+
+/*
+ * Be told what socket we're supposed to be using.
+ */
+static SOCKET sftp_ssh_socket;
+char *do_select(SOCKET skt, int startup)
+{
+ if (startup)
+ sftp_ssh_socket = skt;
+ else
+ sftp_ssh_socket = INVALID_SOCKET;
+ return NULL;
+}
+extern int select_result(WPARAM, LPARAM);
+
+/*
+ * Initialize the WinSock driver.
+ */
+static void init_winsock(void)
+{
+ WORD winsock_ver;
+ WSADATA wsadata;
+
+ winsock_ver = MAKEWORD(1, 1);
+ if (WSAStartup(winsock_ver, &wsadata)) {
+ fprintf(stderr, "Unable to initialise WinSock");
+ cleanup_exit(1);
+ }
+ if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) {
+ fprintf(stderr, "WinSock version is incompatible with 1.1");
+ cleanup_exit(1);
+ }
+}
+
+/*
+ * Set local current directory. Returns NULL on success, or else an
+ * error message which must be freed after printing.
+ */
+char *psftp_lcd(char *dir)
+{
+ char *ret = NULL;
+
+ if (!SetCurrentDirectory(dir)) {
+ LPVOID message;
+ int i;
+ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, GetLastError(),
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&message, 0, NULL);
+ i = strcspn((char *)message, "\n");
+ ret = dupprintf("%.*s", i, (LPCTSTR)message);
+ LocalFree(message);
+ }
+
+ return ret;
+}
+
+/*
+ * Get local current directory. Returns a string which must be
+ * freed.
+ */
+char *psftp_getcwd(void)
+{
+ char *ret = snewn(256, char);
+ int len = GetCurrentDirectory(256, ret);
+ if (len > 256)
+ ret = sresize(ret, len, char);
+ GetCurrentDirectory(len, ret);
+ return ret;
+}
+
+/*
+ * Wait for some network data and process it.
+ */
+int ssh_sftp_loop_iteration(void)
+{
+ fd_set readfds;
+
+ if (sftp_ssh_socket == INVALID_SOCKET)
+ return -1; /* doom */
+
+ FD_ZERO(&readfds);
+ FD_SET(sftp_ssh_socket, &readfds);
+ if (select(1, &readfds, NULL, NULL, NULL) < 0)
+ return -1; /* doom */
+
+ select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ);
+ return 0;
+}
+
+/*
+ * Main program. Parse arguments etc.
+ */
+int main(int argc, char *argv[])
+{
+ int ret;
+
+ init_winsock();
+ ret = psftp_main(argc, argv);
+ WSACleanup();
+
+ return ret;
+}