[configure.ac] Make sure -lcrypto is before -lsocket for sco3. ok mouring@

[openssh.git] / misc.h

diff --git a/misc.h b/misc.h
index 086f98e0f023a00d2dab92c27fd812bb2dd6e39a..6d2869b3612246729660b97163e112ee20dafa00 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.12 2002/03/19 10:49:35 markus Exp $        */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,63 +11,23 @@
  * 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);
+char   *chop(char *);
+char   *strdelim(char **);
+void    set_nonblock(int);
+void    unset_nonblock(int);
+void    set_nodelay(int);
+int     a2port(const char *);
+char   *cleanhostname(char *);
+char   *colon(char *);
+long    convtime(const char *);
 
-/* set/unset filedescriptor to non-blocking */
-void   set_nonblock(int fd);
-void   unset_nonblock(int fd);
+struct passwd *pwcopy(struct passwd *);
 
-struct passwd * pwcopy(struct passwd *pw);
-
-/*
- * 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;
+       int     num;
+       int     nalloc;
 };
-
-void addargs(arglist *args, char *fmt, ...) __attribute__((format(printf, 2, 3)));
-
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
+void    addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));