Adapt some commands into WASI

syrusakbary · syrusakbary · commit b76e18d1eae1 · 2019-10-01T23:24:13.000-07:00
diff --git a/src/cat/cat.rs b/src/cat/cat.rs
@@ -21,6 +21,8 @@ extern crate uucore;
 use quick_error::ResultExt;
 use std::fs::{metadata, File};
 use std::io::{self, stderr, stdin, stdout, BufWriter, Read, Write};
+
+#[cfg(not(target_os = "wasi"))]
 use uucore::fs::is_stdin_interactive;
 
 /// Unix domain socket support
@@ -36,6 +38,12 @@ static SUMMARY: &str = "Concatenate FILE(s), or standard input, to standard outp
  With no FILE, or when FILE is -, read standard input.";
 static LONG_HELP: &str = "";
 
+
+#[cfg(target_os = "wasi")]
+fn is_stdin_interactive() -> bool {
+    true
+}
+
 #[derive(PartialEq)]
 enum NumberingMode {
     NumberNone,
diff --git a/src/ls/ls.rs b/src/ls/ls.rs
@@ -206,11 +206,12 @@ fn list(options: getopts::Matches) {
     }
 }
 
-#[cfg(any(unix, target_os = "redox"))]
+#[cfg(any(unix, target_os = "redox", target_os = "wasi"))]
 fn sort_entries(entries: &mut Vec<PathBuf>, options: &getopts::Matches) {
     let mut reverse = options.opt_present("r");
     if options.opt_present("t") {
         if options.opt_present("c") {
+            #[cfg(not(target_os = "wasi"))]
             entries.sort_by_key(|k| {
                 Reverse(get_metadata(k, options).map(|md| md.ctime()).unwrap_or(0))
             });
@@ -225,6 +226,7 @@ fn sort_entries(entries: &mut Vec<PathBuf>, options: &getopts::Matches) {
             });
         }
     } else if options.opt_present("S") {
+        #[cfg(not(target_os = "wasi"))]
         entries.sort_by_key(|k| get_metadata(k, options).map(|md| md.size()).unwrap_or(0));
         reverse = !reverse;
     } else if !options.opt_present("U") {
@@ -368,19 +370,22 @@ fn display_items(items: &Vec<PathBuf>, strip: Option<&Path>, options: &getopts::
                     }
                 });
 
-            if let Some(size) = termsize::get() {
-                let mut grid = Grid::new(GridOptions {
-                    filling: Filling::Spaces(2),
-                    direction: Direction::TopToBottom,
-                });
+            #[cfg(not(target_os = "wasi"))]
+            {
+                if let Some(size) = termsize::get() {
+                    let mut grid = Grid::new(GridOptions {
+                        filling: Filling::Spaces(2),
+                        direction: Direction::TopToBottom,
+                    });
 
-                for name in names {
-                    grid.add(name);
-                }
+                    for name in names {
+                        grid.add(name);
+                    }
 
-                if let Some(output) = grid.fit_into_width(size.cols as usize) {
-                    print!("{}", output);
-                    return;
+                    if let Some(output) = grid.fit_into_width(size.cols as usize) {
+                        print!("{}", output);
+                        return;
+                    }
                 }
             }
         }
diff --git a/src/mkdir/mkdir.rs b/src/mkdir/mkdir.rs
@@ -140,7 +140,7 @@ fn mkdir(path: &Path, recursive: bool, mode: u16, verbose: bool) -> i32 {
         }
         0
     }
-    #[cfg(windows)]
+    #[cfg(any(windows, target_os = "wasi"))]
     #[allow(unused_variables)]
     fn chmod(path: &Path, mode: u16) -> i32 {
         // chmod on Windows only sets the readonly flag, which isn't even honored on directories
diff --git a/src/pwd/pwd.rs b/src/pwd/pwd.rs
@@ -66,7 +66,13 @@ Print the full filename of the current working directory.",
     } else if matches.opt_present("version") {
         println!("{} {}", NAME, VERSION);
     } else {
-        match env::current_dir() {
+        #[cfg(target_os = "wasi")]
+        let current_dir = env::var("PWD").map(|dir| PathBuf::from(dir));
+
+        #[cfg(not(target_os = "wasi"))]
+        let current_dir = env::current_dir();
+
+        match current_dir {
             Ok(logical_path) => {
                 if matches.opt_present("logical") {
                     println!("{}", logical_path.display());
diff --git a/src/uutils/uutils.rs b/src/uutils/uutils.rs
@@ -44,8 +44,11 @@ fn main() {
     // try binary name as util name.
     let args0 = args[0].clone();
     let binary = Path::new(&args0[..]);
-    let binary_as_util = binary.file_stem().unwrap().to_str().unwrap();
+    let mut binary_as_util = binary.file_stem().unwrap().to_str().unwrap();
 
+    if binary_as_util.starts_with("\"wapm run ") {
+        binary_as_util = &binary_as_util[10..binary_as_util.len()-1];
+    }
     if let Some(&uumain) = umap.get(binary_as_util) {
         std::process::exit(uumain(args));
     }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ fn mkdir(path: &Path, recursive: bool, mode: u16, verbose: bool) -> i32 {`
`140`	`140`	`}`
`141`	`141`	`0`
`142`	`142`	`}`
`143`		`- #[cfg(windows)]`
	`143`	`+ #[cfg(any(windows, target_os = "wasi"))]`
`144`	`144`	`#[allow(unused_variables)]`
`145`	`145`	`fn chmod(path: &Path, mode: u16) -> i32 {`
`146`	`146`	`// chmod on Windows only sets the readonly flag, which isn't even honored on directories`