X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxsftp.c;h=3ac1d2c346470242955b96ff61825284e78126f0;hb=f23375b14e41e075360617ecd821385d057137e6;hp=a92cfc9d30760446f438d6ac8f1d7d6fac5a121c;hpb=aba05b7180b39ee51d72b1da867303c002188f2c;p=PuTTY.git diff --git a/unix/uxsftp.c b/unix/uxsftp.c index a92cfc9d..3ac1d2c3 100644 --- a/unix/uxsftp.c +++ b/unix/uxsftp.c @@ -26,8 +26,8 @@ * In PSFTP our selects are synchronous, so these functions are * empty stubs. */ -int uxsel_input_add(int fd, int rwx) { return 0; } -void uxsel_input_remove(int id) { } +uxsel_id *uxsel_input_add(int fd, int rwx) { return NULL; } +void uxsel_input_remove(uxsel_id *id) { } char *x_get_default(const char *key) { @@ -68,7 +68,7 @@ Filename *platform_default_filename(const char *name) char *get_ttymode(void *frontend, const char *mode) { return NULL; } -int get_userpass_input(prompts_t *p, unsigned char *in, int inlen) +int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen) { int ret; ret = cmdline_get_passwd_input(p, in, inlen); @@ -120,7 +120,7 @@ struct RFile { int fd; }; -RFile *open_existing_file(char *name, uint64 *size, +RFile *open_existing_file(const char *name, uint64 *size, unsigned long *mtime, unsigned long *atime, long *perms) { @@ -174,7 +174,7 @@ struct WFile { char *name; }; -WFile *open_new_file(char *name, long perms) +WFile *open_new_file(const char *name, long perms) { int fd; WFile *ret; @@ -192,7 +192,7 @@ WFile *open_new_file(char *name, long perms) } -WFile *open_existing_wfile(char *name, uint64 *size) +WFile *open_existing_wfile(const char *name, uint64 *size) { int fd; WFile *ret; @@ -298,7 +298,7 @@ uint64 get_file_posn(WFile *f) return ret; } -int file_type(char *name) +int file_type(const char *name) { struct stat statbuf; @@ -321,7 +321,7 @@ struct DirHandle { DIR *dir; }; -DirHandle *open_directory(char *name) +DirHandle *open_directory(const char *name) { DIR *dir; DirHandle *ret; @@ -356,7 +356,7 @@ void close_directory(DirHandle *dir) sfree(dir); } -int test_wildcard(char *name, int cmdline) +int test_wildcard(const char *name, int cmdline) { struct stat statbuf; @@ -390,7 +390,7 @@ struct WildcardMatcher { glob_t globbed; int i; }; -WildcardMatcher *begin_wildcard_matching(char *name) { +WildcardMatcher *begin_wildcard_matching(const char *name) { WildcardMatcher *ret = snew(WildcardMatcher); if (glob(name, 0, NULL, &ret->globbed) < 0) { @@ -413,7 +413,21 @@ void finish_wildcard_matching(WildcardMatcher *dir) { sfree(dir); } -int vet_filename(char *name) +char *stripslashes(const char *str, int local) +{ + char *p; + + /* + * On Unix, we do the same thing regardless of the 'local' + * parameter. + */ + p = strrchr(str, '/'); + if (p) str = p+1; + + return (char *)str; +} + +int vet_filename(const char *name) { if (strchr(name, '/')) return FALSE; @@ -424,12 +438,12 @@ int vet_filename(char *name) return TRUE; } -int create_directory(char *name) +int create_directory(const char *name) { return mkdir(name, 0777) == 0; } -char *dir_file_cat(char *dir, char *file) +char *dir_file_cat(const char *dir, const char *file) { return dupcat(dir, "/", file, NULL); } @@ -443,7 +457,8 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok) fd_set rset, wset, xset; int i, fdcount, fdsize, *fdlist; int fd, fdstate, rwx, ret, maxfd; - long now = GETTICKCOUNT(); + unsigned long now = GETTICKCOUNT(); + unsigned long next; fdlist = NULL; fdcount = fdsize = 0; @@ -488,26 +503,36 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok) if (include_stdin) FD_SET_MAX(0, maxfd, rset); - do { - long next, ticks; - struct timeval tv, *ptv; - - if (run_timers(now, &next)) { - ticks = next - GETTICKCOUNT(); - if (ticks <= 0) - ticks = 1; /* just in case */ + if (toplevel_callback_pending()) { + struct timeval tv; + tv.tv_sec = 0; + tv.tv_usec = 0; + ret = select(maxfd, &rset, &wset, &xset, &tv); + if (ret == 0) + run_toplevel_callbacks(); + } else if (run_timers(now, &next)) { + do { + unsigned long then; + long ticks; + struct timeval tv; + + then = now; + now = GETTICKCOUNT(); + if (now - then > next - then) + ticks = 0; + else + ticks = next - now; tv.tv_sec = ticks / 1000; tv.tv_usec = ticks % 1000 * 1000; - ptv = &tv; - } else { - ptv = NULL; - } - ret = select(maxfd, &rset, &wset, &xset, ptv); - if (ret == 0) - now = next; - else - now = GETTICKCOUNT(); - } while (ret < 0 && errno != EINTR); + ret = select(maxfd, &rset, &wset, &xset, &tv); + if (ret == 0) + now = next; + else + now = GETTICKCOUNT(); + } while (ret < 0 && errno == EINTR); + } else { + ret = select(maxfd, &rset, &wset, &xset, NULL); + } } while (ret == 0); if (ret < 0) { @@ -532,6 +557,8 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok) sfree(fdlist); + run_toplevel_callbacks(); + return FD_ISSET(0, &rset) ? 1 : 0; } @@ -546,7 +573,7 @@ int ssh_sftp_loop_iteration(void) /* * Read a PSFTP command line from stdin. */ -char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok) +char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok) { char *buf; int buflen, bufsize, ret; @@ -561,6 +588,7 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok) ret = ssh_sftp_do_select(TRUE, no_fds_ok); if (ret < 0) { printf("connection died\n"); + sfree(buf); return NULL; /* woop woop */ } if (ret > 0) { @@ -571,10 +599,12 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok) ret = read(0, buf+buflen, 1); if (ret < 0) { perror("read"); + sfree(buf); return NULL; } if (ret == 0) { /* eof on stdin; no error, but no answer either */ + sfree(buf); return NULL; }