Skip to content

Commit 8b115df

Browse files
flierflier
committed
replace \r\n with \n for windows
1 parent 0c8526e commit 8b115df

File tree

1 file changed

+79
-61
lines changed

1 file changed

+79
-61
lines changed

‎src/loader.rs

Lines changed: 79 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -164,24 +164,28 @@ impl MachCommand {
164164
let MachCommand(ref cmd, cmdsize) = *self;
165165

166166
match cmd {
167-
&LoadCommand::Segment { ref segname,
168-
vmaddr,
169-
vmsize,
170-
fileoff,
171-
filesize,
172-
maxprot,
173-
initprot,
174-
flags,
175-
ref sections } |
176-
&LoadCommand::Segment64 { ref segname,
177-
vmaddr,
178-
vmsize,
179-
fileoff,
180-
filesize,
181-
maxprot,
182-
initprot,
183-
flags,
184-
ref sections } => {
167+
&LoadCommand::Segment {
168+
ref segname,
169+
vmaddr,
170+
vmsize,
171+
fileoff,
172+
filesize,
173+
maxprot,
174+
initprot,
175+
flags,
176+
ref sections,
177+
} |
178+
&LoadCommand::Segment64 {
179+
ref segname,
180+
vmaddr,
181+
vmsize,
182+
fileoff,
183+
filesize,
184+
maxprot,
185+
initprot,
186+
flags,
187+
ref sections,
188+
} => {
185189
let is_64bit = if cmd.cmd() == LC_SEGMENT_64 {
186190
true
187191
} else {
@@ -263,16 +267,18 @@ impl MachCommand {
263267
fn print_dyld_info_command(&self, f: &mut fmt::Formatter) -> fmt::Result {
264268
let MachCommand(ref cmd, cmdsize) = *self;
265269

266-
if let &LoadCommand::DyldInfo { rebase_off,
267-
rebase_size,
268-
bind_off,
269-
bind_size,
270-
weak_bind_off,
271-
weak_bind_size,
272-
lazy_bind_off,
273-
lazy_bind_size,
274-
export_off,
275-
export_size } = cmd {
270+
if let &LoadCommand::DyldInfo {
271+
rebase_off,
272+
rebase_size,
273+
bind_off,
274+
bind_size,
275+
weak_bind_off,
276+
weak_bind_size,
277+
lazy_bind_off,
278+
lazy_bind_size,
279+
export_off,
280+
export_size,
281+
} = cmd {
276282
try!(write!(f, " cmd {}\n", cmd.name()));
277283
try!(write!(f, " cmdsize {}\n", cmdsize));
278284
try!(write!(f, " rebase_off {}\n", rebase_off));
@@ -295,7 +301,12 @@ impl MachCommand {
295301
fn print_symtab_command(&self, f: &mut fmt::Formatter) -> fmt::Result {
296302
let MachCommand(ref cmd, cmdsize) = *self;
297303

298-
if let &LoadCommand::SymTab { symoff, nsyms, stroff, strsize } = cmd {
304+
if let &LoadCommand::SymTab {
305+
symoff,
306+
nsyms,
307+
stroff,
308+
strsize,
309+
} = cmd {
299310
try!(write!(f, " cmd {}\n", cmd.name()));
300311
try!(write!(f, " cmdsize {}\n", cmdsize));
301312
try!(write!(f, " symoff {}\n", symoff));
@@ -312,24 +323,26 @@ impl MachCommand {
312323
fn print_dysymtab_command(&self, f: &mut fmt::Formatter) -> fmt::Result {
313324
let MachCommand(ref cmd, cmdsize) = *self;
314325

315-
if let &LoadCommand::DySymTab { ilocalsym,
316-
nlocalsym,
317-
iextdefsym,
318-
nextdefsym,
319-
iundefsym,
320-
nundefsym,
321-
tocoff,
322-
ntoc,
323-
modtaboff,
324-
nmodtab,
325-
extrefsymoff,
326-
nextrefsyms,
327-
indirectsymoff,
328-
nindirectsyms,
329-
extreloff,
330-
nextrel,
331-
locreloff,
332-
nlocrel } = cmd {
326+
if let &LoadCommand::DySymTab {
327+
ilocalsym,
328+
nlocalsym,
329+
iextdefsym,
330+
nextdefsym,
331+
iundefsym,
332+
nundefsym,
333+
tocoff,
334+
ntoc,
335+
modtaboff,
336+
nmodtab,
337+
extrefsymoff,
338+
nextrefsyms,
339+
indirectsymoff,
340+
nindirectsyms,
341+
extreloff,
342+
nextrel,
343+
locreloff,
344+
nlocrel,
345+
} = cmd {
333346
try!(write!(f, " cmd {}\n", cmd.name()));
334347
try!(write!(f, " cmdsize {}\n", cmdsize));
335348
try!(write!(f, " ilocalsym {}\n", ilocalsym));
@@ -483,7 +496,10 @@ impl MachCommand {
483496
fn print_entry_point_command(&self, f: &mut fmt::Formatter) -> fmt::Result {
484497
let MachCommand(ref cmd, cmdsize) = *self;
485498

486-
if let &LoadCommand::EntryPoint { entryoff, stacksize } = cmd {
499+
if let &LoadCommand::EntryPoint {
500+
entryoff,
501+
stacksize,
502+
} = cmd {
487503
try!(write!(f, " cmd {}\n", cmd.name()));
488504
try!(write!(f, " cmdsize {}\n", cmdsize));
489505
try!(write!(f, " entryoff {}\n", entryoff));
@@ -734,9 +750,9 @@ impl OFile {
734750
debug!("parsed {} load commands", commands.len());
735751

736752
Ok(OFile::MachFile {
737-
header: header,
738-
commands: commands,
739-
})
753+
header: header,
754+
commands: commands,
755+
})
740756
}
741757

742758
fn parse_fat_file<O: ByteOrder, T: AsRef<[u8]>>(buf: &mut Cursor<T>) -> Result<OFile> {
@@ -782,9 +798,9 @@ impl OFile {
782798
}
783799

784800
Ok(OFile::FatFile {
785-
magic: magic,
786-
files: files,
787-
})
801+
magic: magic,
802+
files: files,
803+
})
788804
}
789805

790806
fn parse_ar_file<O: ByteOrder, T: AsRef<[u8]>>(buf: &mut Cursor<T>) -> Result<OFile> {
@@ -802,9 +818,9 @@ impl OFile {
802818

803819
for _ in 0..(ranlib_len / size_of::<RanLib>()) {
804820
ranlibs.push(RanLib {
805-
ran_strx: try!(buf.read_u32::<O>()),
806-
ran_off: try!(buf.read_u32::<O>()),
807-
})
821+
ran_strx: try!(buf.read_u32::<O>()),
822+
ran_off: try!(buf.read_u32::<O>()),
823+
})
808824
}
809825

810826
let toc_strsize = try!(buf.read_u32::<O>());
@@ -904,8 +920,10 @@ pub mod tests {
904920
($left:expr, $right:expr) => ({
905921
let mut w = Vec::new();
906922
let mut diffs = 0;
923+
let left = $left.replace("\r\n", "\n");
924+
let right = $right.replace("\r\n", "\n");
907925

908-
for diff in diff::lines($left, $right) {
926+
for diff in diff::lines(&left, &right) {
909927
match diff {
910928
diff::Result::Left(l) => {
911929
diffs += 1;
@@ -923,7 +941,7 @@ pub mod tests {
923941
info!("found {} diffs:\n{}", diffs, String::from_utf8(w).unwrap());
924942
}
925943

926-
assert_eq!($left, $right);
944+
assert_eq!(&left, &right);
927945
})
928946
}
929947

@@ -1012,8 +1030,8 @@ pub mod tests {
10121030
assert_eq!(files.len(), 2);
10131031

10141032
for (i, arch_dump) in [HELLO_UNIVERSAL_I386_LC, HELLO_UNIVERSAL_X86_64_LC]
1015-
.iter()
1016-
.enumerate() {
1033+
.iter()
1034+
.enumerate() {
10171035
let mut w = Vec::<u8>::new();
10181036

10191037
write!(w, "helloworld.universal:\n").unwrap();

0 commit comments

Comments
 (0)