-/* $OpenBSD: misc.h,v 1.9 2001/06/26 06:32:56 itojun Exp $ */
+/* $OpenBSD: misc.h,v 1.24 2005/07/04 00:58:43 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* incompatible with the protocol description in the RFC file, it must be
* called by a name other than "ssh" or "Secure Shell".
*/
-/* remove newline at end of string */
-char *chop(char *);
-
-/* return next token in configuration line */
-char *strdelim(char **);
-/* set/unset filedescriptor to non-blocking */
-void set_nonblock(int);
-void unset_nonblock(int);
+/* misc.c */
-struct passwd * pwcopy(struct passwd *);
-
-/*
- * Convert ASCII string to TCP/IP port number.
- * Port must be >0 and <=65535.
- * Return 0 if invalid.
- */
-int a2port(const char *);
-
-/* code from scp.c/rcp.c */
-char *cleanhostname(char *);
-char *colon(char *);
-
-/*
- * Convert a time string into seconds; format is
- * a sequence of:
- * time[qualifier]
- *
- * Valid time qualifiers are:
- * <none> seconds
- * s|S seconds
- * m|M minutes
- * h|H hours
- * d|D days
- * w|W weeks
- *
- * Examples:
- * 90m 90 minutes
- * 1h30m 90 minutes
- * 2d 2 days
- * 1w 1 week
- *
- * Return -1 if time string is invalid.
- */
-
-long convtime(const char *);
+char *chop(char *);
+char *strdelim(char **);
+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 *);
-/* function to assist building execv() arguments */
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)));
+
+/* readpass.c */
-void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+#define RP_ECHO 0x0001
+#define RP_ALLOW_STDIN 0x0002
+#define RP_ALLOW_EOF 0x0004
+#define RP_USE_ASKPASS 0x0008
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
+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 *);