RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 05:27:45 +00:00
Code Issues Activity

Merge pull request #466 from Arcterus/master

Browse source 
base64: fix build (assuming rust-lang/rust#19594 is merged)
This commit is contained in:
Cynede 2014-12-10 08:19:20 +03:00
commit 9aec1611df
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/base64/base64.rs
View file

@ -115,7 +115,6 @@ fn decode(input: &mut Reader, ignore_garbage: bool) {
num == '+' as u8 || num == '/' as u8) num == '+' as u8 || num == '/' as u8)
}) })
} else { } else {
to_decode = to_decode.as_slice().replace("\n", "");
to_decode.as_slice() to_decode.as_slice()
}; };
@ -142,6 +141,7 @@ fn decode(input: &mut Reader, ignore_garbage: bool) {
fn encode(input: &mut Reader, line_wrap: uint) { fn encode(input: &mut Reader, line_wrap: uint) {
let b64_conf = base64::Config { let b64_conf = base64::Config {
char_set: base64::Standard, char_set: base64::Standard,
newline: base64::Newline::LF,
pad: true, pad: true,
line_length: match line_wrap { line_length: match line_wrap {
0 => None, 0 => None,
@ -154,14 +154,7 @@ fn encode(input: &mut Reader, line_wrap: uint) {
}; };
let encoded = to_encode.as_slice().to_base64(b64_conf); let encoded = to_encode.as_slice().to_base64(b64_conf);
// To my knowledge, RFC 3548 does not specify which line endings to use. It println(encoded.as_slice());
// seems that rust's base64 algorithm uses CRLF as prescribed by RFC 2045.
// However, since GNU base64 outputs only LF (presumably because that is
// the standard UNIX line ending), we strip CRs from the output to maintain
// compatibility.
let output = encoded.replace("\r", "");
println(output.as_slice());
} }
fn help(progname: &str, usage: &str) { fn help(progname: &str, usage: &str) {