Merge pull request #158 from PeteJodo/master

Fixed most issues caused by libc being moved from std to it's own crate.

base64/base64.rs

@@ -14,6 +14,7 @@
 
 extern crate serialize;
 extern crate getopts;
+extern crate libc;
 #[phase(syntax, link)] extern crate log;
 
 use std::char;

basename/basename.rs

@@ -11,6 +11,7 @@
  */
 
 extern crate getopts;
+extern crate libc;
 
 use std::io::{print, println};
 use std::os;

common/c_types.rs

@@ -2,7 +2,7 @@
 
 extern crate getopts;
 
-use std::libc::{
+use libc::{
     c_char,
     c_int,
     uid_t,

common/util.rs

@@ -30,7 +30,7 @@ macro_rules! show_warning(
 macro_rules! crash(
     ($exitcode:expr, $($args:expr),+) => ({
         show_error!($exitcode, $($args),+);
-        unsafe { ::std::libc::exit($exitcode as ::std::libc::c_int); }
+        unsafe { ::libc::exit($exitcode as ::libc::c_int); }
     })
 )
 
@@ -38,7 +38,7 @@ macro_rules! crash(
 #[macro_export]
 macro_rules! exit(
     ($exitcode:expr) => ({
-        unsafe { ::std::libc::exit($exitcode); }
+        unsafe { ::libc::exit($exitcode); }
     })
 )
 

common/utmpx.rs

@@ -4,7 +4,7 @@
 pub use self::utmpx::{DEFAULT_FILE,USER_PROCESS,BOOT_TIME,c_utmp};
 #[cfg(target_os = "linux")]
 mod utmpx {
-    use std::libc;
+    use libc;
 
     pub static DEFAULT_FILE: &'static str = "/var/run/utmp";
 
@@ -48,7 +48,7 @@ mod utmpx {
 
 #[cfg(target_os = "macos")]
 mod utmpx {
-    use std::libc;
+    use libc;
 
     pub static DEFAULT_FILE: &'static str = "/var/run/utmpx";
 

du/du.rs

@@ -13,6 +13,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 extern crate sync;
 extern crate time;
 

echo/echo.rs

@@ -11,6 +11,7 @@
  */
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::{print, println};

fold/fold.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::io;
 use std::io::fs::File;

groups/groups.rs

@@ -11,6 +11,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use getopts::{

hostid/hostid.rs

@@ -15,6 +15,7 @@
 extern crate getopts;
 extern crate collections;
 extern crate serialize;
+extern crate libc;
 
 
 #[phase(syntax, link)] extern crate log;
@@ -27,7 +28,7 @@ use getopts::{
     usage,
 };
 
-use std::libc::{c_long};
+use libc::{c_long};
 
 #[path = "../common/util.rs"]
 mod util;

hostname/hostname.rs

@@ -13,8 +13,9 @@
  */
 
 extern crate getopts;
+extern crate libc;
 
-use std::{os,libc,str};
+use std::{os,str};
 use getopts::{optflag, getopts, usage};
 
 extern {

kill/kill.rs

@@ -13,6 +13,7 @@
 
 
 extern crate getopts;
+extern crate libc;
 extern crate collections;
 extern crate serialize;
 

logname/logname.rs

@@ -16,11 +16,12 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::io::{print, println};
 use std::os;
 use std::str;
-use std::libc;
+use libc::c_char;
 
 #[path = "../common/util.rs"] mod util;
 

mkdir/mkdir.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::fs;

paste/paste.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::io;
 use std::os;

printenv/printenv.rs

@@ -14,6 +14,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::print;

pwd/pwd.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::print;

rm/rm.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::{print, stdin, stdio, fs, BufferedReader};

rmdir/rmdir.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::{print, fs};

seq/seq.rs

@@ -6,6 +6,7 @@
 // TODO: Support -f flag
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 

sleep/sleep.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::num;
 use std::cast;

tac/tac.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::io;
 use std::os;

truncate/truncate.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::io::{File, Open, ReadWrite, fs};
 use std::os;

tty/tty.rs

@@ -17,8 +17,9 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
-use std::{libc,str,os};
+use std::{str,os};
 use std::io::println;
 use std::io::stdio::stderr;
 use getopts::{optflag,getopts};

uname/uname.rs

@@ -15,6 +15,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::mem::uninit;

wc/wc.rs

@@ -12,6 +12,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::str::from_utf8;

yes/yes.rs

@@ -14,6 +14,7 @@
 #![feature(macro_rules)]
 
 extern crate getopts;
+extern crate libc;
 
 use std::os;
 use std::io::{print, println};