diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /sftp-common.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'sftp-common.h')
-rw-r--r-- | sftp-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-common.h b/sftp-common.h index 9b5848462..9ed86c070 100644 --- a/sftp-common.h +++ b/sftp-common.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-common.h,v 1.10 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: sftp-common.h,v 1.11 2010/01/13 01:40:16 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -46,6 +46,6 @@ void stat_to_attrib(const struct stat *, Attrib *); | |||
46 | void attrib_to_stat(const Attrib *, struct stat *); | 46 | void attrib_to_stat(const Attrib *, struct stat *); |
47 | Attrib *decode_attrib(Buffer *); | 47 | Attrib *decode_attrib(Buffer *); |
48 | void encode_attrib(Buffer *, const Attrib *); | 48 | void encode_attrib(Buffer *, const Attrib *); |
49 | char *ls_file(const char *, const struct stat *, int); | 49 | char *ls_file(const char *, const struct stat *, int, int); |
50 | 50 | ||
51 | const char *fx2txt(int); | 51 | const char *fx2txt(int); |