diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 /misc.h | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 25 |
1 files changed, 20 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.12 2002/03/19 10:49:35 markus Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.17 2004/08/11 21:43:05 avsm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -12,10 +12,12 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* misc.c */ | ||
16 | |||
15 | char *chop(char *); | 17 | char *chop(char *); |
16 | char *strdelim(char **); | 18 | char *strdelim(char **); |
17 | void set_nonblock(int); | 19 | int set_nonblock(int); |
18 | void unset_nonblock(int); | 20 | int unset_nonblock(int); |
19 | void set_nodelay(int); | 21 | void set_nodelay(int); |
20 | int a2port(const char *); | 22 | int a2port(const char *); |
21 | char *cleanhostname(char *); | 23 | char *cleanhostname(char *); |
@@ -27,7 +29,20 @@ struct passwd *pwcopy(struct passwd *); | |||
27 | typedef struct arglist arglist; | 29 | typedef struct arglist arglist; |
28 | struct arglist { | 30 | struct arglist { |
29 | char **list; | 31 | char **list; |
30 | int num; | 32 | u_int num; |
31 | int nalloc; | 33 | u_int nalloc; |
32 | }; | 34 | }; |
33 | void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); | 35 | void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); |
36 | |||
37 | /* tildexpand.c */ | ||
38 | |||
39 | char *tilde_expand_filename(const char *, uid_t); | ||
40 | |||
41 | /* readpass.c */ | ||
42 | |||
43 | #define RP_ECHO 0x0001 | ||
44 | #define RP_ALLOW_STDIN 0x0002 | ||
45 | #define RP_ALLOW_EOF 0x0004 | ||
46 | #define RP_USE_ASKPASS 0x0008 | ||
47 | |||
48 | char *read_passphrase(const char *, int); | ||