rdelaage
/
httpdirfs
mirror of https://github.com/fangfufu/httpdirfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ran the code through formatter

This commit is contained in:
Fufu Fang 2023-07-26 07:46:24 +08:00
parent 6d8db94458
commit 1e80844831
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.h
View File

@ -24,9 +24,9 @@
#define DEFAULT_NETWORK_MAX_CONNS 10 #define DEFAULT_NETWORK_MAX_CONNS 10
/** /**
* \brief The default refresh_timeout * \brief The default refresh_timeout
*/ */
#define DEFAULT_REFRESH_TIMEOUT 86400 #define DEFAULT_REFRESH_TIMEOUT 86400
/** /**
* \brief Operation modes * \brief Operation modes

9
src/link.c
View File

@ -501,8 +501,7 @@ static void LinkTable_invalid_reset(LinkTable *linktbl)
void LinkTable_free(LinkTable *linktbl) void LinkTable_free(LinkTable *linktbl)
{ {
if (linktbl) if (linktbl) {
{
for (int i = 0; i < linktbl->num; i++) { for (int i = 0; i < linktbl->num; i++) {
LinkTable_free(linktbl->links[i]->next_table); LinkTable_free(linktbl->links[i]->next_table);
FREE(linktbl->links[i]); FREE(linktbl->links[i]);
@ -755,11 +754,9 @@ LinkTable *path_to_Link_LinkTable_new(const char *path)
tmp_link = link; tmp_link = link;
} }
if (next_table) if (next_table) {
{
time_t time_now = time(NULL); time_t time_now = time(NULL);
if (time_now - next_table->index_time > CONFIG.refresh_timeout) if (time_now - next_table->index_time > CONFIG.refresh_timeout) {
{
/* refresh directory contents */ /* refresh directory contents */
LinkTable_free(next_table); LinkTable_free(next_table);
next_table = NULL; next_table = NULL;

31
src/sonic.c
View File

@ -319,27 +319,28 @@ XML_parser_general(void *data, const char *elem, const char **attr)
LinkTable_add(linktbl, link); LinkTable_add(linktbl, link);
} }
static void sanitise_LinkTable(LinkTable *linktbl) { static void sanitise_LinkTable(LinkTable *linktbl)
{
for (int i = 0; i < linktbl->num; i++) { for (int i = 0; i < linktbl->num; i++) {
if (!strcmp(linktbl->links[i]->linkname, ".")) { if (!strcmp(linktbl->links[i]->linkname, ".")) {
/* Note the super long sanitised name to avoid collision */ /* Note the super long sanitised name to avoid collision */
strcpy(linktbl->links[i]->linkname, "__DOT__"); strcpy(linktbl->links[i]->linkname, "__DOT__");
} }
if (!strcmp(linktbl->links[i]->linkname, "/")) { if (!strcmp(linktbl->links[i]->linkname, "/")) {
/* Ditto */ /* Ditto */
strcpy(linktbl->links[i]->linkname, "__FORWARD-SLASH__"); strcpy(linktbl->links[i]->linkname, "__FORWARD-SLASH__");
} }
for (size_t j = 0; j < strlen(linktbl->links[i]->linkname); j++) { for (size_t j = 0; j < strlen(linktbl->links[i]->linkname); j++) {
if (linktbl->links[i]->linkname[j] == '/') { if (linktbl->links[i]->linkname[j] == '/') {
linktbl->links[i]->linkname[j] = '-'; linktbl->links[i]->linkname[j] = '-';
} }
} }
if (linktbl->links[i]->next_table != NULL) { if (linktbl->links[i]->next_table != NULL) {
sanitise_LinkTable(linktbl->links[i]->next_table); sanitise_LinkTable(linktbl->links[i]->next_table);
} }
} }
} }