diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
commit | 46c162204b5a6f7471525c2f75cb2c607c88b83f (patch) | |
tree | 9041b006ab612c18bdb16b606601839a00ca5b2c /uuencode.c | |
parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) |
One way to massive patch. <sigh> It compiles and works under Linux..
And I think I have all the bits right from the OpenBSD tree.
20001222
- Updated RCSID for pty.c
- (bal) OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/12/21 15:10:16
[auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
- markus@cvs.openbsd.org 2000/12/20 19:26:56
[authfile.c]
allow ssh -i userkey for root
- markus@cvs.openbsd.org 2000/12/20 19:37:21
[authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
fix prototypes; from stevesk@pobox.com
- markus@cvs.openbsd.org 2000/12/20 19:32:08
[sshd.c]
init pointer to NULL; report from Jan.Ivan@cern.ch
- markus@cvs.openbsd.org 2000/12/19 23:17:54
[auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h uuencode.c
uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
unsigned' with u_char.
Diffstat (limited to 'uuencode.c')
-rw-r--r-- | uuencode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/uuencode.c b/uuencode.c index a37618d76..01b845764 100644 --- a/uuencode.c +++ b/uuencode.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: uuencode.c,v 1.7 2000/09/07 20:27:55 deraadt Exp $ */ | 1 | /* $OpenBSD: uuencode.c,v 1.8 2000/12/19 23:17:59 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -27,17 +27,17 @@ | |||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
30 | RCSID("$OpenBSD: uuencode.c,v 1.7 2000/09/07 20:27:55 deraadt Exp $"); | 30 | RCSID("$OpenBSD: uuencode.c,v 1.8 2000/12/19 23:17:59 markus Exp $"); |
31 | 31 | ||
32 | int | 32 | int |
33 | uuencode(unsigned char *src, unsigned int srclength, | 33 | uuencode(u_char *src, u_int srclength, |
34 | char *target, size_t targsize) | 34 | char *target, size_t targsize) |
35 | { | 35 | { |
36 | return __b64_ntop(src, srclength, target, targsize); | 36 | return __b64_ntop(src, srclength, target, targsize); |
37 | } | 37 | } |
38 | 38 | ||
39 | int | 39 | int |
40 | uudecode(const char *src, unsigned char *target, size_t targsize) | 40 | uudecode(const char *src, u_char *target, size_t targsize) |
41 | { | 41 | { |
42 | int len; | 42 | int len; |
43 | char *encoded, *p; | 43 | char *encoded, *p; |
@@ -57,9 +57,9 @@ uudecode(const char *src, unsigned char *target, size_t targsize) | |||
57 | } | 57 | } |
58 | 58 | ||
59 | void | 59 | void |
60 | dump_base64(FILE *fp, unsigned char *data, int len) | 60 | dump_base64(FILE *fp, u_char *data, int len) |
61 | { | 61 | { |
62 | unsigned char *buf = xmalloc(2*len); | 62 | u_char *buf = xmalloc(2*len); |
63 | int i, n; | 63 | int i, n; |
64 | n = uuencode(data, len, buf, 2*len); | 64 | n = uuencode(data, len, buf, 2*len); |
65 | for (i = 0; i < n; i++) { | 65 | for (i = 0; i < n; i++) { |