From c4cd1e2c165c4f34ebf67fa9350f8732b2aeca13 Mon Sep 17 00:00:00 2001
From: Rory Dudley
Date: Tue, 4 Jun 2024 16:25:32 -0600
Subject: Updated the way built-in commands are called/used

Previously, built-in commands were fairly primitive, merely outputting
STDOUT and STDERR with the print! macros. However, we need them to
behave like normal programs, that is:

  - Acknowledge their verse's meter (forking, piping, etc.),
  - Ability to capture STDOUT and STDERR (>, 2>),
  - and Affect the currently running environment.

For these reasons, the anthology was reworked, and now contains the
Anthology struct, which mimics both std::process::{Child, Command}.

The AnthologyStdin helper struct was also created, for built-ins to
take input on STDIN, though no built-in is currently using it.

Each built-ins' incant functions were updated to return a
std::process::Output. It contains output from STDOUT, output from
STDERR, and the exit code of the "process".

A fix was also implemented for aliases, where the STDOUT and STDERR
vectors were not being copied to the newly constructed verse.
---
 src/poem/anthology/alias.rs | 56 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 13 deletions(-)

(limited to 'src/poem/anthology/alias.rs')

diff --git a/src/poem/anthology/alias.rs b/src/poem/anthology/alias.rs
index 45ee7f2..0746b59 100644
--- a/src/poem/anthology/alias.rs
+++ b/src/poem/anthology/alias.rs
@@ -1,6 +1,7 @@
-use crate::poem::Verse;
 use std::collections::BTreeMap;
 use std::collections::HashMap;
+use std::os::unix::process::ExitStatusExt;
+use std::process::{ExitStatus, Output};
 
 /// alias
 ///
@@ -11,8 +12,15 @@ use std::collections::HashMap;
 /// ```sh
 /// alias vim=nvim
 /// ```
-pub fn incant(verse: &Verse, out: &mut Vec<u8>, aliases: &mut HashMap<String, String>) -> i32 {
-    match verse.clause() {
+pub fn incant(
+    clause: &Option<Vec<String>>,
+    uout: bool,
+    aliases: &mut HashMap<String, String>,
+) -> Output {
+    let status = 0;
+    let mut out: Vec<u8> = Vec::new();
+    let err: Vec<u8> = Vec::new();
+    match clause {
         Some(clause) => {
             for stanza in clause {
                 let (key, val) = match stanza.split_once("=") {
@@ -24,7 +32,7 @@ pub fn incant(verse: &Verse, out: &mut Vec<u8>, aliases: &mut HashMap<String, St
         }
         None => {
             let mut lines = Vec::new();
-            let sorted: BTreeMap<_, _> = aliases.into_iter().collect();
+            let sorted: BTreeMap<_, _> = aliases.iter().collect();
             for (key, val) in sorted {
                 let line = if key.contains(' ') && val.contains(' ') {
                     format!("'{}'='{}'", key, val)
@@ -40,14 +48,19 @@ pub fn incant(verse: &Verse, out: &mut Vec<u8>, aliases: &mut HashMap<String, St
                 lines.push(line);
             }
 
-            if verse.couplet > 0 {
-                *out = format!("{}\n", lines.join("\n")).as_bytes().to_vec();
+            if uout {
+                out.append(&mut format!("{}\n", lines.join("\n")).as_bytes().to_vec());
             } else {
                 println!("{}", lines.join("\n"));
             }
         }
     }
-    0
+
+    Output {
+        status: ExitStatus::from_raw(status),
+        stdout: out,
+        stderr: err,
+    }
 }
 
 /// unalias
@@ -59,17 +72,34 @@ pub fn incant(verse: &Verse, out: &mut Vec<u8>, aliases: &mut HashMap<String, St
 /// ```sh
 /// unalias vim
 /// ```
-pub fn unincant(verse: &Verse, aliases: &mut HashMap<String, String>) -> i32 {
-    match verse.clause() {
+pub fn unincant(
+    clause: &Option<Vec<String>>,
+    uerr: bool,
+    aliases: &mut HashMap<String, String>,
+) -> Output {
+    let out: Vec<u8> = Vec::new();
+    let mut err: Vec<u8> = Vec::new();
+
+    let status = match clause {
         Some(clause) => {
             for stanza in clause {
-                aliases.remove(&stanza);
+                aliases.remove(stanza);
             }
+            0
         }
         None => {
-            eprintln!("unalias: not enough arguments");
-            return 1;
+            if uerr {
+                err.append(&mut "unalias: not enough arguments".as_bytes().to_vec());
+            } else {
+                eprintln!("unalias: not enough arguments");
+            }
+            1
         }
+    };
+
+    Output {
+        status: ExitStatus::from_raw(status),
+        stdout: out,
+        stderr: err,
     }
-    0
 }
-- 
cgit v1.2.3