- djm@cvs.openbsd.org 2005/07/04 00:58:43

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 668fd60d3bb7883a66bb5228ad39266a9e659108..92848b28e1c10f30ca917d5ee7ae74a3633ae070 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.11 2002/01/24 21:09:25 stevesk Exp $       */
+/*     $OpenBSD: misc.h,v 1.24 2005/07/04 00:58:43 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,26 +12,39 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+/* misc.c */
+
 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);
+char   *percent_expand(const char *, ...) __attribute__((sentinel));
+char   *tohex(const u_char *, u_int);
 
 struct passwd *pwcopy(struct passwd *);
 
 typedef struct arglist arglist;
 struct arglist {
-        char    **list;
-        int     num;
-        int     nalloc;
+       char    **list;
+       u_int   num;
+       u_int   nalloc;
 };
 void    addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
 
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
+/* 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 *);