Push init into libgit2-sys

Author: alexcrichton

libgit2-sys/Cargo.toml

@@ -16,7 +16,7 @@ path = "lib.rs"
 [dependencies]
 curl-sys = { version = "0.3", optional = true }
 libc = "0.2"
-libssh2-sys = { version = "0.2", optional = true }
+libssh2-sys = { version = "0.2.4", optional = true }
 libz-sys = ">= 0"
 
 [build-dependencies]

libgit2-sys/lib.rs

@@ -1334,9 +1334,6 @@ git_enum! {
 pub type git_packbuilder_foreach_cb = extern fn(*const c_void, size_t,
                                                 *mut c_void) -> c_int;
 
-#[doc(hidden)]
-pub fn openssl_init() {}
-
 extern {
     // threads
     pub fn git_libgit2_init() -> c_int;
@@ -2524,7 +2521,37 @@ extern {
     pub fn git_packbuilder_free(pb: *mut git_packbuilder);
 }
 
-#[test]
-fn smoke() {
-    unsafe { git_threads_init(); }
+pub fn init() {
+    use std::sync::{Once, ONCE_INIT};
+
+    static INIT: Once = ONCE_INIT;
+    INIT.call_once(|| unsafe {
+        openssl_init();
+        ssh_init();
+        let r = git_libgit2_init();
+        assert!(r >= 0,
+                "couldn't initialize the libgit2 library: {}", r);
+        assert_eq!(libc::atexit(shutdown), 0);
+    });
+    extern fn shutdown() {
+        unsafe { git_libgit2_shutdown(); }
+    }
+}
+
+#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), feature = "https"))]
+#[doc(hidden)]
+pub fn openssl_init() {
+    openssl_sys::init();
 }
+
+#[cfg(any(windows, target_os = "macos", target_os = "ios", not(feature = "https")))]
+#[doc(hidden)]
+pub fn openssl_init() {}
+
+#[cfg(feature = "ssh")]
+fn ssh_init() {
+    libssh2::init();
+}
+
+#[cfg(not(feature = "ssh"))]
+fn ssh_init() {}

src/lib.rs

@@ -528,26 +528,19 @@ mod tree;
 mod treebuilder;
 
 fn init() {
+    raw::init();
+
     static INIT: Once = ONCE_INIT;
-    INIT.call_once(|| unsafe {
-        openssl_init();
-        let r = raw::git_libgit2_init();
-        assert!(r >= 0,
-                "couldn't initialize the libgit2 library: {}", r);
-        assert_eq!(libc::atexit(shutdown), 0);
+
+    INIT.call_once(|| {
+        openssl_env_init();
     });
-    extern fn shutdown() {
-        unsafe { raw::git_libgit2_shutdown(); }
-    }
 }
 
 #[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), feature = "https"))]
-fn openssl_init() {
-    extern crate openssl_sys;
+fn openssl_env_init() {
     extern crate openssl_probe;
 
-    openssl_sys::init();
-
     // Currently, libgit2 leverages OpenSSL for SSL support when cloning
     // repositories over HTTPS. This means that we're picking up an OpenSSL
     // dependency on non-Windows platforms (where it has its own HTTPS
@@ -663,7 +656,7 @@ fn openssl_init() {
 }
 
 #[cfg(any(windows, target_os = "macos", target_os = "ios", not(feature = "https")))]
-fn openssl_init() {}
+fn openssl_env_init() {}
 
 unsafe fn opt_bytes<'a, T>(_anchor: &'a T,
                            c: *const libc::c_char) -> Option<&'a [u8]> {