Remove unnecessary slash

This commit is contained in:
Jeremy Soller 2016-09-26 17:39:58 -06:00
parent a31877e990
commit a4df5185d2
3 changed files with 5 additions and 5 deletions

View file

@ -11,7 +11,7 @@ pub struct Ahci;
impl Ahci { impl Ahci {
pub fn disks(base: usize, irq: u8) -> Vec<AhciDisk> { pub fn disks(base: usize, irq: u8) -> Vec<AhciDisk> {
println!(" + AHCI on: {:X} IRQ: {:X}", base as usize, irq); println!(" + AHCI on: {:X} IRQ: {}", base as usize, irq);
let pi = unsafe { &mut *(base as *mut HbaMem) }.pi.read(); let pi = unsafe { &mut *(base as *mut HbaMem) }.pi.read();
let ret: Vec<AhciDisk> = (0..32) let ret: Vec<AhciDisk> = (0..32)

View file

@ -129,7 +129,7 @@ pub fn cpu_id() -> usize {
} }
pub extern fn userspace_init() { pub extern fn userspace_init() {
assert_eq!(syscall::chdir(b"initfs:bin/"), Ok(0)); assert_eq!(syscall::chdir(b"initfs:bin"), Ok(0));
assert_eq!(syscall::open(b"debug:", 0), Ok(0)); assert_eq!(syscall::open(b"debug:", 0), Ok(0));
assert_eq!(syscall::open(b"debug:", 0), Ok(1)); assert_eq!(syscall::open(b"debug:", 0), Ok(1));

View file

@ -27,8 +27,8 @@ pub fn main() {
} }
command.env("HOME", "initfs:"); command.env("HOME", "initfs:");
command.env("PWD", "initfs:bin/"); command.env("PWD", "initfs:bin");
command.env("PATH", "initfs:bin/"); command.env("PATH", "initfs:bin");
command.env("COLUMNS", "80"); command.env("COLUMNS", "80");
command.env("LINES", "30"); command.env("LINES", "30");
command.env("TTY", &tty); command.env("TTY", &tty);