Merge pull request #2408 from DennisHeimbigner/rcapi.dmh

Make public a limited API for programmatic access to internal .rc tables

CMakeLists.txt

@@ -69,7 +69,7 @@ endif()
 if(MSVC)
 SET(ISMSVC yes)
 endif()
-if(osname MATCHES "MINGW.*")
+if(osname MATCHES "MINGW.*" OR osname MATCHES "MSYS.*")
 SET(ISMINGW yes)
 SET(MINGW yes)
 endif()

RELEASE_NOTES.md

@@ -7,7 +7,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.1 - T.B.D.
 
-
+* [Enhancement] Provide a simple API to allow user access to the internal .rc file table: supports get/set/overwrite of entries of the form "key=value". See [Github #2408](https://github.com/Unidata/netcdf-c/pull/2408).
 * [Bug Fix] Use env variable USERPROFILE instead of HOME for windows and mingw. See [Github #2405](https://github.com/Unidata/netcdf-c/pull/2405).
 * [Bug Fix] Fix the nc_def_var_fletcher32 code in hdf5 to properly test value of the fletcher32 argument. See [Github #2403](https://github.com/Unidata/netcdf-c/pull/2403).
 

configure.ac

@@ -107,6 +107,7 @@ case "`uname`" in
   Darwin*) ISOSX=yes;;
   WIN*) ISMSVC=yes;;
   MINGW*) ISMINGW=yes;;
+  MSYS*) ISMINGW=yes;;
 esac
 
 if test "x$MSYSTEM" != x ; then

include/ncrc.h

@@ -28,7 +28,7 @@ and accessing rc files (e.g. .daprc).
 
 typedef struct NCRCentry {
 	char* host; /* combined host:port */
-	char* path; /* prefix to match or NULL */
+	char* urlpath; /* prefix to match or NULL */
         char* key;
         char* value;
 } NCRCentry;
@@ -67,7 +67,7 @@ extern "C" {
 
 /* From drc.c */
 EXTERNL void ncrc_initialize(void);
-EXTERNL int NC_rcfile_insert(const char* key, const char* value, const char* hostport, const char* path);
+EXTERNL int NC_rcfile_insert(const char* key, const char* hostport, const char* path, const char* value);
 EXTERNL char* NC_rclookup(const char* key, const char* hostport, const char* path);
 EXTERNL char* NC_rclookupx(NCURI* uri, const char* key);
 

include/netcdf.h

@@ -2095,6 +2095,14 @@ EXTERNL int nc_initialize(void);
 */
 EXTERNL int nc_finalize(void);
 
+/* Programmatic access to the internal .rc table */
+
+/* Get the value corresponding to key | return NULL; caller frees  result */
+EXTERNL char* nc_rc_get(const char* key);
+
+/* Set/overwrite the value corresponding to key */
+EXTERNL int nc_rc_set(const char* key, const char* value);
+
 #if defined(__cplusplus)
 }
 #endif

libdispatch/ddispatch.c

@@ -95,7 +95,6 @@ NCDISPATCH_initialize(void)
         NCpathcanonical(home,&globalstate->home);
 	nullfree(home);
     }
-fprintf(stderr,">>> HOME=|%s|\n",globalstate->home); fflush(stderr);
 
     /* Capture $CWD */
     {

libdispatch/dhttp.c

@@ -22,7 +22,9 @@
 #include "nclog.h"
 #include "ncbytes.h"
 #include "nclist.h"
+#include "ncuri.h"
 #include "nchttp.h"
+#include "ncauth.h"
 
 #undef TRACE
 
@@ -482,6 +484,23 @@ setupconn(NC_HTTP_STATE* state, const char* objecturl)
     cstat = curl_easy_setopt(state->curl, CURLOPT_FOLLOWLOCATION, 1); 
     if (cstat != CURLE_OK) goto fail;
 
+    /* Pull some values from .rc tables */
+    {
+	NCURI* uri = NULL;
+	char* hostport = NULL;
+	char* value = NULL;
+	ncuriparse(objecturl,&uri);
+	if(uri == NULL) goto fail;
+	hostport = NC_combinehostport(uri);
+	value = NC_rclookup("HTTP.SSL.CAINFO",hostport,NULL);
+	if(value == NULL)
+	    value = NC_rclookup("HTTP.SSL.CAINFO",NULL,NULL);
+	if(value != NULL) {
+	    cstat = CURLERR(curl_easy_setopt(state->curl, CURLOPT_CAINFO, value));
+	    if (cstat != CURLE_OK) goto fail;
+	}
+    }
+
     /* Set the method */
     if((stat = nc_http_set_method(state,state->request.method))) goto done;