X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbase64.h;h=4b5a4ac3041a3d77c5cf38e9154aae51718e4bce;hb=04707083859be0e1be90aac1355e4efe5c3a339b;hp=6c5c7baacf190e59b38ac0585cb0f9ac8df56664;hpb=22c4089b345a2eaefd5bc70ef116e1301d91e8b1;p=gnulib.git
diff --git a/lib/base64.h b/lib/base64.h
index 6c5c7baac..4b5a4ac30 100644
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -1,5 +1,5 @@
/* base64.h -- Encode binary data using printable characters.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc.
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
@@ -13,33 +13,56 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program; if not, see . */
#ifndef BASE64_H
# define BASE64_H
/* Get size_t. */
-#include
+# include
/* Get bool. */
-#include
+# include
+
+# ifdef __cplusplus
+extern "C" {
+# endif
/* This uses that the expression (n+(k-1))/k means the smallest
integer >= n/k, i.e., the ceiling of n/k. */
-#define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
+# define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
+
+struct base64_decode_context
+{
+ unsigned int i;
+ char buf[4];
+};
-extern bool isbase64 (char ch);
+extern bool isbase64 (char ch) _GL_ATTRIBUTE_CONST;
extern void base64_encode (const char *restrict in, size_t inlen,
- char *restrict out, size_t outlen);
+ char *restrict out, size_t outlen);
extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out);
-extern bool base64_decode (const char *restrict in, size_t inlen,
- char *restrict out, size_t * outlen);
+extern void base64_decode_ctx_init (struct base64_decode_context *ctx);
+
+extern bool base64_decode_ctx (struct base64_decode_context *ctx,
+ const char *restrict in, size_t inlen,
+ char *restrict out, size_t *outlen);
+
+extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx,
+ const char *in, size_t inlen,
+ char **out, size_t *outlen);
+
+#define base64_decode(in, inlen, out, outlen) \
+ base64_decode_ctx (NULL, in, inlen, out, outlen)
+
+#define base64_decode_alloc(in, inlen, out, outlen) \
+ base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)
-extern bool base64_decode_alloc (const char *in, size_t inlen,
- char **out, size_t * outlen);
+# ifdef __cplusplus
+}
+# endif
#endif /* BASE64_H */