projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the standard linedraw->Unicode mapping from unicode.c to generate
[u/mdw/putty]
/
psftp.c
diff --git
a/psftp.c
b/psftp.c
index
47f8b63
..
2dc6e4c
100644
(file)
--- a/
psftp.c
+++ b/
psftp.c
@@
-34,6
+34,7
@@
static int do_sftp_init(void);
char *pwd, *homedir;
static Backend *back;
static void *backhandle;
char *pwd, *homedir;
static Backend *back;
static void *backhandle;
+static Config cfg;
/* ----------------------------------------------------------------------
* Higher-level helper functions used in commands.
/* ----------------------------------------------------------------------
* Higher-level helper functions used in commands.
@@
-832,7
+833,7
@@
int sftp_cmd_chmod(struct sftp_command *cmd)
if (!(subset & 06777) && (perms &~ subset)) {
printf("chmod: file mode '%.*s' contains no user/group/other"
" specifier and permissions other than 't' \n",
if (!(subset & 06777) && (perms &~ subset)) {
printf("chmod: file mode '%.*s' contains no user/group/other"
" specifier and permissions other than 't' \n",
- strcspn(modebegin, ","), modebegin
, *mode
);
+ strcspn(modebegin, ","), modebegin);
return 0;
}
perms &= subset;
return 0;
}
perms &= subset;
@@
-1722,7
+1723,7
@@
static int psftp_connect(char *userhost, char *user, int portnumber)
/*
* Enact command-line overrides.
*/
/*
* Enact command-line overrides.
*/
- cmdline_run_saved();
+ cmdline_run_saved(
&cfg
);
/*
* Trim leading whitespace off the hostname if it's there.
/*
* Trim leading whitespace off the hostname if it's there.
@@
-1828,12
+1829,12
@@
static int psftp_connect(char *userhost, char *user, int portnumber)
back = &ssh_backend;
back = &ssh_backend;
- err = back->init(NULL, &backhandle,
cfg.host, cfg.port, &realhost,
0);
+ err = back->init(NULL, &backhandle,
&cfg, cfg.host, cfg.port, &realhost,
0);
if (err != NULL) {
fprintf(stderr, "ssh_init: %s\n", err);
return 1;
}
if (err != NULL) {
fprintf(stderr, "ssh_init: %s\n", err);
return 1;
}
- logctx = log_init(NULL);
+ logctx = log_init(NULL
, &cfg
);
back->provide_logctx(backhandle, logctx);
ssh_sftp_init();
if (verbose && realhost != NULL)
back->provide_logctx(backhandle, logctx);
ssh_sftp_init();
if (verbose && realhost != NULL)
@@
-1883,7
+1884,7
@@
int main(int argc, char *argv[])
userhost = dupstr(argv[i]);
continue;
}
userhost = dupstr(argv[i]);
continue;
}
- ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1);
+ ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1
, &cfg
);
if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", argv[i]);
} else if (ret == 2) {
if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", argv[i]);
} else if (ret == 2) {