From 632b20f2e29658909a5403a3865d63cb681cf761 Mon Sep 17 00:00:00 2001
From: Andrea Coronese <sixpounder@protonmail.com>
Date: Thu, 14 Mar 2024 18:04:31 +0100
Subject: [PATCH] No daemon mode

- Move arg parsing on top of main function
- Add support for --no-daemon argument
- Fork the process only if --no-daemon was not passed (so forking is
  still the default)
---
 src/main.rs | 62 +++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 4c01b88..3a574db 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -68,13 +68,41 @@ pub fn icon_cache_get(name: &'static str, size: u16) -> widget::icon::Icon {
 /// Runs application with these settings
 #[rustfmt::skip]
 fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let mut shell_program_opt = None;
+    let mut shell_args = Vec::new();
+    let mut parse_flags = true;
+    let mut daemonize = true;
+    for arg in env::args().skip(1) {
+        if parse_flags {
+            match arg.as_str() {
+                // These flags indicate the end of parsing flags
+                "-e" | "--command" | "--" => {
+                    parse_flags = false;
+                }
+                "--no-daemon" => {
+                    daemonize = false;
+                }
+                _ => {
+                    //TODO: should this throw an error?
+                    log::warn!("ignored argument {:?}", arg);
+                }
+            }
+        } else if shell_program_opt.is_none() {
+            shell_program_opt = Some(arg);
+        } else {
+            shell_args.push(arg);
+        }
+    }
+    
     #[cfg(all(unix, not(target_os = "redox")))]
-    match fork::daemon(true, true) {
-        Ok(fork::Fork::Child) => (),
-        Ok(fork::Fork::Parent(_child_pid)) => process::exit(0),
-        Err(err) => {
-            eprintln!("failed to daemonize: {:?}", err);
-            process::exit(1);
+    if daemonize {
+        match fork::daemon(true, true) {
+            Ok(fork::Fork::Child) => (),
+            Ok(fork::Fork::Parent(_child_pid)) => process::exit(0),
+            Err(err) => {
+                eprintln!("failed to daemonize: {:?}", err);
+                process::exit(1);
+            }
         }
     }
 
@@ -99,28 +127,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     };
 
-    let mut shell_program_opt = None;
-    let mut shell_args = Vec::new();
-    let mut parse_flags = true;
-    for arg in env::args().skip(1) {
-        if parse_flags {
-            match arg.as_str() {
-                // These flags indicate the end of parsing flags
-                "-e" | "--command" | "--" => {
-                    parse_flags = false;
-                }
-                _ => {
-                    //TODO: should this throw an error?
-                    log::warn!("ignored argument {:?}", arg);
-                }
-            }
-        } else if shell_program_opt.is_none() {
-            shell_program_opt = Some(arg);
-        } else {
-            shell_args.push(arg);
-        }
-    }
-
     let startup_options = if let Some(shell_program) = shell_program_opt {
         let options = tty::Options {
             shell: Some(tty::Shell::new(shell_program, shell_args)),