projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When I turned fcntls into noncloexecs in r9940, I missed one.
[u/mdw/putty]
/
psftp.c
diff --git
a/psftp.c
b/psftp.c
index
5bc7d7c
..
6dd733d
100644
(file)
--- a/
psftp.c
+++ b/
psftp.c
@@
-922,6
+922,7
@@
int wildcard_iterate(char *filename, int (*func)(void *, char *), void *ctx)
printf("%s: canonify: %s\n", newname, fxp_error());
ret = 0;
}
printf("%s: canonify: %s\n", newname, fxp_error());
ret = 0;
}
+ sfree(newname);
matched = TRUE;
ret &= func(ctx, cname);
sfree(cname);
matched = TRUE;
ret &= func(ctx, cname);
sfree(cname);
@@
-1034,6
+1035,7
@@
int sftp_cmd_ls(struct sftp_command *cmd)
char *tmpdir;
int len, check;
char *tmpdir;
int len, check;
+ sfree(unwcdir);
wildcard = stripslashes(dir, 0);
unwcdir = dupstr(dir);
len = wildcard - dir;
wildcard = stripslashes(dir, 0);
unwcdir = dupstr(dir);
len = wildcard - dir;
@@
-2232,6
+2234,7
@@
struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
cmd->obey = sftp_cmd_quit;
if ((mode == 0) || (modeflags & 1))
printf("quit\n");
cmd->obey = sftp_cmd_quit;
if ((mode == 0) || (modeflags & 1))
printf("quit\n");
+ sfree(line);
return cmd; /* eof */
}
return cmd; /* eof */
}
@@
-2474,6
+2477,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;