chore: code reorganization, changes should be fully backwards compatible

Author: xadaemon

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daemonize-me"
-version = "2.0.1"
+version = "2.0.2"
 authors = ["Matheus Xavier <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause/Apache-2.0"

ffi.rs

@@ -230,6 +230,7 @@ impl<'a> Daemon<'a> {
             None => return Err(DaemonError::InvalidUmaskBits),
         };
         umask(umask_mode);
+
         // Set the sid so the process isn't session orphan
         if let Err(_) = setsid() {
             return Err(DaemonError::SetSid);
@@ -238,6 +239,7 @@ impl<'a> Daemon<'a> {
             return Err(DaemonError::ChDir);
         };
         pid = getpid();
+
         // create pid file and if configured to, chmod it
         if has_pid_file {
             // chmod of the pid file is deferred to after checking for the presence of the user and group
@@ -251,6 +253,7 @@ impl<'a> Daemon<'a> {
                 Err(_) => return Err(DaemonError::WritePid),
             };
         }
+
         // Drop privileges and chown the requested files
         if self.user.is_some() && self.group.is_some() {
             let user = match self.user {

src/daemon.rs

@@ -0,0 +1,51 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum DaemonError {
+    #[error("This feature is unavailable, or not implemented for your target os")]
+    UnsupportedOnOS,
+    #[error("Unable to fork")]
+    Fork,
+    #[error("Failed to chdir")]
+    ChDir,
+    #[error("Failed to open dev null")]
+    OpenDevNull,
+    #[error("Failed to close the file pointer of a stdio stream")]
+    CloseFp,
+    #[error("Invalid or nonexistent user")]
+    InvalidUser,
+    #[error("Invalid or nonexistent group")]
+    InvalidGroup,
+    #[error("Either group or user was specified but not the other")]
+    InvalidUserGroupPair,
+    #[error("The specified cstr is invalid")]
+    InvalidCstr,
+    #[error("Failed to execute initgroups")]
+    InitGroups,
+    #[error("Failed to set uid")]
+    SetUid,
+    #[error("Failed to set gid")]
+    SetGid,
+    #[error("Failed to chown the pid file")]
+    ChownPid,
+    #[error("Failed to create the pid file")]
+    OpenPid,
+    #[error("Failed to write to the pid file")]
+    WritePid,
+    #[error("Failed to redirect the standard streams")]
+    RedirectStream,
+    #[error("Umask bits are invalid")]
+    InvalidUmaskBits,
+    #[error("Failed to set sid")]
+    SetSid,
+    #[error("Failed to get groups record")]
+    GetGrRecord,
+    #[error("Failed to get passwd record")]
+    GetPasswdRecord,
+    #[error("Failed to set proc name")]
+    SetProcName,
+    #[error("Failed to set proc name")]
+    InvalidProcName,
+}
+
+pub type Result<T> = std::result::Result<T, DaemonError>;

src/errors.rs

@@ -6,70 +6,19 @@
 #![deny(clippy::needless_pass_by_value)]
 #![deny(clippy::trivially_copy_pass_by_ref)]
 
-
 extern crate libc;
 extern crate nix;
 
-use thiserror::Error;
-
 mod stdio;
 
-mod group;
-mod user;
 mod daemon;
 mod ffi;
+mod group;
+mod user;
 
+mod errors;
+
+pub use crate::daemon::Daemon;
+pub use crate::errors::{DaemonError, Result};
 pub use crate::group::Group;
 pub use crate::user::User;
-pub use crate::daemon::Daemon;
-
-
-#[derive(Error, Debug)]
-pub enum DaemonError {
-    #[error("This feature is unavailable, or not implemented for your target os")]
-    UnsupportedOnOS,
-    #[error("Unable to fork")]
-    Fork,
-    #[error("Failed to chdir")]
-    ChDir,
-    #[error("Failed to open dev null")]
-    OpenDevNull,
-    #[error("Failed to close the file pointer of a stdio stream")]
-    CloseFp,
-    #[error("Invalid or nonexistent user")]
-    InvalidUser,
-    #[error("Invalid or nonexistent group")]
-    InvalidGroup,
-    #[error("Either group or user was specified but not the other")]
-    InvalidUserGroupPair,
-    #[error("The specified cstr is invalid")]
-    InvalidCstr,
-    #[error("Failed to execute initgroups")]
-    InitGroups,
-    #[error("Failed to set uid")]
-    SetUid,
-    #[error("Failed to set gid")]
-    SetGid,
-    #[error("Failed to chown the pid file")]
-    ChownPid,
-    #[error("Failed to create the pid file")]
-    OpenPid,
-    #[error("Failed to write to the pid file")]
-    WritePid,
-    #[error("Failed to redirect the standard streams")]
-    RedirectStream,
-    #[error("Umask bits are invalid")]
-    InvalidUmaskBits,
-    #[error("Failed to set sid")]
-    SetSid,
-    #[error("Failed to get groups record")]
-    GetGrRecord,
-    #[error("Failed to get passwd record")]
-    GetPasswdRecord,
-    #[error("Failed to set proc name")]
-    SetProcName,
-    #[error("Failed to set proc name")]
-    InvalidProcName,
-}
-
-pub type Result<T> = std::result::Result<T, DaemonError>;