Merge branch 'master' into master

dlopen2/src/raw/common.rs

@@ -69,7 +69,41 @@ impl Library {
         S: AsRef<OsStr>,
     {
         Ok(Self {
-            handle: unsafe { open_lib(name.as_ref()) }?,
+            handle: unsafe { open_lib(name.as_ref(), None) }?,
+        })
+    }
+
+    /**
+    Open a dynamic library with flags
+
+    **Note:** different platforms search for libraries in different directories.
+    Therefore this function cannot be 100% platform independent.
+    However it seems that all platforms support the full path and
+    searching in default os directories if you provide only the file name.
+    Please refer to your operating system guide for precise information about the directories
+    where the operating system searches for dynamic link libraries.
+
+    Currently, flags only impact loading of libraries on unix-like platforms.
+
+    # Example
+
+    ```no_run
+    use dlopen2::raw::Library;
+
+    fn main() {
+        //use full path
+        let lib = Library::open_with_flags("/lib/i386-linux-gnu/libm.so.6", None).unwrap();
+        //use only file name
+        let lib = Library::open("libm.so.6").unwrap();
+    }
+    ```
+     */
+    pub fn open_with_flags<S>(name: S, flags: Option<i32>) -> Result<Library, Error>
+        where
+            S: AsRef<OsStr>,
+    {
+        Ok(Self {
+            handle: unsafe { open_lib(name.as_ref(), flags) }?,
         })
     }
 

dlopen2/src/raw/tests.rs

@@ -24,7 +24,7 @@ const_cstr! {NOT_EXISTING_SYM = "notexisting";}
 #[test]
 fn load_get_close() {
     unsafe {
-        let handle = open_lib(EXISTING_LIB.as_ref()).expect("Could not open library");
+        let handle = open_lib(EXISTING_LIB.as_ref(), None).expect("Could not open library");
         let sym = get_sym(handle, EXISTING_SYM.as_cstr()).expect("Could not get symbol");
         assert!(!sym.is_null());
         assert!(close_lib(handle).is_null());
@@ -34,7 +34,7 @@ fn load_get_close() {
 #[test]
 fn open_err() {
     unsafe {
-        match open_lib(NOT_EXISTING_LIB.as_ref()) {
+        match open_lib(NOT_EXISTING_LIB.as_ref(), None) {
             Ok(_) => panic!("Library should not get opened"),
             Err(err) => match err {
                 Error::OpeningLibraryError(_) => (),
@@ -47,7 +47,7 @@ fn open_err() {
 #[test]
 fn get_err() {
     unsafe {
-        let handle = open_lib(EXISTING_LIB.as_ref()).expect("Could not open library");
+        let handle = open_lib(EXISTING_LIB.as_ref(), None).expect("Could not open library");
         match get_sym(handle, NOT_EXISTING_SYM.as_cstr()) {
             Ok(_) => panic!("Should not get the symbol"),
             Err(err) => match err {

dlopen2/src/raw/unix.rs

@@ -64,7 +64,7 @@ pub unsafe fn open_self() -> Result<Handle, Error> {
 }
 
 #[inline]
-pub unsafe fn open_lib(name: &OsStr) -> Result<Handle, Error> {
+pub unsafe fn open_lib(name: &OsStr, flags: Option<i32>) -> Result<Handle, Error> {
     let mut v: Vec<u8> = Vec::new();
     //as_bytes i a unix-specific extension
     let cstr = if !name.is_empty() && name.as_bytes()[name.len() - 1] == 0 {
@@ -77,7 +77,7 @@ pub unsafe fn open_lib(name: &OsStr) -> Result<Handle, Error> {
         CStr::from_bytes_with_nul_unchecked(v.as_slice())
     };
     let _lock = lock_dlerror_mutex();
-    let handle = dlopen(cstr.as_ptr(), DEFAULT_FLAGS);
+    let handle = dlopen(cstr.as_ptr(), flags.unwrap_or(DEFAULT_FLAGS));
     if handle.is_null() {
         Err(Error::OpeningLibraryError(IoError::new(
             ErrorKind::Other,

dlopen2/src/raw/windows.rs

@@ -154,7 +154,7 @@ pub unsafe fn open_self() -> Result<Handle, Error> {
 }
 
 #[inline]
-pub unsafe fn open_lib(name: &OsStr) -> Result<Handle, Error> {
+pub unsafe fn open_lib(name: &OsStr, _flags: Option<i32>) -> Result<Handle, Error> {
     let wide_name: Vec<u16> = name.encode_wide().chain(Some(0)).collect();
     let _guard = match ErrorModeGuard::new() {
         Ok(val) => val,

dlopen2/src/wrapper/container.rs

@@ -58,7 +58,7 @@ impl<T> Container<T>
 where
     T: WrapperApi,
 {
-    ///Open the library using provided file name or path and load all symbols.
+    /// Open the library using provided file name or path and load all symbols.
     pub unsafe fn load<S>(name: S) -> Result<Container<T>, Error>
     where
         S: AsRef<OsStr>,
@@ -67,7 +67,7 @@ where
         let api = T::load(&lib)?;
         Ok(Self { lib, api })
     }
-    ///Load all symbols from the program itself.
+    /// Load all symbols from the program itself.
     ///
     /// This allows a shared library to load symbols of the program it was
     /// loaded into.
@@ -77,14 +77,22 @@ where
         Ok(Self { lib, api })
     }
 
-    /**
-    Returns the raw OS handle for the opened library.
-
-    This is `HMODULE` on Windows and `*mut c_void` on Unix systems. Don't use unless absolutely necessary.
-    */
+    /// Returns the raw OS handle for the opened library.
+    /// 
+    /// This is `HMODULE` on Windows and `*mut c_void` on Unix systems. Don't use unless absolutely necessary.
     pub unsafe fn into_raw(&self) -> raw::Handle {
         self.lib.into_raw()
     }
+
+    /// Same as load(), except specify flags used by libc::dlopen
+    pub unsafe fn load_with_flags<S>(name: S, flags: Option<i32>) -> Result<Container<T>, Error>
+    where
+        S: AsRef<OsStr>,
+    {
+        let lib = Library::open_with_flags(name, flags)?;
+        let api = T::load(&lib)?;
+        Ok(Self { lib, api })
+    }
 }
 
 impl<T> Deref for Container<T>

dlopen2/src/wrapper/optional.rs

@@ -78,6 +78,18 @@ where
         Ok(Self { lib, api, optional })
     }
 
+    ///Opens the library using provided file name or path and flags, and loads all symbols (including optional
+    ///if it is possible).
+    pub unsafe fn load_with_flags<S>(name: S, flags: Option<i32>) -> Result<OptionalContainer<Api, Optional>, Error>
+        where
+            S: AsRef<OsStr>,
+    {
+        let lib = Library::open_with_flags(name, flags)?;
+        let api = Api::load(&lib)?;
+        let optional = Optional::load(&lib).ok();
+        Ok(Self { lib, api, optional })
+    }
+
     ///Load all symbols (including optional if it is possible) from the
     ///program itself.
     ///