- (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john

[openssh.git] / uuencode.c

diff --git a/uuencode.c b/uuencode.c
index d5f2b96b3d707e22d0f5868ba9c8711c8a41538b..21eaf4d3f43ee0a333ca5d793234b5b498f93285 100644 (file)
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,5 +1,3 @@
-/*    $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $    */
-
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -25,9 +23,10 @@
  */
 
 #include "includes.h"
-#include "xmalloc.h"
+RCSID("$OpenBSD: uuencode.c,v 1.16 2002/09/09 14:54:15 markus Exp $");
 
-RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $");
+#include "xmalloc.h"
+#include "uuencode.h"
 
 int
 uuencode(u_char *src, u_int srclength,
@@ -49,7 +48,7 @@ uudecode(const char *src, u_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, u_char *target, size_t targsize)
 }
 
 void
-dump_base64(FILE *fp, u_char *data, int len)
+dump_base64(FILE *fp, u_char *data, u_int len)
 {
-       u_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]);