projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rationalise null pointer checks in both decode_codepage functions, so
[u/mdw/putty]
/
pscp.c
diff --git
a/pscp.c
b/pscp.c
index
a6886d7
..
2eecad6
100644
(file)
--- a/
pscp.c
+++ b/
pscp.c
@@
-129,6
+129,19
@@
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);
+ tell_str(stderr, str2);
+ sfree(str2);
+ errs++;
+}
void connection_fatal(void *frontend, char *fmt, ...)
{
char *str, *str2;
void connection_fatal(void *frontend, char *fmt, ...)
{
char *str, *str2;
@@
-1118,6
+1131,9
@@
int scp_sink_setup(char *source, int preserve, int recursive)
if (!wc_unescape(newsource, source)) {
/* Yes, here we go; it's a wildcard. Bah. */
char *dupsource, *lastpart, *dirpart, *wildcard;
if (!wc_unescape(newsource, source)) {
/* Yes, here we go; it's a wildcard. Bah. */
char *dupsource, *lastpart, *dirpart, *wildcard;
+
+ sfree(newsource);
+
dupsource = dupstr(source);
lastpart = stripslashes(dupsource, 0);
wildcard = dupstr(lastpart);
dupsource = dupstr(source);
lastpart = stripslashes(dupsource, 0);
wildcard = dupstr(lastpart);
@@
-1722,8
+1738,10
@@
static void source(char *src)
return;
}
if (preserve) {
return;
}
if (preserve) {
- if (scp_send_filetimes(mtime, atime))
+ if (scp_send_filetimes(mtime, atime)) {
+ close_rfile(f);
return;
return;
+ }
}
if (verbose) {
}
if (verbose) {
@@
-1731,8
+1749,10
@@
static void source(char *src)
uint64_decimal(size, sizestr);
tell_user(stderr, "Sending file %s, size=%s", last, sizestr);
}
uint64_decimal(size, sizestr);
tell_user(stderr, "Sending file %s, size=%s", last, sizestr);
}
- if (scp_send_filename(last, size, permissions))
+ if (scp_send_filename(last, size, permissions)) {
+ close_rfile(f);
return;
return;
+ }
stat_bytes = uint64_make(0,0);
stat_starttime = time(NULL);
stat_bytes = uint64_make(0,0);
stat_starttime = time(NULL);