Add a protocol-ftp feature which enables FTP support when using bundled libcurl (#322) (#325)

Author: Ed Barnard

Cargo.toml

@@ -44,6 +44,7 @@ spnego = ["curl-sys/spnego"]
 static-curl = ["curl-sys/static-curl"]
 static-ssl = ["curl-sys/static-ssl"]
 force-system-lib-on-osx = ['curl-sys/force-system-lib-on-osx']
+protocol-ftp = ["curl-sys/protocol-ftp"]
 
 [[test]]
 name = "atexit"

ci/run.sh

@@ -3,12 +3,16 @@
 set -ex
 
 cargo test --target $TARGET --no-run
-cargo test --target $TARGET --no-run --features curl-sys/static-curl
+# First test with no extra protocols enabled.
+cargo test --target $TARGET --no-run --features static-curl
+# Then with all extra protocols enabled.
+cargo test --target $TARGET --no-run --features static-curl,protocol-ftp
 if [ -z "$NO_RUN" ]; then
     cargo test --target $TARGET
-    cargo test --target $TARGET --features curl-sys/static-curl
+    cargo test --target $TARGET --features static-curl
+    cargo test --target $TARGET --features static-curl,protocol-ftp
     cargo run --manifest-path systest/Cargo.toml --target $TARGET
-    cargo run --manifest-path systest/Cargo.toml --target $TARGET --features curl-sys/static-curl
+    cargo run --manifest-path systest/Cargo.toml --target $TARGET --features curl-sys/static-curl,curl-sys/protocol-ftp
     cargo doc --no-deps --target $TARGET
     cargo doc --no-deps -p curl-sys --target $TARGET
 fi

curl-sys/Cargo.toml

@@ -50,3 +50,4 @@ static-curl = []
 static-ssl = ["openssl-sys/vendored"]
 spnego = []
 force-system-lib-on-osx = []
+protocol-ftp = []

curl-sys/build.rs

@@ -116,7 +116,6 @@ fn main() {
         .define("BUILDING_LIBCURL", None)
         .define("CURL_DISABLE_CRYPTO_AUTH", None)
         .define("CURL_DISABLE_DICT", None)
-        .define("CURL_DISABLE_FTP", None)
         .define("CURL_DISABLE_GOPHER", None)
         .define("CURL_DISABLE_IMAP", None)
         .define("CURL_DISABLE_LDAP", None)
@@ -202,6 +201,15 @@ fn main() {
         .define("HAVE_GETPEERNAME", None)
         .warnings(false);
 
+    if cfg!(feature = "protocol-ftp") {
+        cfg.file("curl/lib/curl_fnmatch.c")
+            .file("curl/lib/ftp.c")
+            .file("curl/lib/ftplistparser.c")
+            .file("curl/lib/pingpong.c");
+    } else {
+        cfg.define("CURL_DISABLE_FTP", None);
+    }
+
     if cfg!(feature = "http2") {
         cfg.define("USE_NGHTTP2", None)
             .define("NGHTTP2_STATICLIB", None);

tests/protocols.rs

@@ -0,0 +1,21 @@
+extern crate curl;
+
+#[cfg(all(feature = "static-curl", not(feature = "protocol-ftp")))]
+#[test]
+fn static_with_ftp_disabled() {
+    assert!(curl::Version::get()
+        .protocols()
+        .filter(|&p| p == "ftp")
+        .next()
+        .is_none());
+}
+
+#[cfg(all(feature = "static-curl", feature = "protocol-ftp"))]
+#[test]
+fn static_with_ftp_enabled() {
+    assert!(curl::Version::get()
+        .protocols()
+        .filter(|&p| p == "ftp")
+        .next()
+        .is_some());
+}