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

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 086f98e0f023a00d2dab92c27fd812bb2dd6e39a..92848b28e1c10f30ca917d5ee7ae74a3633ae070 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.8 2001/05/19 19:43:57 stevesk Exp $        */
+/*     $OpenBSD: misc.h,v 1.24 2005/07/04 00:58:43 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,63 +11,40 @@
  * 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 *s);
 
-/* return next token in configuration line */
-char   *strdelim(char **s);
+/* misc.c */
 
-/* set/unset filedescriptor to non-blocking */
-void   set_nonblock(int fd);
-void   unset_nonblock(int fd);
+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 *pw);
+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 *s);
-
-/* code from scp.c/rcp.c */
-char *cleanhostname(char *host);
-char *colon(char *cp);
-
-/*
- * 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 *s);
-
-/* 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 *args, char *fmt, ...) __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 *);