summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-09 15:28:41 +1000
committerDamien Miller <djm@mindrot.org>2000-05-09 15:28:41 +1000
commit75edac3366133f83d10ad8c560db7d28e48305f3 (patch)
treeb6317fd727d1df4bc4e0a63780228ffd09fc3166
parent2a44f8938d5ea02aa622bc3106988db26d9d74d6 (diff)
- Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
by Andre Lucas <andre.lucas@dial.pipex.com>
-rw-r--r--bsd-base64.c7
-rw-r--r--bsd-base64.h11
-rw-r--r--uuencode.c2
3 files changed, 8 insertions, 12 deletions
diff --git a/bsd-base64.c b/bsd-base64.c
index 57a957364..8cbf8eeef 100644
--- a/bsd-base64.c
+++ b/bsd-base64.c
@@ -44,7 +44,7 @@
44 44
45#include "config.h" 45#include "config.h"
46 46
47#ifndef HAVE_B64_NTOP 47#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
48 48
49#include <sys/types.h> 49#include <sys/types.h>
50#include <sys/param.h> 50#include <sys/param.h>
@@ -53,12 +53,13 @@
53#include <arpa/inet.h> 53#include <arpa/inet.h>
54 54
55#include <ctype.h> 55#include <ctype.h>
56#include <resolv.h>
57#include <stdio.h> 56#include <stdio.h>
58 57
59#include <stdlib.h> 58#include <stdlib.h>
60#include <string.h> 59#include <string.h>
61 60
61#include "bsd-base64.h"
62
62#define Assert(Cond) if (!(Cond)) abort() 63#define Assert(Cond) if (!(Cond)) abort()
63 64
64static const char Base64[] = 65static const char Base64[] =
@@ -312,4 +313,4 @@ b64_pton(char const *src, u_char *target, size_t targsize)
312 return (tarindex); 313 return (tarindex);
313} 314}
314 315
315#endif /* HAVE_B64_NTOP */ 316#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */
diff --git a/bsd-base64.h b/bsd-base64.h
index c5dace7cb..c1d69dd6c 100644
--- a/bsd-base64.h
+++ b/bsd-base64.h
@@ -4,16 +4,13 @@
4#include "config.h" 4#include "config.h"
5 5
6#ifndef HAVE___B64_NTOP 6#ifndef HAVE___B64_NTOP
7# ifdef HAVE_B64_NTOP 7# ifndef HAVE_B64_NTOP
8# define __b64_ntop b64_ntop
9# define __b64_pton b64_pton
10# else /* !HAVE_B64_NTOP */
11
12int b64_ntop(u_char const *src, size_t srclength, char *target, 8int b64_ntop(u_char const *src, size_t srclength, char *target,
13 size_t targsize); 9 size_t targsize);
14int b64_pton(char const *src, u_char *target, size_t targsize); 10int b64_pton(char const *src, u_char *target, size_t targsize);
15 11# endif /* !HAVE_B64_NTOP */
16# endif /* HAVE_B64_NTOP */ 12# define __b64_ntop b64_ntop
13# define __b64_pton b64_pton
17#endif /* HAVE___B64_NTOP */ 14#endif /* HAVE___B64_NTOP */
18 15
19#endif /* _BSD_BINRESVPORT_H */ 16#endif /* _BSD_BINRESVPORT_H */
diff --git a/uuencode.c b/uuencode.c
index fc84d5a58..2540d7564 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -4,8 +4,6 @@
4#include "includes.h" 4#include "includes.h"
5#include "xmalloc.h" 5#include "xmalloc.h"
6 6
7#include <resolv.h>
8
9int 7int
10uuencode(unsigned char *src, unsigned int srclength, 8uuencode(unsigned char *src, unsigned int srclength,
11 char *target, size_t targsize) 9 char *target, size_t targsize)