WebSVN – Kolibri OS – Diff – /programs/network/netsurf/netsurf/content/fetchers/curl.c

+ *
  * The CURL handles are cached in the curl_handle_ring. There are at most
  * ::max_cached_fetch_handles in this ring.
  */
+#include "http.c"
 #include
 #include
 #include
 #include
  * Initialise a cURL fetcher.
  */
 bool fetch_curl_initialise(lwc_string *scheme)
-{
+{
 LOG(("curl initi lwc\n"));
 	return true; /* Always succeeds */
 	int error;
 asm volatile ("int $0x40":"=a"(error):"a"(18), "b"(18), "c"(k));
 return error;
+}
+static void fetch_curl_process(struct fetch_curl_context *ctx) {
+	char ps[96], str[128];
+	sprintf(ps, "Yay! Path is %s", ctx->path);
-static void fetch_curl_process(struct fetch_curl_context *ctx) {
+	execl ("/sys/@notify", ps, 0);
+	fetch_msg msg;
+ /* ERSATZ DOWNLOADER */
+ /*
+char zapzap[]="HOOLE!
";
-	int pid=execl ("/sys/network/downloader", ctx->path, 0);
-//	while (is_pid(pid)) {
-	kill_pid(pid);
+size_t file_size=strlen(zapzap);
-//	}
+char *buffer = (char*)malloc(file_size * sizeof(char));
+memcpy(buffer, zapzap, file_size * sizeof(char));
+*/
+    __menuet__debug_out("AHOY!\n");
-	pid=execl ("/sys/network/downloader", ctx->path, 0);
+	struct http_msg *http_ahoy;
-	char ps[255];
+	unsigned int wererat = 0;
-	sprintf(ps, "pid %d", pid);
+    char * pa=ctx->path;
-	execl ("/sys/network/@notify", ps, 0);
+    asm volatile ("pusha");
+    wererat = http_get(pa);
+	asm volatile ("popa");
+	__menuet__debug_out("HTTP GOT!\n");
+	int result;
-	while (is_pid(pid));
+    http_ahoy=wererat;
-	sprintf(ps, "Yay! Finished");
-	execl ("/sys/network/@notify", ps, 0);
+    sprintf (str, "Header %d bytes, content %d bytes, recieved %d bytes\n", http_ahoy->header_length, http_ahoy->content_length, http_ahoy->content_received);
-	/*
-	char pzz[255];
-	sprintf(pzz, "Pid is %d", pid);
-	execl ("/sys/@notify", pzz, 0); */
+    __menuet__debug_out(str);
-	//int status;
-	//waitpid(pid, &status, 0);
+    asm volatile ("pusha");
-	fetch_msg msg;
+    result = http_process(wererat);
-	//const char * buf = "Hello, file fetcher!
";
+    asm volatile ("popa");
- FILE *infile;
-  infile = fopen("/sys/.download", "rb");
-  if (infile == NULL) {
+    while (result == -1)  {
-    printf("file does not exist.\n");
+		asm volatile ("pusha");
-    return -1;
-  }
+		result = http_process(wererat);
+		asm volatile ("popa");
+	}
+    http_ahoy=wererat;
+    sprintf (str, "Header %d bytes, content %d bytes, recieved %d bytes\n", http_ahoy->header_length, http_ahoy->content_length, http_ahoy->content_received);
-  fseek(infile, 0, SEEK_END);
+    __menuet__debug_out(str);
   size_t file_size = ftell(infile);
   rewind(infile);
     __menuet__debug_out("All content is here\n");
   char *buffer = (char*)malloc(file_size * sizeof(char));
-  if (buffer == NULL) {
+	size_t file_size=http_ahoy->content_received;
-    fclose(infile);
-    printf("Error allocating %d bytes.\n", file_size * sizeof(char));
-    return -1;
+	char *buffer = (char*)malloc(file_size * sizeof(char));
 	memcpy(buffer, &(http_ahoy->data)+http_ahoy->header_length, file_size);
   size_t bytes_read = fread(buffer, sizeof(char), file_size, infile);
-  if (bytes_read != file_size) {
+	// http_free(wererat);
-    printf("Have read only %d bytes of %d.\n", bytes_read, file_size);
+    __menuet__debug_out("memcopied\n==\n");
-    free(buffer);
-    fclose(infile);
+	//__menuet__debug_out(buffer);
-    return -1;
+	//__menuet__debug_out("memcopied\n==\n");

Subversion Repositories Kolibri OS

(root)/programs/network/netsurf/netsurf/content/fetchers/curl.c – Rev 3624 → 4224

HOOLE!

Hello, file fetcher!