fixup all

Signed-off-by: tison <[email protected]>

Author: tisonkun

src/lib.rs

@@ -200,7 +200,7 @@ feature! {
     pub mod spawn;
 }
 
-#[cfg(any(target_os = "macos"))]
+#[cfg(target_os = "macos")]
 feature! {
     #![feature = "syslog"]
     pub mod syslog;

src/syslog.rs

@@ -23,10 +23,18 @@ pub fn openlog<P: NixPath + ?Sized>(
 ///
 /// The message is then written to the system console, log files, logged-in users, or forwarded
 /// to other machines as appropriate.
-pub fn syslog<S: AsRef<OsStr> + ?Sized>(priority: Priority, message: &S) {
+pub fn syslog<S: AsRef<OsStr> + ?Sized>(
+    priority: Priority,
+    message: &S,
+) -> Result<()> {
     let formatter = OsStr::new("%s");
     let message = OsStr::new(message);
-    unsafe { libc::syslog(priority.0, formatter.as_ptr(), message.as_ptr()) }
+    formatter.with_nix_path(|formatter| {
+        message.with_nix_path(|message| unsafe {
+            libc::syslog(priority.0, formatter.as_ptr(), message.as_ptr())
+        })
+    })??;
+    Ok(())
 }
 
 /// The priority for a log message.
@@ -48,6 +56,7 @@ impl Priority {
 }
 
 libc_bitflags! {
+    /// Options for system logging.
     pub struct LogFlags: libc::c_int {
         /// Log the process id with each message: useful for identifying instantiations of
         /// daemons.

test/test.rs

@@ -42,7 +42,7 @@ mod test_sendfile;
 ))]
 mod test_spawn;
 
-#[cfg(any(target_os = "macos"))]
+#[cfg(target_os = "macos")]
 mod test_syslog;
 
 mod test_time;

test/test_syslog.rs

@@ -1,11 +1,9 @@
-use nix::syslog::Priority;
+use nix::syslog::{openlog, syslog, Facility, LogFlags, Priority, Severity};
 
-#[cfg(target_os = "macos")]
 #[test]
 fn test_syslog_hello_world() {
-    use nix::syslog::{openlog, syslog, Facility, LogFlags, Severity};
-
     let name = "test_syslog_hello_world";
+    let priority = Priority::from_severity(Severity::LOG_EMERG);
     openlog(name, LogFlags::LOG_PID, Facility::LOG_USER).unwrap();
-    syslog(Priority::from_severity(Severity::LOG_EMERG), "Hello, nix!");
+    syslog(priority, "Hello, nix!").unwrap();
 }