Render timing.c robust in the face of strangeness. The strangenesses

[u/mdw/putty] / unix / uxsftp.c

diff --git a/unix/uxsftp.c b/unix/uxsftp.c
index 198dbee..f5fc12e 100644 (file)
--- a/unix/uxsftp.c
+++ b/unix/uxsftp.c
@@ -12,6 +12,7 @@
 #include <utime.h>
 #include <errno.h>
 #include <assert.h>
+#include <glob.h>
 
 #include "putty.h"
 #include "psftp.h"
@@ -285,30 +286,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 +366,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 +383,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 +433,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 +487,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 +505,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 */