diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-07-13 14:42:35 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-07-13 14:42:35 +1000 |
commit | 6310ef27a2567cda66d6cf0c1ad290ee1167f243 (patch) | |
tree | a84f11401272e0eb9717008e6d2d69c426e72aea | |
parent | f3f2cc8386868f51440c45210098f65f9787449a (diff) |
Move err.h replacements into compat lib.
Move implementations of err.h replacement functions into their own file
in the libopenbsd-compat so we can use them in kexfuzz.c too. ok djm@
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-err.c | 71 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.h | 11 | ||||
-rw-r--r-- | regress/misc/kexfuzz/kexfuzz.c | 4 | ||||
-rw-r--r-- | regress/netcat.c | 40 |
6 files changed, 90 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index 2bb5a63c8..005a9ead5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -373,6 +373,7 @@ AC_CHECK_HEADERS([ \ | |||
373 | dirent.h \ | 373 | dirent.h \ |
374 | endian.h \ | 374 | endian.h \ |
375 | elf.h \ | 375 | elf.h \ |
376 | err.h \ | ||
376 | features.h \ | 377 | features.h \ |
377 | fcntl.h \ | 378 | fcntl.h \ |
378 | floatingpoint.h \ | 379 | floatingpoint.h \ |
@@ -1692,6 +1693,8 @@ AC_CHECK_FUNCS([ \ | |||
1692 | closefrom \ | 1693 | closefrom \ |
1693 | dirfd \ | 1694 | dirfd \ |
1694 | endgrent \ | 1695 | endgrent \ |
1696 | err \ | ||
1697 | errx \ | ||
1695 | explicit_bzero \ | 1698 | explicit_bzero \ |
1696 | fchmod \ | 1699 | fchmod \ |
1697 | fchown \ | 1700 | fchown \ |
@@ -1783,6 +1786,7 @@ AC_CHECK_FUNCS([ \ | |||
1783 | vasprintf \ | 1786 | vasprintf \ |
1784 | vsnprintf \ | 1787 | vsnprintf \ |
1785 | waitpid \ | 1788 | waitpid \ |
1789 | warn \ | ||
1786 | ]) | 1790 | ]) |
1787 | 1791 | ||
1788 | AC_LINK_IFELSE( | 1792 | AC_LINK_IFELSE( |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 3c5e3b7f7..aca9eba75 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@ | |||
18 | 18 | ||
19 | OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o reallocarray.o realpath.o rresvport.o setenv.o setproctitle.o sha1.o sha2.o rmd160.o md5.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o | 19 | OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o reallocarray.o realpath.o rresvport.o setenv.o setproctitle.o sha1.o sha2.o rmd160.o md5.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o |
20 | 20 | ||
21 | COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o kludge-fd_set.o | 21 | COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-err.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o kludge-fd_set.o |
22 | 22 | ||
23 | PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o | 23 | PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o |
24 | 24 | ||
diff --git a/openbsd-compat/bsd-err.c b/openbsd-compat/bsd-err.c new file mode 100644 index 000000000..ab10646f0 --- /dev/null +++ b/openbsd-compat/bsd-err.c | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2015 Tim Rice <tim@multitalents.net> | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions | ||
6 | * are met: | ||
7 | * | ||
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * 3. The name of the author may not be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
22 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
23 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | #include "includes.h" | ||
29 | |||
30 | #ifndef HAVE_ERR | ||
31 | void | ||
32 | err(int r, const char *fmt, ...) | ||
33 | { | ||
34 | va_list args; | ||
35 | |||
36 | va_start(args, fmt); | ||
37 | fprintf(stderr, "%s: ", strerror(errno)); | ||
38 | vfprintf(stderr, fmt, args); | ||
39 | fputc('\n', stderr); | ||
40 | va_end(args); | ||
41 | exit(r); | ||
42 | } | ||
43 | #endif | ||
44 | |||
45 | #ifndef HAVE_ERRX | ||
46 | void | ||
47 | errx(int r, const char *fmt, ...) | ||
48 | { | ||
49 | va_list args; | ||
50 | |||
51 | va_start(args, fmt); | ||
52 | vfprintf(stderr, fmt, args); | ||
53 | fputc('\n', stderr); | ||
54 | va_end(args); | ||
55 | exit(r); | ||
56 | } | ||
57 | #endif | ||
58 | |||
59 | #ifndef HAVE_WARN | ||
60 | void | ||
61 | warn(const char *fmt, ...) | ||
62 | { | ||
63 | va_list args; | ||
64 | |||
65 | va_start(args, fmt); | ||
66 | fprintf(stderr, "%s: ", strerror(errno)); | ||
67 | vfprintf(stderr, fmt, args); | ||
68 | fputc('\n', stderr); | ||
69 | va_end(args); | ||
70 | } | ||
71 | #endif | ||
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index 0d81d1735..27abb2e92 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -126,4 +126,15 @@ pid_t getpgid(pid_t); | |||
126 | int pledge(const char *promises, const char *paths[]); | 126 | int pledge(const char *promises, const char *paths[]); |
127 | #endif | 127 | #endif |
128 | 128 | ||
129 | /* bsd-err.h */ | ||
130 | #ifndef HAVE_ERR | ||
131 | void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); | ||
132 | #endif | ||
133 | #ifndef HAVE_ERRX | ||
134 | void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); | ||
135 | #endif | ||
136 | #ifndef HAVE_WARN | ||
137 | void warn(const char *, ...) __attribute__((format(printf, 1, 2))); | ||
138 | #endif | ||
139 | |||
129 | #endif /* _BSD_MISC_H */ | 140 | #endif /* _BSD_MISC_H */ |
diff --git a/regress/misc/kexfuzz/kexfuzz.c b/regress/misc/kexfuzz/kexfuzz.c index e6751d31c..2894d3a1e 100644 --- a/regress/misc/kexfuzz/kexfuzz.c +++ b/regress/misc/kexfuzz/kexfuzz.c | |||
@@ -17,7 +17,9 @@ | |||
17 | #include <string.h> | 17 | #include <string.h> |
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include <fcntl.h> | 19 | #include <fcntl.h> |
20 | #include <err.h> | 20 | #ifdef HAVE_ERR_H |
21 | # include <err.h> | ||
22 | #endif | ||
21 | 23 | ||
22 | #include "ssherr.h" | 24 | #include "ssherr.h" |
23 | #include "ssh_api.h" | 25 | #include "ssh_api.h" |
diff --git a/regress/netcat.c b/regress/netcat.c index 6234ba019..7c29e0cf9 100644 --- a/regress/netcat.c +++ b/regress/netcat.c | |||
@@ -134,46 +134,6 @@ void usage(int); | |||
134 | ssize_t drainbuf(int, unsigned char *, size_t *); | 134 | ssize_t drainbuf(int, unsigned char *, size_t *); |
135 | ssize_t fillbuf(int, unsigned char *, size_t *); | 135 | ssize_t fillbuf(int, unsigned char *, size_t *); |
136 | 136 | ||
137 | static void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); | ||
138 | static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); | ||
139 | static void warn(const char *, ...) __attribute__((format(printf, 1, 2))); | ||
140 | |||
141 | static void | ||
142 | err(int r, const char *fmt, ...) | ||
143 | { | ||
144 | va_list args; | ||
145 | |||
146 | va_start(args, fmt); | ||
147 | fprintf(stderr, "%s: ", strerror(errno)); | ||
148 | vfprintf(stderr, fmt, args); | ||
149 | fputc('\n', stderr); | ||
150 | va_end(args); | ||
151 | exit(r); | ||
152 | } | ||
153 | |||
154 | static void | ||
155 | errx(int r, const char *fmt, ...) | ||
156 | { | ||
157 | va_list args; | ||
158 | |||
159 | va_start(args, fmt); | ||
160 | vfprintf(stderr, fmt, args); | ||
161 | fputc('\n', stderr); | ||
162 | va_end(args); | ||
163 | exit(r); | ||
164 | } | ||
165 | |||
166 | static void | ||
167 | warn(const char *fmt, ...) | ||
168 | { | ||
169 | va_list args; | ||
170 | |||
171 | va_start(args, fmt); | ||
172 | fprintf(stderr, "%s: ", strerror(errno)); | ||
173 | vfprintf(stderr, fmt, args); | ||
174 | fputc('\n', stderr); | ||
175 | va_end(args); | ||
176 | } | ||
177 | 137 | ||
178 | int | 138 | int |
179 | main(int argc, char *argv[]) | 139 | main(int argc, char *argv[]) |