* 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)
{
return fontspec_new("");
}
-Filename platform_default_filename(const char *name)
+Filename *platform_default_filename(const char *name)
{
- Filename ret;
if (!strcmp(name, "LogFileName"))
- strcpy(ret.path, "putty.log");
+ return filename_from_str("putty.log");
else
- *ret.path = '\0';
- return ret;
+ return filename_from_str("");
}
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);
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)
{
char *name;
};
-WFile *open_new_file(char *name, long perms)
+WFile *open_new_file(const char *name, long perms)
{
int fd;
WFile *ret;
}
-WFile *open_existing_wfile(char *name, uint64 *size)
+WFile *open_existing_wfile(const char *name, uint64 *size)
{
int fd;
WFile *ret;
return ret;
}
-int file_type(char *name)
+int file_type(const char *name)
{
struct stat statbuf;
DIR *dir;
};
-DirHandle *open_directory(char *name)
+DirHandle *open_directory(const char *name)
{
DIR *dir;
DirHandle *ret;
sfree(dir);
}
-int test_wildcard(char *name, int cmdline)
+int test_wildcard(const char *name, int cmdline)
{
struct stat statbuf;
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) {
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;
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);
}
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;
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 {
- 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);
+ ret = select(maxfd, &rset, &wset, &xset, &tv);
+ if (ret == 0)
+ now = next;
+ else
+ now = GETTICKCOUNT();
+ } while (ret < 0 && errno == EINTR);
+ } else {
+ do {
+ ret = select(maxfd, &rset, &wset, &xset, NULL);
+ } while (ret < 0 && errno == EINTR);
+ }
} while (ret == 0);
if (ret < 0) {
sfree(fdlist);
+ run_toplevel_callbacks();
+
return FD_ISSET(0, &rset) ? 1 : 0;
}
/*
* 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;
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) {
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;
}
}
}
+void frontend_net_error_pending(void) {}
+
+void platform_psftp_pre_conn_setup(void) {}
+
+const int buildinfo_gtk_relevant = FALSE;
+
/*
* Main program: do platform-specific initialisation and then call
* psftp_main().
projects / PuTTY.git / blobdiff