- (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 01a736c03ee7b362503c9ffe7304578baaf95915..ffa8d8f27bdb1acdc3ef468a451419e78b4ca488 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.h,v 1.7 2001/05/11 14:59:56 markus Exp $ */
+/*     $OpenBSD: misc.h,v 1.16 2004/06/17 15:10:14 djm Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,39 +11,38 @@
  * 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   *cleanhostname(char *);
+char   *colon(char *);
+long    convtime(const char *);
 
-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);
-
-/* function to assist building execv() arguments */
 typedef struct arglist arglist;
 struct arglist {
-        char    **list;
-        int     num;
-        int     nalloc;
+       char    **list;
+       int     num;
+       int     nalloc;
 };
+void    addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+
+/* tildexpand.c */
+
+char   *tilde_expand_filename(const char *, uid_t);
+
+/* 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);