X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/bcbf86ecce0d10003d08a40b67f2db96702c132a..5486a45797557bd2ffca421ca5e7ad2441f4db59:/uuencode.c

diff --git a/uuencode.c b/uuencode.c
index a37618d7..0a7c8d16 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,5 +1,3 @@
-/*	$OpenBSD: uuencode.c,v 1.7 2000/09/07 20:27:55 deraadt Exp $	*/
-
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -25,19 +23,20 @@
  */
 
 #include "includes.h"
-#include "xmalloc.h"
+RCSID("$OpenBSD: uuencode.c,v 1.17 2003/11/10 16:23:41 jakob Exp $");
 
-RCSID("$OpenBSD: uuencode.c,v 1.7 2000/09/07 20:27:55 deraadt Exp $");
+#include "xmalloc.h"
+#include "uuencode.h"
 
 int
-uuencode(unsigned char *src, unsigned int srclength,
+uuencode(const u_char *src, u_int srclength,
     char *target, size_t targsize)
 {
 	return __b64_ntop(src, srclength, target, targsize);
 }
 
 int
-uudecode(const char *src, unsigned char *target, size_t targsize)
+uudecode(const char *src, u_char *target, size_t targsize)
 {
 	int len;
 	char *encoded, *p;
@@ -49,7 +48,7 @@ uudecode(const char *src, unsigned char *target, size_t targsize)
 		;
 	for (; *p != '\0' && *p != ' ' && *p != '\t'; p++)
 		;
-	/* and remote trailing whitespace because __b64_pton needs this */
+	/* and remove trailing whitespace because __b64_pton needs this */
 	*p = '\0';
 	len = __b64_pton(encoded, target, targsize);
 	xfree(encoded);
@@ -57,10 +56,11 @@ uudecode(const char *src, unsigned char *target, size_t targsize)
 }
 
 void
-dump_base64(FILE *fp, unsigned char *data, int len)
+dump_base64(FILE *fp, u_char *data, u_int len)
 {
-	unsigned char *buf = xmalloc(2*len);
+	char *buf = xmalloc(2*len);
 	int i, n;
+
 	n = uuencode(data, len, buf, 2*len);
 	for (i = 0; i < n; i++) {
 		fprintf(fp, "%c", buf[i]);