undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'km/imap-send-libcurl-options'

Browse Source 
"git imap-send" learned to optionally talk with an IMAP server via
libcURL; because there is no other option when Git is built with
NO_OPENSSL option, use that codepath by default under such
configuration.

* km/imap-send-libcurl-options:
  imap-send: use cURL automatically when NO_OPENSSL defined
This commit is contained in:
Junio C Hamano 2015-03-20 13:11:50 -07:00
commit 0a81977239
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-imap-send.txt
View File

@ -44,7 +44,8 @@ OPTIONS
--no-curl:: --no-curl::
Talk to the IMAP server using git's own IMAP routines instead of Talk to the IMAP server using git's own IMAP routines instead of
using libcurl. using libcurl. Ignored if Git was built with the NO_OPENSSL option
set.
CONFIGURATION CONFIGURATION

17
imap-send.c
View File

@ -34,8 +34,16 @@ typedef void *SSL;
#include "http.h" #include "http.h"
#endif #endif
#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL)
/* only available option */
#define USE_CURL_DEFAULT 1
#else
/* strictly opt in */
#define USE_CURL_DEFAULT 0
#endif
static int verbosity; static int verbosity;
static int use_curl; /* strictly opt in */ static int use_curl = USE_CURL_DEFAULT;
static const char * const imap_send_usage[] = { "git imap-send [-v] [-q] [--[no-]curl] < <mbox>", NULL }; static const char * const imap_send_usage[] = { "git imap-send [-v] [-q] [--[no-]curl] < <mbox>", NULL };
@ -1504,9 +1512,14 @@ int main(int argc, char **argv)
#ifndef USE_CURL_FOR_IMAP_SEND #ifndef USE_CURL_FOR_IMAP_SEND
if (use_curl) { if (use_curl) {
warning("--use-curl not supported in this build"); warning("--curl not supported in this build");
use_curl = 0; use_curl = 0;
} }
#elif defined(NO_OPENSSL)
if (!use_curl) {
warning("--no-curl not supported in this build");
use_curl = 1;
}
#endif #endif
if (!server.port) if (!server.port)