mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 09:13:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

More intelligent path concatenation

Browse Source 
svn path=/trunk/netsurf/; revision=10639
This commit is contained in:
Chris Young 2010-07-14 22:36:04 +00:00
parent a3c2b432b5
commit a182a36067
2 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
amiga/misc.c
View File

@ -73,6 +73,9 @@ char *url_to_path(const char *url)
if (strncmp(url, "/", SLEN("/")) == 0) if (strncmp(url, "/", SLEN("/")) == 0)
url += SLEN("/"); url += SLEN("/");
if(*url == '\0')
return NULL; /* file:/// is not a valid path */
url2 = malloc(strlen(url) + 2); url2 = malloc(strlen(url) + 2);
strcpy(url2, url); strcpy(url2, url);

117
render/directory.c
View File

@ -145,6 +145,8 @@ bool directory_convert(struct content *c) {
struct stat filestat; struct stat filestat;
char *filepath, *mimetype = NULL; char *filepath, *mimetype = NULL;
int filepath_size; int filepath_size;
char *urlpath;
int urlpath_size;
char moddate[100]; char moddate[100];
char modtime[100]; char modtime[100];
bool extendedinfo, evenrow = false; bool extendedinfo, evenrow = false;
@ -196,8 +198,6 @@ bool directory_convert(struct content *c) {
if (res == URL_FUNC_OK) { if (res == URL_FUNC_OK) {
res = url_compare(content__get_url(c), up, false, &compare); res = url_compare(content__get_url(c), up, false, &compare);
if ((res == URL_FUNC_OK) && !compare) { if ((res == URL_FUNC_OK) && !compare) {
if (up[strlen(up) - 1] == '/')
up[strlen(up) - 1] = '\0';
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<p><a href=\"%s\">%s</a></p>", "<p><a href=\"%s\">%s</a></p>",
up, messages_get("FileParent")); up, messages_get("FileParent"));
@ -257,68 +257,79 @@ bool directory_convert(struct content *c) {
return false; return false;
} }
/* Start row and print item name */ urlpath_size = strlen(content__get_url(c)) + strlen(entry->d_name) + 2;
snprintf(buffer, sizeof(buffer), urlpath = malloc(urlpath_size);
"<a href=\"%s/%s\" class=\"%s %s\">" if (urlpath != NULL) {
strcpy(urlpath, content__get_url(c));
if(urlpath[strlen(urlpath) - 1] != '/')
strncat(urlpath, "/", urlpath_size);
strncat(urlpath, entry->d_name, urlpath_size);
/* Start row and print item name */
snprintf(buffer, sizeof(buffer),
"<a href=\"%s\" class=\"%s %s\">"
"<span class=\"name\">%s</span> ", "<span class=\"name\">%s</span> ",
content__get_url(c), entry->d_name, urlpath,
evenrow ? "even" : "odd", evenrow ? "even" : "odd",
S_ISDIR(filestat.st_mode) ? "dir" : "file", S_ISDIR(filestat.st_mode) ? "dir" : "file",
entry->d_name); entry->d_name);
binding_parse_chunk(c->data.html.parser_binding, binding_parse_chunk(c->data.html.parser_binding,
(uint8_t *) buffer, strlen(buffer)); (uint8_t *) buffer, strlen(buffer));
if (extendedinfo == true) { if (extendedinfo == true) {
/* Get date in output format */ /* Get date in output format */
if (strftime((char *)&moddate, sizeof moddate, if (strftime((char *)&moddate, sizeof moddate,
"%a %d %b %Y", "%a %d %b %Y",
localtime(&filestat.st_mtime)) == 0) localtime(&filestat.st_mtime)) == 0)
strncpy(moddate, "-", sizeof moddate); strncpy(moddate, "-", sizeof moddate);
/* Get time in output format */ /* Get time in output format */
if (strftime((char *)&modtime, sizeof modtime, if (strftime((char *)&modtime, sizeof modtime,
"%H:%M", "%H:%M",
localtime(&filestat.st_mtime)) == 0) localtime(&filestat.st_mtime)) == 0)
strncpy(modtime, "-", sizeof modtime); strncpy(modtime, "-", sizeof modtime);
if (S_ISDIR(filestat.st_mode)) { if (S_ISDIR(filestat.st_mode)) {
/* Directory: Print type and date/time */ /* Directory: Print type and date/time */
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<span class=\"type\">%s</span> " "<span class=\"type\">%s</span> "
"<span class=\"size\"></span>" "<span class=\"size\"></span>"
"<span class=\"size\"></span> " "<span class=\"size\"></span> "
"<span class=\"date\">%s</span> " "<span class=\"date\">%s</span> "
"<span class=\"time\">%s</span></a>\n", "<span class=\"time\">%s</span></a>\n",
messages_get("FileDirectory"), messages_get("FileDirectory"),
moddate, modtime); moddate, modtime);
} else {
/* File: Print type, size, and date/time */
mimetype = fetch_mimetype(filepath);
snprintf(buffer, sizeof(buffer),
"<span class=\"type\">%s</span> "
"<span class=\"size\">%d</span>"
"<span class=\"size\">%s</span> "
"<span class=\"date\">%s</span> "
"<span class=\"time\">%s</span></a>\n",
mimetype,
filesize_value(
(unsigned long)filestat.st_size),
messages_get(filesize_unit(
(unsigned long)filestat.st_size)),
moddate, modtime);
}
} else { } else {
/* File: Print type, size, and date/time */ /* Not got info, print empty cells */
mimetype = fetch_mimetype(filepath);
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<span class=\"type\">%s</span> " "<span class=\"type\"></span> "
"<span class=\"size\">%d</span>" "<span class=\"size\"></span>"
"<span class=\"size\">%s</span> " "<span class=\"size\"></span> "
"<span class=\"date\">%s</span> " "<span class=\"date\"></span> "
"<span class=\"time\">%s</span></a>\n", "<span class=\"time\"></span></a>\n");
mimetype,
filesize_value(
(unsigned long)filestat.st_size),
messages_get(filesize_unit(
(unsigned long)filestat.st_size)),
moddate, modtime);
} }
} else {
/* Not got info, print empty cells */
snprintf(buffer, sizeof(buffer),
"<span class=\"type\"></span> "
"<span class=\"size\"></span>"
"<span class=\"size\"></span> "
"<span class=\"date\"></span> "
"<span class=\"time\"></span></a>\n");
}
binding_parse_chunk(c->data.html.parser_binding, binding_parse_chunk(c->data.html.parser_binding,
(uint8_t *) buffer, strlen(buffer)); (uint8_t *) buffer, strlen(buffer));
free(urlpath);
}
if (evenrow == false) if (evenrow == false)
evenrow = true; evenrow = true;