auto merge of #8298 : darkf/rust/fix-3948, r=pcwalton

bors · bors · commit 29099e450a91 · 2013-08-05T13:49:55.000-07:00
diff --git a/src/libstd/io.rs b/src/libstd/io.rs
@@ -1041,7 +1041,7 @@ pub fn stdin() -> @Reader {
 
 pub fn file_reader(path: &Path) -> Result<@Reader, ~str> {
     let f = do path.to_str().as_c_str |pathbuf| {
-        do "r".as_c_str |modebuf| {
+        do "rb".as_c_str |modebuf| {
             unsafe { libc::fopen(pathbuf, modebuf as *libc::c_char) }
         }
     };

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ pub fn stdin() -> @Reader {`
`1041`	`1041`
`1042`	`1042`	`pub fn file_reader(path: &Path) -> Result<@Reader, ~str> {`
`1043`	`1043`	`let f = do path.to_str().as_c_str \|pathbuf\| {`
`1044`		`- do "r".as_c_str \|modebuf\| {`
	`1044`	`+ do "rb".as_c_str \|modebuf\| {`
`1045`	`1045`	`unsafe { libc::fopen(pathbuf, modebuf as *libc::c_char) }`
`1046`	`1046`	`}`
`1047`	`1047`	`};`