- Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
by Andre Lucas <andre.lucas@dial.pipex.com>
This commit is contained in:
parent
2a44f8938d
commit
75edac3366
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifndef HAVE_B64_NTOP
|
#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
|
@ -53,12 +53,13 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <resolv.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "bsd-base64.h"
|
||||||
|
|
||||||
#define Assert(Cond) if (!(Cond)) abort()
|
#define Assert(Cond) if (!(Cond)) abort()
|
||||||
|
|
||||||
static const char Base64[] =
|
static const char Base64[] =
|
||||||
|
@ -312,4 +313,4 @@ b64_pton(char const *src, u_char *target, size_t targsize)
|
||||||
return (tarindex);
|
return (tarindex);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* HAVE_B64_NTOP */
|
#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */
|
||||||
|
|
11
bsd-base64.h
11
bsd-base64.h
|
@ -4,16 +4,13 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifndef HAVE___B64_NTOP
|
#ifndef HAVE___B64_NTOP
|
||||||
# ifdef HAVE_B64_NTOP
|
# ifndef HAVE_B64_NTOP
|
||||||
# define __b64_ntop b64_ntop
|
|
||||||
# define __b64_pton b64_pton
|
|
||||||
# else /* !HAVE_B64_NTOP */
|
|
||||||
|
|
||||||
int b64_ntop(u_char const *src, size_t srclength, char *target,
|
int b64_ntop(u_char const *src, size_t srclength, char *target,
|
||||||
size_t targsize);
|
size_t targsize);
|
||||||
int b64_pton(char const *src, u_char *target, size_t targsize);
|
int b64_pton(char const *src, u_char *target, size_t targsize);
|
||||||
|
# endif /* !HAVE_B64_NTOP */
|
||||||
# endif /* HAVE_B64_NTOP */
|
# define __b64_ntop b64_ntop
|
||||||
|
# define __b64_pton b64_pton
|
||||||
#endif /* HAVE___B64_NTOP */
|
#endif /* HAVE___B64_NTOP */
|
||||||
|
|
||||||
#endif /* _BSD_BINRESVPORT_H */
|
#endif /* _BSD_BINRESVPORT_H */
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
|
||||||
#include <resolv.h>
|
|
||||||
|
|
||||||
int
|
int
|
||||||
uuencode(unsigned char *src, unsigned int srclength,
|
uuencode(unsigned char *src, unsigned int srclength,
|
||||||
char *target, size_t targsize)
|
char *target, size_t targsize)
|
||||||
|
|
Loading…
Reference in New Issue