Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix android logging since the rustup

Browse source
This commit is contained in:
Glenn Watson 2015-05-18 08:23:07 +10:00
parent 0f1f71b56f
commit b38557a7f0
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/servo/main.rs
View file

@ -191,6 +191,7 @@ mod android {
use util::task::spawn_named; use util::task::spawn_named;
use std::ffi::CString; use std::ffi::CString;
use std::str::from_utf8; use std::str::from_utf8;
use std::ffi::CStr;
unsafe { unsafe {
let mut pipes: [c_int; 2] = [ 0, 0 ]; let mut pipes: [c_int; 2] = [ 0, 0 ];
@ -199,16 +200,14 @@ mod android {
let mode = CString::new("r").unwrap(); let mode = CString::new("r").unwrap();
let input_file = FilePtr(fdopen(pipes[0], mode.as_ptr())); let input_file = FilePtr(fdopen(pipes[0], mode.as_ptr()));
spawn_named("android-logger".to_owned(), move || { spawn_named("android-logger".to_owned(), move || {
static READ_SIZE: usize = 1024;
let mut read_buffer = vec![0; READ_SIZE];
let FilePtr(input_file) = input_file;
loop { loop {
let mut read_buffer: Vec<u8> = vec!(); fgets(read_buffer.as_mut_ptr(), (read_buffer.len() as i32)-1, input_file);
read_buffer.reserve(1024); let c_str = CStr::from_ptr(read_buffer.as_ptr());
let FilePtr(input_file) = input_file; let slice = from_utf8(c_str.to_bytes()).unwrap();
fgets(read_buffer.as_mut_ptr() as *mut i8, read_buffer.len() as i32, input_file); android_glue::write_log(slice);
let cs = CString::new(read_buffer).unwrap();
match from_utf8(cs.as_bytes()) {
Ok(s) => android_glue::write_log(s),
_ => {}
}
} }
}); });
} }