sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Downloader hack implemented, now Netsurf can browse web - somehow....

Browse Source 
git-svn-id: svn://kolibrios.org@3620 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Dmitry Pereverzev (SoUrcerer) 2013-06-07 19:36:44 +00:00
parent c048a59ae7
commit 7736817a6a
1 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
programs/network/netsurf/netsurf/content/fetchers/curl.c
View File

@ -216,7 +216,12 @@ void * fetch_curl_setup (struct fetch *fetchh,
if (ctx == NULL) if (ctx == NULL)
return NULL; return NULL;
ctx->path = url_to_path(nsurl_access(url)); //ctx->path = url_to_path(nsurl_access(url));
char *zz;
int pr;
nsurl_get(url, NSURL_WITH_FRAGMENT, &zz, &pr);
ctx->path = zz;
if (ctx->path == NULL) { if (ctx->path == NULL) {
free(ctx); free(ctx);
return NULL; return NULL;
@ -343,12 +348,85 @@ fetch_file_process_error_aborted:
} }
int is_pid(int k)
{
int error;
asm volatile ("int $0x40":"=a"(error):"a"(18), "b"(21), "c"(k));
return error;
}
int kill_pid(int k)
{
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) { static void fetch_curl_process(struct fetch_curl_context *ctx) {
int pid=execl ("/sys/network/downloader", ctx->path, 0);
// while (is_pid(pid)) {
kill_pid(pid);
// }
pid=execl ("/sys/network/downloader", ctx->path, 0);
char ps[255];
sprintf(ps, "pid %d", pid);
execl ("/sys/network/@notify", ps, 0);
while (is_pid(pid));
sprintf(ps, "Yay! Finished");
execl ("/sys/network/@notify", ps, 0);
/*
char pzz[255];
sprintf(pzz, "Pid is %d", pid);
execl ("/sys/@notify", pzz, 0); */
//int status;
//waitpid(pid, &status, 0);
fetch_msg msg; fetch_msg msg;
const char * buf = "<html><body><h1>Hello, file fetcher!</h1></body></html>"; //const char * buf = "<html><body><h1>Hello, file fetcher!</h1></body></html>";
// fetch_curl_process_error(ctx, 501);
// return; FILE *infile;
infile = fopen("/sys/.download", "rb");
if (infile == NULL) {
printf("file does not exist.\n");
return -1;
}
fseek(infile, 0, SEEK_END);
size_t file_size = ftell(infile);
rewind(infile);
char *buffer = (char*)malloc(file_size * sizeof(char));
if (buffer == NULL) {
fclose(infile);
printf("Error allocating %d bytes.\n", file_size * sizeof(char));
return -1;
}
size_t bytes_read = fread(buffer, sizeof(char), file_size, infile);
if (bytes_read != file_size) {
printf("Have read only %d bytes of %d.\n", bytes_read, file_size);
free(buffer);
fclose(infile);
return -1;
}
fclose(infile);
/* fetch is going to be successful */ /* fetch is going to be successful */
fetch_set_http_code(ctx->fetchh, 200); fetch_set_http_code(ctx->fetchh, 200);
@ -366,8 +444,8 @@ static void fetch_curl_process(struct fetch_curl_context *ctx) {
/* main data loop */ /* main data loop */
msg.type = FETCH_DATA; msg.type = FETCH_DATA;
msg.data.header_or_data.buf = (const uint8_t *) buf; msg.data.header_or_data.buf = (const uint8_t *) buffer;
msg.data.header_or_data.len = strlen(buf); msg.data.header_or_data.len = file_size;
fetch_curl_send_callback(&msg, ctx); fetch_curl_send_callback(&msg, ctx);