Merge pull request #45 from sndyuk/invalid_pid_format

Ensure pid file ends with line separator
knsd · Feb 19, 2023 · 7e3a615 · 7e3a615
2 parents 6415684 + 8254e70
commit 7e3a615
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/daemonize-tests/tests/tests.rs b/daemonize-tests/tests/tests.rs
@@ -38,7 +38,9 @@ fn pid() {
         .pid_file(&path)
         .sleep(std::time::Duration::from_secs(5))
         .run();
-    let pid = std::fs::read_to_string(&path).unwrap().parse().unwrap();
+    let pid_content = std::fs::read_to_string(&path).unwrap();
+    assert!(pid_content.ends_with('\n'));
+    let pid = pid_content[..pid_content.len() - 1].parse().unwrap();
     assert_eq!(result.unwrap().pid, pid);
 
     let result = Tester::new().pid_file(&path).run();

diff --git a/daemonize/src/lib.rs b/daemonize/src/lib.rs
@@ -550,7 +550,7 @@ unsafe fn chown_pid_file(
 
 unsafe fn write_pid_file(fd: libc::c_int) -> Result<(), ErrorKind> {
     let pid = libc::getpid();
-    let pid_buf = format!("{}", pid).into_bytes();
+    let pid_buf = format!("{}\n", pid).into_bytes();
     let pid_length = pid_buf.len();
     let pid_c = CString::new(pid_buf).unwrap();
     check_err(libc::ftruncate(fd, 0), ErrorKind::TruncatePidfile)?;