Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

Use errno from the standard library #1

Merged
merged 2 commits into from
Feb 28, 2018
Merged

Use errno from the standard library #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7226f46
Use errno from the standard library
tomaka Feb 16, 2018
d28093a
Fix concerns
tomaka Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions src/ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,6 @@ extern {
pub fn flock(fd: libc::c_int, operation: libc::c_int) -> libc::c_int;
}

#[cfg(target_os = "linux")]
unsafe fn errno_location() -> *const libc::c_int {
extern { fn __errno_location() -> *const libc::c_int; }
__errno_location()
}


#[cfg(target_os = "openbsd")]
unsafe fn errno_location() -> *const libc::c_int {
extern { fn __errno() -> *const libc::c_int; }
__errno()
}

#[cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))]
unsafe fn errno_location() -> *const libc::c_int {
extern { fn __error() -> *const libc::c_int; }
__error()
}

pub unsafe fn errno() -> libc::c_int {
*errno_location()
}

pub unsafe fn get_gid_by_name(name: &CString) -> Option<libc::gid_t> {
let ptr = getgrnam(name.as_ptr() as *const libc::c_char);
if ptr.is_null() {
Expand Down
12 changes: 9 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ mod ffi;
extern crate libc;

use std::fmt;
use std::io;
use std::env::{set_current_dir};
use std::ffi::{CString};
use std::os::unix::ffi::OsStringExt;
Expand All @@ -53,9 +54,9 @@ use std::path::{Path, PathBuf};
use std::process::{exit};

pub use libc::{uid_t, gid_t, mode_t};
use libc::{LOCK_EX, LOCK_NB, c_int, fopen, write, close, fileno, fork, getpid, setsid, setuid, setgid, dup2, umask};
use libc::{LOCK_EX, LOCK_NB, fopen, write, close, fileno, fork, getpid, setsid, setuid, setgid, dup2, umask};

use self::ffi::{errno, flock, get_gid_by_name, get_uid_by_name};
use self::ffi::{flock, get_gid_by_name, get_uid_by_name};

macro_rules! tryret {
($expr:expr, $ret:expr, $err:expr) => (
Expand All @@ -67,7 +68,7 @@ macro_rules! tryret {
)
}

pub type Errno = c_int;
pub type Errno = i32;

/// This error type for `Daemonize` `start` method.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
Expand Down Expand Up @@ -110,6 +111,11 @@ pub enum DaemonizeError {
__Nonexhaustive,
}

fn errno() -> Errno {
io::Error::last_os_error().raw_os_error()
.expect("last_os_error produces only OS errors hence raw_os_error cannot be None")
}

impl DaemonizeError {
fn __description(&self) -> &str {
match *self {
Expand Down