- (tim) [configure.ac] set TEST_SHELL for OpenServer 6

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index d4a23cba317b30f0a1b0a9340d92e2fdf98b82eb..798d80fbf3fd98794d034ca288d54260c33f58b7 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.14 2004/05/08 00:21:31 djm Exp $   */
+/*     $OpenBSD: misc.h,v 1.22 2005/04/09 04:32:54 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,32 +16,33 @@
 
 char   *chop(char *);
 char   *strdelim(char **);
-void    set_nonblock(int);
-void    unset_nonblock(int);
+int     set_nonblock(int);
+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);
 
 struct passwd *pwcopy(struct passwd *);
 
 typedef struct arglist arglist;
 struct arglist {
        char    **list;
-       int     num;
-       int     nalloc;
+       u_int   num;
+       u_int   nalloc;
 };
 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
 #define RP_ALLOW_STDIN         0x0002
 #define RP_ALLOW_EOF           0x0004
+#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 *);