~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a missing initialisation to NULL.
[sgt/putty]
/
unix
/
uxsftp.c
diff --git
a/unix/uxsftp.c
b/unix/uxsftp.c
index
a9af614
..
651047e
100644
(file)
--- a/
unix/uxsftp.c
+++ b/
unix/uxsftp.c
@@
-34,7
+34,7
@@
char *x_get_default(const char *key)
return NULL; /* this is a stub */
}
return NULL; /* this is a stub */
}
-void platform_get_x11_auth(struct X11Display *display,
const Config *cfg
)
+void platform_get_x11_auth(struct X11Display *display,
Conf *conf
)
{
/* Do nothing, therefore no auth. */
}
{
/* Do nothing, therefore no auth. */
}
@@
-125,7
+125,8
@@
struct RFile {
};
RFile *open_existing_file(char *name, uint64 *size,
};
RFile *open_existing_file(char *name, uint64 *size,
- unsigned long *mtime, unsigned long *atime)
+ unsigned long *mtime, unsigned long *atime,
+ long *perms)
{
int fd;
RFile *ret;
{
int fd;
RFile *ret;
@@
-137,7
+138,7
@@
RFile *open_existing_file(char *name, uint64 *size,
ret = snew(RFile);
ret->fd = fd;
ret = snew(RFile);
ret->fd = fd;
- if (size || mtime || atime) {
+ if (size || mtime || atime
|| perms
) {
struct stat statbuf;
if (fstat(fd, &statbuf) < 0) {
fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
struct stat statbuf;
if (fstat(fd, &statbuf) < 0) {
fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
@@
-153,6
+154,9
@@
RFile *open_existing_file(char *name, uint64 *size,
if (atime)
*atime = statbuf.st_atime;
if (atime)
*atime = statbuf.st_atime;
+
+ if (perms)
+ *perms = statbuf.st_mode;
}
return ret;
}
return ret;
@@
-174,12
+178,13
@@
struct WFile {
char *name;
};
char *name;
};
-WFile *open_new_file(char *name)
+WFile *open_new_file(char *name
, long perms
)
{
int fd;
WFile *ret;
{
int fd;
WFile *ret;
- fd = open(name, O_CREAT | O_TRUNC | O_WRONLY, 0666);
+ fd = open(name, O_CREAT | O_TRUNC | O_WRONLY,
+ (mode_t)(perms ? perms : 0666));
if (fd < 0)
return NULL;
if (fd < 0)
return NULL;
@@
-202,6
+207,7
@@
WFile *open_existing_wfile(char *name, uint64 *size)
ret = snew(WFile);
ret->fd = fd;
ret = snew(WFile);
ret->fd = fd;
+ ret->name = dupstr(name);
if (size) {
struct stat statbuf;
if (size) {
struct stat statbuf;