X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/39934deb5202149f98198c111a35c21cb4d0d0f8..4a693cfc5c3ee0e639bbee0215345e921715ab04:/unix/uxsftp.c diff --git a/unix/uxsftp.c b/unix/uxsftp.c index 198dbee9..3170ecf3 100644 --- a/unix/uxsftp.c +++ b/unix/uxsftp.c @@ -12,9 +12,15 @@ #include #include #include +#include +#ifndef HAVE_NO_SYS_SELECT_H +#include +#endif #include "putty.h" +#include "ssh.h" #include "psftp.h" +#include "int64.h" /* * In PSFTP our selects are synchronous, so these functions are @@ -28,11 +34,11 @@ char *x_get_default(const char *key) return NULL; /* this is a stub */ } -void platform_get_x11_auth(char *display, int *protocol, - unsigned char *data, int *datalen) +void platform_get_x11_auth(struct X11Display *display, Conf *conf) { /* Do nothing, therefore no auth. */ } +const int platform_uses_x11_unix_by_default = TRUE; /* * Default settings that are specific to PSFTP. @@ -64,17 +70,16 @@ Filename platform_default_filename(const char *name) return ret; } -/* - * Stubs for the GUI feedback mechanism in Windows PSCP. - */ -void gui_update_stats(char *name, unsigned long size, - int percentage, unsigned long elapsed, - unsigned long done, unsigned long eta, - unsigned long ratebs) {} -void gui_send_errcount(int list, int errs) {} -void gui_send_char(int is_stderr, int c) {} -void gui_enable(char *arg) {} +char *get_ttymode(void *frontend, const char *mode) { return NULL; } +int get_userpass_input(prompts_t *p, unsigned char *in, int inlen) +{ + int ret; + ret = cmdline_get_passwd_input(p, in, inlen); + if (ret == -1) + ret = console_get_userpass_input(p, in, inlen); + return ret; +} /* * Set local current directory. Returns NULL on success, or else an @@ -119,7 +124,7 @@ struct RFile { int fd; }; -RFile *open_existing_file(char *name, unsigned long *size, +RFile *open_existing_file(char *name, uint64 *size, unsigned long *mtime, unsigned long *atime) { int fd; @@ -140,8 +145,9 @@ RFile *open_existing_file(char *name, unsigned long *size, } if (size) - *size = statbuf.st_size; - + *size = uint64_make((statbuf.st_size >> 16) >> 16, + statbuf.st_size); + if (mtime) *mtime = statbuf.st_mtime; @@ -184,6 +190,34 @@ WFile *open_new_file(char *name) return ret; } + +WFile *open_existing_wfile(char *name, uint64 *size) +{ + int fd; + WFile *ret; + + fd = open(name, O_APPEND | O_WRONLY); + if (fd < 0) + return NULL; + + ret = snew(WFile); + ret->fd = fd; + ret->name = dupstr(name); + + if (size) { + struct stat statbuf; + if (fstat(fd, &statbuf) < 0) { + fprintf(stderr, "%s: stat: %s\n", name, strerror(errno)); + memset(&statbuf, 0, sizeof(statbuf)); + } + + *size = uint64_make((statbuf.st_size >> 16) >> 16, + statbuf.st_size); + } + + return ret; +} + int write_to_file(WFile *f, void *buffer, int length) { char *p = (char *)buffer; @@ -225,6 +259,44 @@ void close_wfile(WFile *f) sfree(f); } +/* Seek offset bytes through file, from whence, where whence is + FROM_START, FROM_CURRENT, or FROM_END */ +int seek_file(WFile *f, uint64 offset, int whence) +{ + off_t fileofft; + int lseek_whence; + + fileofft = (((off_t) offset.hi << 16) << 16) + offset.lo; + + switch (whence) { + case FROM_START: + lseek_whence = SEEK_SET; + break; + case FROM_CURRENT: + lseek_whence = SEEK_CUR; + break; + case FROM_END: + lseek_whence = SEEK_END; + break; + default: + return -1; + } + + return lseek(f->fd, fileofft, lseek_whence) >= 0 ? 0 : -1; +} + +uint64 get_file_posn(WFile *f) +{ + off_t fileofft; + uint64 ret; + + fileofft = lseek(f->fd, (off_t) 0, SEEK_CUR); + + ret = uint64_make((fileofft >> 16) >> 16, fileofft); + + return ret; +} + int file_type(char *name) { struct stat statbuf; @@ -285,30 +357,71 @@ void close_directory(DirHandle *dir) int test_wildcard(char *name, int cmdline) { - /* - * On Unix, we currently don't support local wildcards at all. - * We will have to do so (FIXME) once PSFTP starts implementing - * mput, but until then we can assume `cmdline' is always set. - */ struct stat statbuf; - assert(cmdline); - if (stat(name, &statbuf) < 0) - return WCTYPE_NONEXISTENT; - else + if (stat(name, &statbuf) == 0) { return WCTYPE_FILENAME; + } else if (cmdline) { + /* + * On Unix, we never need to parse wildcards coming from + * the command line, because the shell will have expanded + * them into a filename list already. + */ + return WCTYPE_NONEXISTENT; + } else { + glob_t globbed; + int ret = WCTYPE_NONEXISTENT; + + if (glob(name, GLOB_ERR, NULL, &globbed) == 0) { + if (globbed.gl_pathc > 0) + ret = WCTYPE_WILDCARD; + globfree(&globbed); + } + + return ret; + } } /* - * Actually return matching file names for a local wildcard. FIXME: - * we currently don't support this at all. + * Actually return matching file names for a local wildcard. */ struct WildcardMatcher { - int x; + glob_t globbed; + int i; }; -WildcardMatcher *begin_wildcard_matching(char *name) { return NULL; } -char *wildcard_get_filename(WildcardMatcher *dir) { return NULL; } -void finish_wildcard_matching(WildcardMatcher *dir) {} +WildcardMatcher *begin_wildcard_matching(char *name) { + WildcardMatcher *ret = snew(WildcardMatcher); + + if (glob(name, 0, NULL, &ret->globbed) < 0) { + sfree(ret); + return NULL; + } + + ret->i = 0; + + return ret; +} +char *wildcard_get_filename(WildcardMatcher *dir) { + if (dir->i < dir->globbed.gl_pathc) { + return dupstr(dir->globbed.gl_pathv[dir->i++]); + } else + return NULL; +} +void finish_wildcard_matching(WildcardMatcher *dir) { + globfree(&dir->globbed); + sfree(dir); +} + +int vet_filename(char *name) +{ + if (strchr(name, '/')) + return FALSE; + + if (name[0] == '.' && (!name[1] || (name[1] == '.' && !name[2]))) + return FALSE; + + return TRUE; +} int create_directory(char *name) { @@ -324,7 +437,7 @@ char *dir_file_cat(char *dir, char *file) * Do a select() between all currently active network fds and * optionally stdin. */ -static int ssh_sftp_do_select(int include_stdin) +static int ssh_sftp_do_select(int include_stdin, int no_fds_ok) { fd_set rset, wset, xset; int i, fdcount, fdsize, *fdlist; @@ -341,7 +454,7 @@ static int ssh_sftp_do_select(int include_stdin) for (fd = first_fd(&fdstate, &rwx); fd >= 0; fd = next_fd(&fdstate, &rwx)) i++; - if (i < 1) + if (i < 1 && !no_fds_ok) return -1; /* doom */ /* Expand the fdlist buffer if necessary. */ @@ -391,8 +504,27 @@ static int ssh_sftp_do_select(int include_stdin) ret = select(maxfd, &rset, &wset, &xset, ptv); if (ret == 0) now = next; - else - now = GETTICKCOUNT(); + else { + long newnow = GETTICKCOUNT(); + /* + * Check to see whether the system clock has + * changed massively during the select. + */ + if (newnow - now < 0 || newnow - now > next - now) { + /* + * If so, look at the elapsed time in the + * select and use it to compute a new + * tickcount_offset. + */ + long othernow = now + tv.tv_sec * 1000 + tv.tv_usec / 1000; + /* So we'd like GETTICKCOUNT to have returned othernow, + * but instead it return newnow. Hence ... */ + tickcount_offset += othernow - newnow; + now = othernow; + } else { + now = newnow; + } + } } while (ret < 0 && errno != EINTR); } while (ret == 0); @@ -426,13 +558,13 @@ static int ssh_sftp_do_select(int include_stdin) */ int ssh_sftp_loop_iteration(void) { - return ssh_sftp_do_select(FALSE); + return ssh_sftp_do_select(FALSE, FALSE); } /* * Read a PSFTP command line from stdin. */ -char *ssh_sftp_get_cmdline(char *prompt) +char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok) { char *buf; int buflen, bufsize, ret; @@ -444,7 +576,7 @@ char *ssh_sftp_get_cmdline(char *prompt) buflen = bufsize = 0; while (1) { - ret = ssh_sftp_do_select(TRUE); + ret = ssh_sftp_do_select(TRUE, no_fds_ok); if (ret < 0) { printf("connection died\n"); return NULL; /* woop woop */