diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /uuencode.c | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'uuencode.c')
-rw-r--r-- | uuencode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/uuencode.c b/uuencode.c index 09d80d2fc..294c74304 100644 --- a/uuencode.c +++ b/uuencode.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: uuencode.c,v 1.26 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: uuencode.c,v 1.27 2013/05/17 00:13:14 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -29,6 +29,7 @@ | |||
29 | #include <netinet/in.h> | 29 | #include <netinet/in.h> |
30 | #include <resolv.h> | 30 | #include <resolv.h> |
31 | #include <stdio.h> | 31 | #include <stdio.h> |
32 | #include <stdlib.h> | ||
32 | 33 | ||
33 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
34 | #include "uuencode.h" | 35 | #include "uuencode.h" |
@@ -67,7 +68,7 @@ uudecode(const char *src, u_char *target, size_t targsize) | |||
67 | /* and remove trailing whitespace because __b64_pton needs this */ | 68 | /* and remove trailing whitespace because __b64_pton needs this */ |
68 | *p = '\0'; | 69 | *p = '\0'; |
69 | len = __b64_pton(encoded, target, targsize); | 70 | len = __b64_pton(encoded, target, targsize); |
70 | xfree(encoded); | 71 | free(encoded); |
71 | return len; | 72 | return len; |
72 | } | 73 | } |
73 | 74 | ||
@@ -90,5 +91,5 @@ dump_base64(FILE *fp, const u_char *data, u_int len) | |||
90 | } | 91 | } |
91 | if (i % 70 != 69) | 92 | if (i % 70 != 69) |
92 | fprintf(fp, "\n"); | 93 | fprintf(fp, "\n"); |
93 | xfree(buf); | 94 | free(buf); |
94 | } | 95 | } |