=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/misc.h,v retrieving revision 1.17 retrieving revision 1.17.2.2 diff -u -r1.17 -r1.17.2.2 --- src/usr.bin/ssh/misc.h 2004/08/11 21:43:05 1.17 +++ src/usr.bin/ssh/misc.h 2005/09/02 03:45:00 1.17.2.2 @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.17 2004/08/11 21:43:05 avsm Exp $ */ +/* $OpenBSD: misc.h,v 1.17.2.2 2005/09/02 03:45:00 brad Exp $ */ /* * Author: Tatu Ylonen @@ -20,9 +20,13 @@ int unset_nonblock(int); void set_nodelay(int); int a2port(const char *); +char *hpdelim(char **); char *cleanhostname(char *); char *colon(char *); long convtime(const char *); +char *tilde_expand_filename(const char *, uid_t); +char *percent_expand(const char *, ...) __attribute__((__sentinel__)); +char *tohex(const u_char *, u_int); struct passwd *pwcopy(struct passwd *); @@ -34,10 +38,6 @@ }; void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); -/* tildexpand.c */ - -char *tilde_expand_filename(const char *, uid_t); - /* readpass.c */ #define RP_ECHO 0x0001 @@ -46,3 +46,5 @@ #define RP_USE_ASKPASS 0x0008 char *read_passphrase(const char *, int); +int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); +int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);