summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-10 23:30:16 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-10 23:30:16 +0000
commit70ea46a382befd3100020b135d5ff440c51c3bd5 (patch)
tree0387d74d85293b94d7b4e64fc686d5131292e971
parente9d044452462b0c4b84fe42f3cf165af3f0bac80 (diff)
- (bal) uuencode.c resync w/ OpenBSD tree, plus whitespace.
-rw-r--r--ChangeLog3
-rw-r--r--uuencode.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bd999348..4a82a701d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,7 @@
87 (from the OpenBSD tree) 87 (from the OpenBSD tree)
88 - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD 88 - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD
89 - (bal) sftp-sever.c '%8lld' to '%8llu' (OpenBSD Sync) 89 - (bal) sftp-sever.c '%8lld' to '%8llu' (OpenBSD Sync)
90 - (bal) uuencode.c resync w/ OpenBSD tree, plus whitespace.
90 91
9120010210 9220010210
92 - (djm) Sync sftp and scp stuff from OpenBSD: 93 - (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3870,4 +3871,4 @@
3870 - Wrote replacements for strlcpy and mkdtemp 3871 - Wrote replacements for strlcpy and mkdtemp
3871 - Released 1.0pre1 3872 - Released 1.0pre1
3872 3873
3873$Id: ChangeLog,v 1.734 2001/02/10 23:26:35 mouring Exp $ 3874$Id: ChangeLog,v 1.735 2001/02/10 23:30:16 mouring Exp $
diff --git a/uuencode.c b/uuencode.c
index d5f2b96b3..5d93e0b61 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $ */ 1/* $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,6 +26,7 @@
26 26
27#include "includes.h" 27#include "includes.h"
28#include "xmalloc.h" 28#include "xmalloc.h"
29#include "uuencode.h"
29 30
30RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $"); 31RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $");
31 32
@@ -61,6 +62,7 @@ dump_base64(FILE *fp, u_char *data, int len)
61{ 62{
62 u_char *buf = xmalloc(2*len); 63 u_char *buf = xmalloc(2*len);
63 int i, n; 64 int i, n;
65
64 n = uuencode(data, len, buf, 2*len); 66 n = uuencode(data, len, buf, 2*len);
65 for (i = 0; i < n; i++) { 67 for (i = 0; i < n; i++) {
66 fprintf(fp, "%c", buf[i]); 68 fprintf(fp, "%c", buf[i]);