Mercurial > dropbear
diff scpmisc.h @ 302:973fccb59ea4 ucc-axis-hack
propagate from branch 'au.asn.ucc.matt.dropbear' (head 11034278bd1917bebcbdc69cf53b1891ce9db121)
to branch 'au.asn.ucc.matt.dropbear.ucc-axis-hack' (head 10a1f614fec73d0820c3f61160d9db409b9beb46)
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sat, 25 Mar 2006 12:59:58 +0000 |
parents | 5686ee0a3338 |
children | 83d85b28b353 |
line wrap: on
line diff
--- a/scpmisc.h Sat Mar 25 12:57:09 2006 +0000 +++ b/scpmisc.h Sat Mar 25 12:59:58 2006 +0000 @@ -34,6 +34,8 @@ int nalloc; }; void addargs(arglist *, char *, ...); +void replacearg(arglist *, u_int, char *, ...); +void freeargs(arglist *); /* from xmalloc.h */ void *xmalloc(size_t); @@ -41,4 +43,27 @@ void xfree(void *); char *xstrdup(const char *); +char *ssh_get_progname(char *); +void fatal(char* fmt,...); +void sanitise_stdfd(void); +/* Required for non-BSD platforms, from OpenSSH's defines.h */ +#ifndef timersub +#define timersub(a, b, result) \ + do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ + } while (0) +#endif + +#ifndef TIMEVAL_TO_TIMESPEC +#define TIMEVAL_TO_TIMESPEC(tv, ts) { \ + (ts)->tv_sec = (tv)->tv_sec; \ + (ts)->tv_nsec = (tv)->tv_usec * 1000; \ +} +#endif +