mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-21 17:04:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add comments and factor out common file size code.

Browse Source 
svn path=/trunk/netsurf/; revision=10637
This commit is contained in:
Michael Drake 2010-07-14 13:36:15 +00:00
parent 760bc3380c
commit cfdae54bc3
1 changed files with 55 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
render/directory.c
View File

@ -68,6 +68,7 @@ static const char footer[] = "</div>\n</body>\n</html>\n";
static char sizeunits[][7] = {"Bytes", "kBytes", "MBytes", "GBytes"}; static char sizeunits[][7] = {"Bytes", "kBytes", "MBytes", "GBytes"};
static int filesize_calculate(unsigned long *bytesize);
static int filesize_value(unsigned long bytesize); static int filesize_value(unsigned long bytesize);
static char* filesize_unit(unsigned long bytesize); static char* filesize_unit(unsigned long bytesize);
@ -84,28 +85,51 @@ bool directory_create(struct content *c, const struct http_parameter *params) {
return true; return true;
} }
int filesize_value(unsigned long bytesize) { /**
* Obtain display value and units for filesize after conversion to B/kB/MB/GB,
* as appropriate.
*
* \param bytesize file size in bytes, updated to filesize in output units
* \return number of times bytesize has been divided by 1024
*/
int filesize_calculate(unsigned long *bytesize)
{
int i = 0; int i = 0;
while (bytesize > 1024 * 4) { while (*bytesize > 1024 * 4) {
bytesize /= 1024; *bytesize /= 1024;
i++; i++;
if (i == 3) if (i == 3)
break; break;
} }
return i;
return bytesize;
} }
char* filesize_unit(unsigned long bytesize) { /**
int i = 0; * Obtain display value for filesize after conversion to B/kB/MB/GB,
while (bytesize > 1024 * 4) { * as appropriate
bytesize /= 1024; *
i++; * \param bytesize file size in bytes
if (i == 3) * \return Value to display for file size, in units given by filesize_unit()
break; */
}
return sizeunits[i]; int filesize_value(unsigned long bytesize)
{
filesize_calculate(&bytesize);
return (int)bytesize;
}
/**
* Obtain display units for filesize after conversion to B/kB/MB/GB,
* as appropriate
*
* \param bytesize file size in bytes
* \return Units to display for file size, for value given by filesize_value()
*/
char* filesize_unit(unsigned long bytesize)
{
return sizeunits[filesize_calculate(&bytesize)];
} }
bool directory_convert(struct content *c) { bool directory_convert(struct content *c) {
@ -124,18 +148,22 @@ bool directory_convert(struct content *c) {
char modtime[100]; char modtime[100];
bool extendedinfo, evenrow = false; bool extendedinfo, evenrow = false;
/* Get directory path from URL */
path = url_to_path(content__get_url(c)); path = url_to_path(content__get_url(c));
if (!path) { if (!path) {
msg_data.error = messages_get("NoMemory"); msg_data.error = messages_get("NoMemory");
content_broadcast(c, CONTENT_MSG_ERROR, msg_data); content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
return false; return false;
} }
/* Convert path for display */
nice_path = malloc(strlen(path) * 4 + 1); nice_path = malloc(strlen(path) * 4 + 1);
if (!nice_path) { if (!nice_path) {
msg_data.error = messages_get("MiscErr"); msg_data.error = messages_get("MiscErr");
content_broadcast(c, CONTENT_MSG_ERROR, msg_data); content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
return false; return false;
} }
/* Escape special HTML characters */
for (cnv = nice_path, tmp = path; *tmp != '\0'; tmp++) { for (cnv = nice_path, tmp = path; *tmp != '\0'; tmp++) {
if (*tmp == '<') { if (*tmp == '<') {
*cnv++ = '&'; *cnv++ = '&';
@ -152,6 +180,8 @@ bool directory_convert(struct content *c) {
} }
} }
*cnv = '\0'; *cnv = '\0';
/* Print document title and heading */
snprintf(buffer, sizeof(buffer), "Index of %s</title>\n</head>\n" snprintf(buffer, sizeof(buffer), "Index of %s</title>\n</head>\n"
"<body>\n<h1>Index of %s</h1>\n", "<body>\n<h1>Index of %s</h1>\n",
nice_path, nice_path); nice_path, nice_path);
@ -160,8 +190,8 @@ bool directory_convert(struct content *c) {
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));
/* Print parent directory link */
res = url_parent(content__get_url(c), &up); res = url_parent(content__get_url(c), &up);
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) {
@ -177,6 +207,7 @@ bool directory_convert(struct content *c) {
free(up); free(up);
} }
/* Print directory contents table column headings */
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<div>\n<strong>" "<div>\n<strong>"
"<span class=\"name\">%s</span> " "<span class=\"name\">%s</span> "
@ -196,9 +227,12 @@ bool directory_convert(struct content *c) {
content_broadcast(c, CONTENT_MSG_ERROR, msg_data); content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
return false; return false;
} }
/* Print a row for each item in the directory */
while ((entry = readdir(parent)) != NULL) { while ((entry = readdir(parent)) != NULL) {
if (!strcmp(entry->d_name, ".") || if (!strcmp(entry->d_name, ".") ||
!strcmp(entry->d_name, "..")) !strcmp(entry->d_name, ".."))
/* Skip . and .. entries */
continue; continue;
extendedinfo = false; extendedinfo = false;
@ -218,6 +252,7 @@ bool directory_convert(struct content *c) {
free(filepath); free(filepath);
} }
/* Start row and print item name */
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<a href=\"%s/%s\" class=\"%s %s\">" "<a href=\"%s/%s\" class=\"%s %s\">"
"<span class=\"name\">%s</span> ", "<span class=\"name\">%s</span> ",
@ -230,16 +265,19 @@ bool directory_convert(struct content *c) {
(uint8_t *) buffer, strlen(buffer)); (uint8_t *) buffer, strlen(buffer));
if (extendedinfo == true) { if (extendedinfo == true) {
/* 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 */
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 */
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>"
@ -249,6 +287,7 @@ bool directory_convert(struct content *c) {
messages_get("FileDirectory"), messages_get("FileDirectory"),
moddate, modtime); moddate, modtime);
} else { } else {
/* File: Print type, size, and date/time */
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<span class=\"type\">%s</span> " "<span class=\"type\">%s</span> "
"<span class=\"size\">%d</span>" "<span class=\"size\">%d</span>"
@ -263,6 +302,7 @@ bool directory_convert(struct content *c) {
moddate, modtime); moddate, modtime);
} }
} else { } else {
/* Not got info, print empty cells */
snprintf(buffer, sizeof(buffer), snprintf(buffer, sizeof(buffer),
"<span class=\"type\"></span> " "<span class=\"type\"></span> "
"<span class=\"size\"></span>" "<span class=\"size\"></span>"