Various additions and improvements

src/builtin/cd.rs

@@ -0,0 +1,29 @@
+use crate::{jobs::{ChildProc, JobBldr}, libsh::error::{ShErr, ShErrKind, ShResult}, parse::{execute::prepare_argv, NdRule, Node}, prelude::*, state::write_vars};
+
+pub fn cd(node: Node, job: &mut JobBldr) -> ShResult<()> {
+	let NdRule::Command { assignments: _, argv } = node.class else {
+		unreachable!()
+	};
+
+	let child_pgid = if let Some(pgid) = job.pgid() {
+		pgid
+	} else {
+		job.set_pgid(Pid::this());
+		Pid::this()
+	};
+	let child = ChildProc::new(Pid::this(), Some("cd"), Some(child_pgid))?;
+	job.push_child(child);
+
+	let argv = prepare_argv(argv);
+	let new_dir = if let Some((arg,_)) = argv.into_iter().skip(1).next() {
+		PathBuf::from(arg)
+	} else {
+		PathBuf::from(env::var("HOME").unwrap())
+	};
+
+	env::set_current_dir(new_dir).unwrap();
+	let new_dir = env::current_dir().unwrap();
+	env::set_var("PWD", new_dir);
+
+	Ok(())
+}

src/builtin/echo.rs

@@ -15,9 +15,7 @@ pub fn echo(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<(
 	let child = ChildProc::new(Pid::this(), Some("echo"), Some(child_pgid))?;
 	job.push_child(child);
 
-	for redir in node.redirs {
-		io_stack.push_to_frame(redir);
-	}
+	io_stack.append_to_frame(node.redirs);
 	let mut io_frame = io_stack.pop_frame();
 
 	io_frame.redirect()?;
@@ -26,6 +24,7 @@ pub fn echo(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<(
 
 	let mut echo_output = prepare_argv(argv)
 		.into_iter()
+		.map(|a| a.0) // Extract the String from the tuple of (String,Span)
 		.skip(1) // Skip 'echo'
 		.collect::<Vec<_>>()
 		.join(" ");

src/builtin/export.rs

@@ -0,0 +1,32 @@
+use crate::{jobs::{ChildProc, JobBldr}, libsh::error::{ShErr, ShErrKind, ShResult}, parse::{execute::prepare_argv, NdRule, Node}, prelude::*};
+
+pub fn export(node: Node, job: &mut JobBldr) -> ShResult<()> {
+	let NdRule::Command { assignments: _, argv } = node.class else {
+		unreachable!()
+	};
+
+	let child_pgid = if let Some(pgid) = job.pgid() {
+		pgid
+	} else {
+		job.set_pgid(Pid::this());
+		Pid::this()
+	};
+	let child = ChildProc::new(Pid::this(), Some("export"), Some(child_pgid))?;
+	job.push_child(child);
+
+	let argv = prepare_argv(argv);
+
+	for (arg,span) in argv {
+		let Some((var,val)) = arg.split_once('=') else {
+			return Err(
+				ShErr::full(
+					ShErrKind::ExecFail,
+					"Expected an assignment in export args",
+					span.into()
+				)
+			)
+		};
+		env::set_var(var, val);
+	}
+	Ok(())
+}

src/builtin/mod.rs

@@ -1,5 +1,15 @@
 pub mod echo;
+pub mod cd;
+pub mod export;
+pub mod pwd;
+pub mod source;
+pub mod shift;
 
-pub const BUILTINS: [&str;1] = [
-	"echo"
+pub const BUILTINS: [&str;6] = [
+	"echo",
+	"cd",
+	"export",
+	"pwd",
+	"source",
+	"shift"
 ];

src/builtin/pwd.rs

@@ -0,0 +1,30 @@
+use crate::{jobs::{ChildProc, JobBldr}, libsh::error::ShResult, parse::{NdRule, Node}, prelude::*, procio::{borrow_fd, IoStack}};
+
+pub fn pwd(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<()> {
+	let NdRule::Command { assignments, argv } = node.class else {
+		unreachable!()
+	};
+
+	let child_pgid = if let Some(pgid) = job.pgid() {
+		pgid
+	} else {
+		job.set_pgid(Pid::this());
+		Pid::this()
+	};
+	let child = ChildProc::new(Pid::this(), Some("pwd"), Some(child_pgid))?;
+	job.push_child(child);
+
+	io_stack.append_to_frame(node.redirs);
+	let mut io_frame = io_stack.pop_frame();
+
+	io_frame.redirect()?;
+
+	let stdout = borrow_fd(STDOUT_FILENO);
+
+	let mut curr_dir = env::current_dir().unwrap().to_str().unwrap().to_string();
+	curr_dir.push('\n');
+	write(stdout, curr_dir.as_bytes())?;
+	io_frame.restore().unwrap();
+
+	Ok(())
+}

src/builtin/shift.rs

@@ -0,0 +1,35 @@
+use crate::{jobs::{ChildProc, JobBldr}, libsh::error::{ErrSpan, ShErr, ShErrKind, ShResult}, parse::{execute::prepare_argv, NdRule, Node}, prelude::*, state::write_vars};
+
+pub fn shift(node: Node, job: &mut JobBldr) -> ShResult<()> {
+	let NdRule::Command { assignments: _, argv } = node.class else {
+		unreachable!()
+	};
+
+	let child_pgid = if let Some(pgid) = job.pgid() {
+		pgid
+	} else {
+		job.set_pgid(Pid::this());
+		Pid::this()
+	};
+	let child = ChildProc::new(Pid::this(), Some("shift"), Some(child_pgid))?;
+	job.push_child(child);
+
+	let mut argv = prepare_argv(argv).into_iter().skip(1);
+
+	if let Some((arg,span)) = argv.next() {
+		let Ok(count) = arg.parse::<usize>() else {
+			return Err(
+				ShErr::full(
+					ShErrKind::ExecFail,
+					"Expected a number in shift args",
+					span.into()
+				)
+			)
+		};
+		for _ in 0..count {
+			write_vars(|v| v.fpop_arg());
+		}
+	}
+
+	Ok(())
+}

src/builtin/source.rs

@@ -0,0 +1,43 @@
+use crate::{jobs::{ChildProc, JobBldr}, libsh::error::{ShErr, ShErrKind, ShResult}, parse::{execute::prepare_argv, NdRule, Node}, prelude::*, state::source_file};
+
+pub fn source(node: Node, job: &mut JobBldr) -> ShResult<()> {
+	let NdRule::Command { assignments: _, argv } = node.class else {
+		unreachable!()
+	};
+
+	let child_pgid = if let Some(pgid) = job.pgid() {
+		pgid
+	} else {
+		job.set_pgid(Pid::this());
+		Pid::this()
+	};
+	let child = ChildProc::new(Pid::this(), Some("source"), Some(child_pgid))?;
+	job.push_child(child);
+
+	let argv = prepare_argv(argv).into_iter().skip(1);
+
+	for (arg,span) in argv {
+		let path = PathBuf::from(arg);
+		if !path.exists() {
+			return Err(
+				ShErr::full(
+					ShErrKind::ExecFail,
+					"source: File not found",
+					span.into()
+				)
+			);
+		}
+		if !path.is_file() {
+			return Err(
+				ShErr::full(
+					ShErrKind::ExecFail,
+					"source: Given path is not a file",
+					span.into()
+				)
+			);
+		}
+		source_file(path)?;
+	}
+
+	Ok(())
+}