registry: Store extra registries in clib.json and read these registries in clib-search

Author: nouwaarom

Makefile

@@ -1,4 +1,4 @@
-CC     ?= cc
+CC     ?= gcc
 PREFIX ?= /usr/local
 
 BINS = clib clib-install clib-search clib-init clib-configure clib-build clib-update clib-upgrade clib-uninstall
@@ -18,15 +18,14 @@ SDEPS = $(wildcard deps/*/*.c)
 ODEPS = $(SDEPS:.c=.o)
 DEPS = $(filter-out $(ODEPS), $(SDEPS))
 OBJS = $(DEPS:.c=.o)
-MAKEFILES = $(wildcard deps/*/Makefile)
 
 export CC
 
 ifdef STATIC
 	CFLAGS  += -DCURL_STATICLIB -std=c99 -Ideps -Wall -Werror=return-type -Wno-unused-function -U__STRICT_ANSI__ $(shell deps/curl/bin/curl-config --cflags)
 	LDFLAGS += -static $(shell deps/curl/bin/curl-config --static-libs)
 else
-	CFLAGS  += -std=c99 -Ideps -g -Wall -Werror=return-type -Wno-unused-function -U__STRICT_ANSI__ $(shell curl-config --cflags)
+	CFLAGS  += -std=gnu17 -Ideps -g -Wall -Werror=return-type -Wno-unused-function $(shell curl-config --cflags)
 	LDFLAGS += $(shell curl-config --libs)
 endif
 
@@ -46,7 +45,7 @@ all: $(BINS)
 
 build: $(BINS)
 
-$(BINS): $(SRC) $(MAKEFILES) $(OBJS)
+$(BINS): $(SRC) $(COMMON_SRC) $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(COMMON_SRC) src/$(@:.exe=).c $(OBJS) $(LDFLAGS)
 
 $(MAKEFILES):

deps/http-get/http-get.c

@@ -40,7 +40,7 @@ static size_t http_get_cb(void *contents, size_t size, size_t nmemb, void *userp
   return realsize;
 }
 
-http_get_response_t *http_get_shared(const char *url, CURLSH *share) {
+http_get_response_t *http_get_shared(const char *url, CURLSH *share, const char** headers, int header_count) {
   CURL *req = curl_easy_init();
 
   http_get_response_t *res = malloc(sizeof(http_get_response_t));
@@ -50,6 +50,15 @@ http_get_response_t *http_get_shared(const char *url, CURLSH *share) {
     curl_easy_setopt(req, CURLOPT_SHARE, share);
   }
 
+  if (header_count > 0) {
+    struct curl_slist *chunk = NULL;
+    for (int i = 0; i < header_count; i++) {
+      chunk = curl_slist_append(chunk, headers[i]);
+    }
+    /* set our custom set of headers */
+    curl_easy_setopt(req, CURLOPT_HTTPHEADER, chunk);
+  }
+
   curl_easy_setopt(req, CURLOPT_URL, url);
   curl_easy_setopt(req, CURLOPT_HTTPGET, 1);
   curl_easy_setopt(req, CURLOPT_FOLLOWLOCATION, 1);
@@ -70,8 +79,8 @@ http_get_response_t *http_get_shared(const char *url, CURLSH *share) {
  * Perform an HTTP(S) GET on `url`
  */
 
-http_get_response_t *http_get(const char *url) {
-  return http_get_shared(url, NULL);
+http_get_response_t *http_get(const char *url, const char** headers, int header_count) {
+  return http_get_shared(url, NULL, headers, header_count);
 }
 
 /**

deps/http-get/http-get.h

@@ -21,8 +21,8 @@ typedef struct {
   int ok;
 } http_get_response_t;
 
-http_get_response_t *http_get(const char *);
-http_get_response_t *http_get_shared(const char *, void *);
+http_get_response_t *http_get(const char *url, const char** headers, int header_count);
+http_get_response_t *http_get_shared(const char *url, void *, const char** headers, int header_count);
 
 int http_get_file(const char *, const char *);
 int http_get_file_shared(const char *, const char *, void *);

deps/url/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "url",
+  "version": "0.0.2",
+  "repo": "jwerle/url.h",
+  "description": "Parse URLs much like Node's url module",
+  "keywords": ["url", "parse"],
+  "license": "MIT",
+  "src": ["url.h"]
+}