mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-23 06:51:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2002-12-25 21:36:29 by bursa]

Browse Source 
Changes to url handling.

svn path=/import/netsurf/; revision=55
This commit is contained in:
James Bursa 2002-12-25 21:38:45 +00:00
parent f373b275dd
commit 668dfb4884
2 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
desktop/browser.c
View File

@ -1,5 +1,5 @@
/**
* $Id: browser.c,v 1.11 2002/12/25 20:17:18 bursa Exp $
* $Id: browser.c,v 1.13 2002/12/25 21:38:45 bursa Exp $
*/
#include "netsurf/riscos/font.h"
@ -10,11 +10,13 @@
#include "netsurf/render/utils.h"
#include "netsurf/desktop/cache.h"
#include "netsurf/utils/log.h"
#include "libxml/uri.h"
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <limits.h>
#include <time.h>
#include <ctype.h>
struct box_selection
{
@ -440,6 +442,7 @@ void browser_window_open_location(struct browser_window* bw, char* url)
{
LOG(("bw = %p, url = %s", bw, url));
assert(bw != 0 && url != 0);
url = url_join(url, bw->url);
browser_window_open_location_historical(bw, url);
if (bw->history == NULL)
bw->history = history_create(NULL, url);
@ -448,6 +451,7 @@ void browser_window_open_location(struct browser_window* bw, char* url)
history_remember(bw->history, NULL, url);
bw->history = bw->history->later;
}
xfree(url);
LOG(("end"));
}
@ -938,3 +942,50 @@ void browser_window_redraw_boxes(struct browser_window* bw, struct box_position*
gui_window_redraw(bw->window, redraw_min_x, redraw_min_y,
redraw_max_x, redraw_max_y);
}
char *url_join(const char* new, const char* base)
{
xmlURI* uri;
char* ret;
int i;
LOG(("new = %s, base = %s", new, base));
if (base == 0)
{
/* no base, so make an absolute URL */
uri = xmlParseURI(new);
assert(uri != 0);
if (uri->scheme == 0)
uri->scheme = "http";
if (uri->server == 0) {
uri->server = uri->path;
uri->path = 0;
}
}
else
{
/* relative url */
char* uri_string = xmlBuildURI(new, base);
uri = xmlParseURI(uri_string);
xfree(uri_string);
assert(uri != 0);
}
/* make server name lower case */
assert(uri->scheme != 0 && uri->server != 0);
for (i = 0; i < strlen(uri->server); i++)
uri->server[i] = tolower(uri->server[i]);
/* http://www.example.com -> http://www.example.com/ */
if (uri->path == 0)
uri->path = "/";
ret = xmlSaveUri(uri);
xmlFreeURI(uri);
LOG(("ret = %s", ret));
return ret;
}

40
desktop/fetch.c
View File

@ -1,5 +1,5 @@
/**
* $Id: fetch.c,v 1.3 2002/12/25 20:17:18 bursa Exp $
* $Id: fetch.c,v 1.5 2002/12/25 21:38:45 bursa Exp $
*/
#include "libxml/HTMLparser.h"
@ -10,48 +10,22 @@
#include "netsurf/desktop/fetch.h"
#include "netsurf/render/utils.h"
#include "curl/curl.h"
#include "libxml/uri.h"
#include <time.h>
#include <string.h>
#include <stdio.h>
void fetch_identify_location(struct fetch* f, char* location, char* previous)
{
/* FILE* ff = fopen("identify", "a");
fprintf(ff, "identify: '%s' '%s'", location, previous);
if (f->location != NULL)
fprintf(ff, " '%s'\n", f->location);
else
fprintf(ff, "\n");
fclose(ff);*/
if (f->location != NULL)
xfree(f->location);
if (strspn(location, "http://") == strlen("http://"))
{
f->location = xstrdup(location);
f->type = fetch_CURL;
return;
}
else if (strspn(location, "file:/") == strlen("file:/"))
{
f->location = xstrdup(location);
f->type = fetch_FILE;
return;
}
else if (previous != NULL)
{
f->location = xmlBuildURI(location, previous);
assert(f->location != NULL);
f->type = fetch_CURL;
return;
}
f->location = xstrdup(location);
f->location = xcalloc(strlen(location) + strlen("http://") + 1, sizeof(char));
sprintf(f->location, "http://%s", location);
f->type = fetch_CURL;
return;
if (strspn(location, "file:/") == strlen("file:/"))
f->type = fetch_FILE;
else
/* throw everything else at curl, since it can fetch lots of protocols */
f->type = fetch_CURL;
}
struct fetch* create_fetch(char* location, char* previous, fetch_flags f, struct fetch_request* r)