~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sebastian Kuschel reports that pfd_closing can be called for a socket
[sgt/putty]
/
psftp.c
diff --git
a/psftp.c
b/psftp.c
index
322b9c6
..
8ed2343
100644
(file)
--- a/
psftp.c
+++ b/
psftp.c
@@
-1258,7
+1258,9
@@
int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
fname = canonify(origwfname);
if (!fname) {
fname = canonify(origwfname);
if (!fname) {
+ sftp_finish_wildcard_matching(swcm);
printf("%s: canonify: %s\n", origwfname, fxp_error());
printf("%s: canonify: %s\n", origwfname, fxp_error());
+ sfree(origwfname);
sfree(unwcfname);
return 0;
}
sfree(unwcfname);
return 0;
}
@@
-2477,6
+2479,18
@@
void modalfatalbox(char *fmt, ...)
cleanup_exit(1);
}
cleanup_exit(1);
}
+void nonfatal(char *fmt, ...)
+{
+ char *str, *str2;
+ va_list ap;
+ va_start(ap, fmt);
+ str = dupvprintf(fmt, ap);
+ str2 = dupcat("Error: ", str, "\n", NULL);
+ sfree(str);
+ va_end(ap);
+ fputs(str2, stderr);
+ sfree(str2);
+}
void connection_fatal(void *frontend, char *fmt, ...)
{
char *str, *str2;
void connection_fatal(void *frontend, char *fmt, ...)
{
char *str, *str2;
@@
-2708,6
+2722,7
@@
static int psftp_connect(char *userhost, char *user, int portnumber)
/* Use `host' as a bare hostname. */
conf_set_str(conf, CONF_host, host);
}
/* Use `host' as a bare hostname. */
conf_set_str(conf, CONF_host, host);
}
+ conf_free(conf2);
} else {
/* Patch in hostname `host' to session details. */
conf_set_str(conf, CONF_host, host);
} else {
/* Patch in hostname `host' to session details. */
conf_set_str(conf, CONF_host, host);