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

changed indentation style

This commit is contained in:
Fufu Fang 2021-08-31 11:18:39 +01:00
parent f791ceb308
commit 45d8cb8136
No known key found for this signature in database
GPG Key ID: 0F6BB5EF6F8BB729
16 changed files with 2546 additions and 2581 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,3 +12,5 @@ doc
# Editor related
*.kate-swp
.vscode
*.c~
*.h~

2
src/README.md
View File

@ -3,4 +3,4 @@
- Static global variables: lower case letters
- Function names: TypeName_verb or verb_noun
- Type names: camel case with the first letter capitalised, e.g. CamelCase
- Indentation style: ``indent -linux $SOURCE_FILES``
- Indentation style: ``indent -kr -nut *.c *.h``

43
src/cache.c
View File

@ -119,8 +119,7 @@ void CacheSystem_init(const char *path, int url_supplied)
*/
sonic_path = path_append(META_DIR, "rest/");
if (mkdir
(sonic_path,
S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
(sonic_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
&& (errno != EEXIST)) {
lprintf(fatal, "mkdir(): %s\n", strerror(errno));
}
@ -131,8 +130,7 @@ void CacheSystem_init(const char *path, int url_supplied)
*/
sonic_path = path_append(DATA_DIR, "rest/");
if (mkdir
(sonic_path,
S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
(sonic_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
&& (errno != EEXIST)) {
lprintf(fatal, "mkdir(): %s\n", strerror(errno));
}
@ -256,8 +254,7 @@ static int Meta_write(Cache * cf)
* These things really should not be zero!!!
*/
if (!cf->content_length || !cf->blksz || !cf->segbc) {
lprintf(error,
"Warning: content_length: %ld, blksz: %d, segbc: \
lprintf(error, "Warning: content_length: %ld, blksz: %d, segbc: \
%ld\n", cf->content_length, cf->blksz, cf->segbc);
}
@ -370,14 +367,12 @@ static long Data_read(Cache * cf, uint8_t * buf, off_t len, off_t offset)
byte_read = fread(buf, sizeof(uint8_t), len, cf->dfp);
if (byte_read != len) {
lprintf(debug,
"fread(): requested %ld, returned %ld!\n",
len, byte_read);
"fread(): requested %ld, returned %ld!\n", len, byte_read);
if (feof(cf->dfp)) {
/*
* reached EOF
*/
lprintf(error,
"fread(): reached the end of the file!\n");
lprintf(error, "fread(): reached the end of the file!\n");
}
if (ferror(cf->dfp)) {
/*
@ -405,7 +400,8 @@ static long Data_read(Cache * cf, uint8_t * buf, off_t len, off_t offset)
* - -1 when the data file does not exist
* - otherwise, the number of bytes written.
*/
static long Data_write(Cache * cf, const uint8_t * buf, off_t len, off_t offset)
static long Data_write(Cache * cf, const uint8_t * buf, off_t len,
off_t offset)
{
if (len == 0) {
/*
@ -563,14 +559,12 @@ static int Cache_exist(const char *fn)
if (no_meta) {
lprintf(warning, "Cache file partially missing.\n");
if (unlink(datafn)) {
lprintf(error, "unlink(): %s\n",
strerror(errno));
lprintf(error, "unlink(): %s\n", strerror(errno));
}
}
if (no_data) {
if (unlink(metafn)) {
lprintf(error, "unlink(): %s\n",
strerror(errno));
lprintf(error, "unlink(): %s\n", strerror(errno));
}
}
}
@ -761,8 +755,7 @@ Cache *Cache_open(const char *fn)
if (Cache_exist(fn)) {
lprintf(cache_lock_debug,
"thread %x: unlocking cf_lock;\n",
pthread_self());
"thread %x: unlocking cf_lock;\n", pthread_self());
PTHREAD_MUTEX_UNLOCK(&cf_lock);
return NULL;
}
@ -770,8 +763,7 @@ Cache *Cache_open(const char *fn)
if (Cache_exist(link->sonic_id)) {
lprintf(cache_lock_debug,
"thread %x: unlocking cf_lock;\n",
pthread_self());
"thread %x: unlocking cf_lock;\n", pthread_self());
PTHREAD_MUTEX_UNLOCK(&cf_lock);
return NULL;
}
@ -951,7 +943,7 @@ static void *Cache_bgdl(void *arg)
uint8_t *recv_buf = CALLOC(cf->blksz, sizeof(uint8_t));
lprintf(debug, "thread %x spawned.\n ", pthread_self());
long recv = path_download(cf->fs_path, (char *)recv_buf, cf->blksz,
long recv = path_download(cf->fs_path, (char *) recv_buf, cf->blksz,
cf->next_dl_offset);
if (recv < 0) {
lprintf(error, "thread %x received %ld bytes, \
@ -1015,12 +1007,10 @@ Cache_read(Cache * cf, char *const output_buf, const off_t len,
* download thread. Send it off and unlock the I/O
*/
send =
Data_read(cf, (uint8_t *) output_buf, len,
offset_start);
Data_read(cf, (uint8_t *) output_buf, len, offset_start);
lprintf(cache_lock_debug,
"thread %x: unlocking w_lock;\n",
pthread_self());
"thread %x: unlocking w_lock;\n", pthread_self());
PTHREAD_MUTEX_UNLOCK(&cf->w_lock);
goto bgdl;
@ -1034,7 +1024,7 @@ Cache_read(Cache * cf, char *const output_buf, const off_t len,
uint8_t *recv_buf = CALLOC(cf->blksz, sizeof(uint8_t));
lprintf(debug, "thread %x: spawned.\n ", pthread_self());
long recv = path_download(cf->fs_path, (char *)recv_buf, cf->blksz,
long recv = path_download(cf->fs_path, (char *) recv_buf, cf->blksz,
dl_offset);
if (recv < 0) {
lprintf(error, "thread %x received %ld bytes, \
@ -1075,8 +1065,7 @@ error.\n", recv, cf->blksz);
*/
if (!pthread_mutex_trylock(&cf->bgt_lock)) {
lprintf(cache_lock_debug,
"thread %x: trylocked bgt_lock;\n",
pthread_self());
"thread %x: trylocked bgt_lock;\n", pthread_self());
cf->next_dl_offset = next_dl_offset;
if (pthread_create(&cf->bgt, NULL, Cache_bgdl, cf)) {
lprintf(error,

8
src/fuse_local.c
View File

@ -14,14 +14,14 @@
static void *fs_init(struct fuse_conn_info *conn)
{
(void)conn;
(void) conn;
return NULL;
}
/** \brief release an opened file */
static int fs_release(const char *path, struct fuse_file_info *fi)
{
(void)path;
(void) path;
if (CACHE_SYSTEM_INIT) {
Cache_close((Cache *) fi->fh);
}
@ -131,8 +131,8 @@ static int
fs_readdir(const char *path, void *buf, fuse_fill_dir_t dir_add,
off_t offset, struct fuse_file_info *fi)
{
(void)offset;
(void)fi;
(void) offset;
(void) fi;
LinkTable *linktbl;

66
src/link.c
View File

@ -96,7 +96,8 @@ LinkTable *LinkSystem_init(const char *raw_url)
void LinkTable_add(LinkTable * linktbl, Link * link)
{
linktbl->num++;
linktbl->links = realloc(linktbl->links, linktbl->num * sizeof(Link *));
linktbl->links =
realloc(linktbl->links, linktbl->num * sizeof(Link *));
if (!linktbl->links) {
lprintf(fatal, "realloc() failure!\n");
}
@ -166,10 +167,8 @@ static int linknames_equal(char *linkname, const char *linkname_new)
*/
if (!strncmp
(linkname, linkname_new, strnlen(linkname, MAX_FILENAME_LEN))) {
size_t linkname_new_len =
strnlen(linkname_new, MAX_FILENAME_LEN);
if ((linkname_new_len - strnlen(linkname, MAX_FILENAME_LEN) ==
1)
size_t linkname_new_len = strnlen(linkname_new, MAX_FILENAME_LEN);
if ((linkname_new_len - strnlen(linkname, MAX_FILENAME_LEN) == 1)
&& (linkname_new[linkname_new_len - 1] == '/')) {
return 1;
}
@ -188,7 +187,8 @@ static void HTML_to_LinkTable(GumboNode * node, LinkTable * linktbl)
}
GumboAttribute *href;
if (node->v.element.tag == GUMBO_TAG_A &&
(href = gumbo_get_attribute(&node->v.element.attributes, "href"))) {
(href =
gumbo_get_attribute(&node->v.element.attributes, "href"))) {
/*
* if it is valid, copy the link onto the heap
*/
@ -370,8 +370,7 @@ static void LinkTable_fill(LinkTable * linktbl)
CURL *c = curl_easy_init();
unescaped_linkname = curl_easy_unescape(c, this_link->linkname,
0, NULL);
strncpy(this_link->linkname, unescaped_linkname,
MAX_FILENAME_LEN);
strncpy(this_link->linkname, unescaped_linkname, MAX_FILENAME_LEN);
curl_free(unescaped_linkname);
curl_easy_cleanup(c);
}
@ -439,7 +438,7 @@ DataStruct Link_to_DataStruct(Link * head_link)
buf.size = 0;
buf.data = NULL;
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&buf);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &buf);
/*
* If we get temporary HTTP failure, wait for 5 seconds before retry
@ -455,8 +454,7 @@ DataStruct Link_to_DataStruct(Link * head_link)
sleep(CONFIG.http_wait_sec);
} else if (http_resp != HTTP_OK) {
lprintf(warning,
"cannot retrieve URL: %s, HTTP %ld\n",
url, http_resp);
"cannot retrieve URL: %s, HTTP %ld\n", url, http_resp);
buf.size = 0;
curl_easy_cleanup(curl);
return buf;
@ -507,7 +505,8 @@ LinkTable *LinkTable_new(const char *url)
int skip_fill = 0;
char *unescaped_path;
CURL *c = curl_easy_init();
unescaped_path = curl_easy_unescape(c, url + ROOT_LINK_OFFSET, 0, NULL);
unescaped_path =
curl_easy_unescape(c, url + ROOT_LINK_OFFSET, 0, NULL);
if (CACHE_SYSTEM_INIT) {
CacheDir_create(unescaped_path);
LinkTable *disk_linktbl;
@ -590,11 +589,9 @@ int LinkTable_disk_save(LinkTable * linktbl, const char *dirn)
for (int i = 0; i < linktbl->num; i++) {
fwrite(linktbl->links[i]->linkname, sizeof(char),
MAX_FILENAME_LEN, fp);
fwrite(linktbl->links[i]->f_url, sizeof(char), MAX_PATH_LEN,
fp);
fwrite(linktbl->links[i]->f_url, sizeof(char), MAX_PATH_LEN, fp);
fwrite(&linktbl->links[i]->type, sizeof(LinkType), 1, fp);
fwrite(&linktbl->links[i]->content_length, sizeof(size_t), 1,
fp);
fwrite(&linktbl->links[i]->content_length, sizeof(size_t), 1, fp);
fwrite(&linktbl->links[i]->time, sizeof(long), 1, fp);
}
@ -641,8 +638,7 @@ LinkTable *LinkTable_disk_open(const char *dirn)
MAX_FILENAME_LEN, fp);
fread(linktbl->links[i]->f_url, sizeof(char), MAX_PATH_LEN, fp);
fread(&linktbl->links[i]->type, sizeof(LinkType), 1, fp);
fread(&linktbl->links[i]->content_length, sizeof(size_t), 1,
fp);
fread(&linktbl->links[i]->content_length, sizeof(size_t), 1, fp);
fread(&linktbl->links[i]->time, sizeof(long), 1, fp);
if (feof(fp)) {
/*
@ -676,8 +672,7 @@ LinkTable *path_to_Link_LinkTable_new(const char *path)
next_table = LinkTable_new(link->f_url);
} else if (CONFIG.mode == SONIC) {
if (!CONFIG.sonic_id3) {
next_table =
sonic_LinkTable_new_index(link->sonic_id);
next_table = sonic_LinkTable_new_index(link->sonic_id);
} else {
next_table =
sonic_LinkTable_new_id3(link->sonic_depth,
@ -715,8 +710,7 @@ static Link *path_to_Link_recursive(char *path, LinkTable * linktbl)
*/
for (int i = 1; i < linktbl->num; i++) {
if (!strncmp
(path, linktbl->links[i]->linkname,
MAX_FILENAME_LEN)) {
(path, linktbl->links[i]->linkname, MAX_FILENAME_LEN)) {
/*
* We found our link
*/
@ -740,40 +734,33 @@ static Link *path_to_Link_recursive(char *path, LinkTable * linktbl)
char *next_path = slash + 1;
for (int i = 1; i < linktbl->num; i++) {
if (!strncmp
(path, linktbl->links[i]->linkname,
MAX_FILENAME_LEN)) {
(path, linktbl->links[i]->linkname, MAX_FILENAME_LEN)) {
/*
* The next sub-directory exists
*/
LinkTable *next_table =
linktbl->links[i]->next_table;
LinkTable *next_table = linktbl->links[i]->next_table;
if (!next_table) {
if (CONFIG.mode == NORMAL) {
next_table =
LinkTable_new(linktbl->links
[i]->f_url);
LinkTable_new(linktbl->links[i]->f_url);
} else if (CONFIG.mode == SONIC) {
if (!CONFIG.sonic_id3) {
next_table =
sonic_LinkTable_new_index
(linktbl->links
[i]->sonic_id);
(linktbl->links[i]->sonic_id);
} else {
next_table =
sonic_LinkTable_new_id3
(linktbl->links
[i]->sonic_depth,
linktbl->links
[i]->sonic_id);
linktbl->links[i]->sonic_id);
}
} else {
lprintf(fatal,
"Invalid CONFIG.mode\n");
lprintf(fatal, "Invalid CONFIG.mode\n");
}
}
linktbl->links[i]->next_table = next_table;
return path_to_Link_recursive(next_path,
next_table);
return path_to_Link_recursive(next_path, next_table);
}
}
}
@ -800,7 +787,8 @@ Link *path_to_Link(const char *path)
}
long
path_download(const char *path, char *output_buf, size_t size, off_t offset)
path_download(const char *path, char *output_buf, size_t size,
off_t offset)
{
if (!path) {
lprintf(fatal, "\npath_download(): NULL path supplied\n");
@ -822,13 +810,13 @@ path_download(const char *path, char *output_buf, size_t size, off_t offset)
buf.data = NULL;
CURL *curl = Link_to_curl(link);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&buf);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &buf);
curl_easy_setopt(curl, CURLOPT_RANGE, range_str);
DataStruct header;
header.size = 0;
header.data = NULL;
curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *)&header);
curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *) &header);
transfer_blocking(curl);

71
src/main.c
View File

@ -90,7 +90,8 @@ int main(int argc, char **argv)
* The second last remaining argument is the URL
*/
char *base_url = argv[argc - 2];
if (strncmp(base_url, "http://", 7) && strncmp(base_url, "https://", 8)) {
if (strncmp(base_url, "http://", 7)
&& strncmp(base_url, "https://", 8)) {
fprintf(stderr, "Error: Please supply a valid URL.\n");
print_help(argv[0], 0);
exit(EXIT_FAILURE);
@ -123,8 +124,7 @@ void parse_config_file(char ***argv, int *argc)
if (!xdg_config_home) {
char *home = getenv("HOME");
char *xdg_config_home_default = "/.config";
xdg_config_home =
path_append(home, xdg_config_home_default);
xdg_config_home = path_append(home, xdg_config_home_default);
}
full_path = path_append(xdg_config_home, "/httpdirfs/config");
} else {
@ -145,28 +145,21 @@ void parse_config_file(char ***argv, int *argc)
char *space;
space = strchr(buf, ' ');
if (!space) {
*argv =
realloc(*argv,
*argc * sizeof(char **));
(*argv)[*argc - 1] =
strndup(buf, buf_len);
*argv = realloc(*argv, *argc * sizeof(char **));
(*argv)[*argc - 1] = strndup(buf, buf_len);
} else {
(*argc)++;
*argv =
realloc(*argv,
*argc * sizeof(char **));
*argv = realloc(*argv, *argc * sizeof(char **));
/*
* Only copy up to the space character
*/
(*argv)[*argc - 2] =
strndup(buf, space - buf);
(*argv)[*argc - 2] = strndup(buf, space - buf);
/*
* Starts copying after the space
*/
(*argv)[*argc - 1] = strndup(space + 1,
buf_len -
(space +
1 - buf));
(space + 1 - buf));
}
}
}
@ -184,30 +177,30 @@ parse_arg_list(int argc, char **argv, char ***fuse_argv, int *fuse_argc)
/*
* Note that 'L' is returned for long options
*/
{"help", no_argument, NULL, 'h'}, /* 0 */
{"version", no_argument, NULL, 'V'}, /* 1 */
{"debug", no_argument, NULL, 'd'}, /* 2 */
{"username", required_argument, NULL, 'u'}, /* 3 */
{"password", required_argument, NULL, 'p'}, /* 4 */
{"proxy", required_argument, NULL, 'P'}, /* 5 */
{"proxy-username", required_argument, NULL, 'L'}, /* 6 */
{"proxy-password", required_argument, NULL, 'L'}, /* 7 */
{"cache", no_argument, NULL, 'L'}, /* 8 */
{"dl-seg-size", required_argument, NULL, 'L'}, /* 9 */
{"max-seg-count", required_argument, NULL, 'L'}, /* 10 */
{"max-conns", required_argument, NULL, 'L'}, /* 11 */
{"user-agent", required_argument, NULL, 'L'}, /* 12 */
{"retry-wait", required_argument, NULL, 'L'}, /* 13 */
{"cache-location", required_argument, NULL, 'L'}, /* 14 */
{"sonic-username", required_argument, NULL, 'L'}, /* 15 */
{"sonic-password", required_argument, NULL, 'L'}, /* 16 */
{"sonic-id3", no_argument, NULL, 'L'}, /* 17 */
{"no-range-check", no_argument, NULL, 'L'}, /* 18 */
{"sonic-insecure", no_argument, NULL, 'L'}, /* 19 */
{"insecure-tls", no_argument, NULL, 'L'}, /* 20 */
{"config", required_argument, NULL, 'L'}, /* 21 */
{"single-file-mode", required_argument, NULL, 'L'}, /* 22 */
{0, 0, 0, 0}
{ "help", no_argument, NULL, 'h' }, /* 0 */
{ "version", no_argument, NULL, 'V' }, /* 1 */
{ "debug", no_argument, NULL, 'd' }, /* 2 */
{ "username", required_argument, NULL, 'u' }, /* 3 */
{ "password", required_argument, NULL, 'p' }, /* 4 */
{ "proxy", required_argument, NULL, 'P' }, /* 5 */
{ "proxy-username", required_argument, NULL, 'L' }, /* 6 */
{ "proxy-password", required_argument, NULL, 'L' }, /* 7 */
{ "cache", no_argument, NULL, 'L' }, /* 8 */
{ "dl-seg-size", required_argument, NULL, 'L' }, /* 9 */
{ "max-seg-count", required_argument, NULL, 'L' }, /* 10 */
{ "max-conns", required_argument, NULL, 'L' }, /* 11 */
{ "user-agent", required_argument, NULL, 'L' }, /* 12 */
{ "retry-wait", required_argument, NULL, 'L' }, /* 13 */
{ "cache-location", required_argument, NULL, 'L' }, /* 14 */
{ "sonic-username", required_argument, NULL, 'L' }, /* 15 */
{ "sonic-password", required_argument, NULL, 'L' }, /* 16 */
{ "sonic-id3", no_argument, NULL, 'L' }, /* 17 */
{ "no-range-check", no_argument, NULL, 'L' }, /* 18 */
{ "sonic-insecure", no_argument, NULL, 'L' }, /* 19 */
{ "insecure-tls", no_argument, NULL, 'L' }, /* 20 */
{ "config", required_argument, NULL, 'L' }, /* 21 */
{ "single-file-mode", required_argument, NULL, 'L' }, /* 22 */
{ 0, 0, 0, 0 }
};
while ((c =
getopt_long(argc, argv, short_opts, long_opts,

34
src/network.c
View File

@ -39,8 +39,8 @@ static pthread_mutex_t curl_lock;
*/
static void crypto_lock_callback(int mode, int type, char *file, int line)
{
(void)file;
(void)line;
(void) file;
(void) line;
if (mode & CRYPTO_LOCK) {
PTHREAD_MUTEX_LOCK(&(crypto_lockarray[type]));
} else {
@ -56,7 +56,7 @@ static unsigned long thread_id(void)
{
unsigned long ret;
ret = (unsigned long)pthread_self();
ret = (unsigned long) pthread_self();
return ret;
}
@ -76,8 +76,8 @@ failed!\n", i);
};
}
CRYPTO_set_id_callback((unsigned long (*)())thread_id);
CRYPTO_set_locking_callback((void (*)())crypto_lock_callback);
CRYPTO_set_id_callback((unsigned long (*)()) thread_id);
CRYPTO_set_locking_callback((void (*)()) crypto_lock_callback);
}
/**
@ -89,19 +89,19 @@ static void
curl_callback_lock(CURL * handle, curl_lock_data data,
curl_lock_access access, void *userptr)
{
(void)access; /* unused */
(void)userptr; /* unused */
(void)handle; /* unused */
(void)data; /* unused */
(void) access; /* unused */
(void) userptr; /* unused */
(void) handle; /* unused */
(void) data; /* unused */
PTHREAD_MUTEX_LOCK(&curl_lock);
}
static void
curl_callback_unlock(CURL * handle, curl_lock_data data, void *userptr)
{
(void)userptr; /* unused */
(void)handle; /* unused */
(void)data; /* unused */
(void) userptr; /* unused */
(void) handle; /* unused */
(void) data; /* unused */
PTHREAD_MUTEX_UNLOCK(&curl_lock);
}
@ -113,8 +113,8 @@ curl_callback_unlock(CURL * handle, curl_lock_data data, void *userptr)
static void
curl_process_msgs(CURLMsg * curl_msg, int n_running_curl, int n_mesgs)
{
(void)n_running_curl;
(void)n_mesgs;
(void) n_running_curl;
(void) n_mesgs;
static volatile int slept = 0;
if (curl_msg->msg == CURLMSG_DONE) {
TransferStruct *transfer;
@ -229,8 +229,7 @@ int curl_multi_perform_once(void)
if (maxfd == -1) {
usleep(100 * 1000);
} else {
if (select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout) <
0) {
if (select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout) < 0) {
lprintf(error, "select(): %s.\n", strerror(errno));
}
}
@ -354,7 +353,8 @@ void transfer_nonblocking(CURL * curl)
}
size_t
write_memory_callback(void *contents, size_t size, size_t nmemb, void *userp)
write_memory_callback(void *contents, size_t size, size_t nmemb,
void *userp)
{
size_t realsize = size * nmemb;
DataStruct *mem = (DataStruct *) userp;

3
src/network.h
View File

@ -35,7 +35,8 @@ void transfer_nonblocking(CURL * curl);
/** \brief callback function for file transfer */
size_t
write_memory_callback(void *contents, size_t size, size_t nmemb, void *userp);
write_memory_callback(void *contents, size_t size, size_t nmemb,
void *userp);
/**
* \brief check if a HTTP response code corresponds to a temporary failure

40
src/sonic.c
View File

@ -63,8 +63,7 @@ static char *sonic_gen_auth_str(void)
{
if (!CONFIG.sonic_insecure) {
char *salt = generate_salt();
size_t pwd_len =
strnlen(SONIC_CONFIG.password, MAX_FILENAME_LEN);
size_t pwd_len = strnlen(SONIC_CONFIG.password, MAX_FILENAME_LEN);
size_t pwd_salt_len = pwd_len + strnlen(salt, MAX_FILENAME_LEN);
char *pwd_salt = CALLOC(pwd_salt_len + 1, sizeof(char));
strncat(pwd_salt, SONIC_CONFIG.password, MAX_FILENAME_LEN);
@ -206,7 +205,8 @@ XML_parser_general(void *data, const char *elem, const char **attr)
* The new table should be a level 4 song table
*/
link->sonic_depth = 4;
} else if (!strcmp(elem, "song") && linktbl->links[0]->sonic_depth == 4) {
} else if (!strcmp(elem, "song")
&& linktbl->links[0]->sonic_depth == 4) {
link = CALLOC(1, sizeof(Link));
link->type = LINK_FILE;
} else {
@ -224,8 +224,7 @@ XML_parser_general(void *data, const char *elem, const char **attr)
char *suffix = "";
for (int i = 0; attr[i]; i += 2) {
if (!strcmp("id", attr[i])) {
link->sonic_id =
CALLOC(MAX_FILENAME_LEN + 1, sizeof(char));
link->sonic_id = CALLOC(MAX_FILENAME_LEN + 1, sizeof(char));
strncpy(link->sonic_id, attr[i + 1], MAX_FILENAME_LEN);
id_set = 1;
continue;
@ -238,11 +237,9 @@ XML_parser_general(void *data, const char *elem, const char **attr)
*/
char *s = strrchr(attr[i + 1], '/');
if (s) {
strncpy(link->linkname, s + 1,
MAX_FILENAME_LEN);
strncpy(link->linkname, s + 1, MAX_FILENAME_LEN);
} else {
strncpy(link->linkname, attr[i + 1],
MAX_FILENAME_LEN);
strncpy(link->linkname, attr[i + 1], MAX_FILENAME_LEN);
}
linkname_set = 1;
continue;
@ -256,8 +253,7 @@ XML_parser_general(void *data, const char *elem, const char **attr)
if (!linkname_set) {
if (!strcmp("title", attr[i])
|| !strcmp("name", attr[i])) {
strncpy(link->linkname, attr[i + 1],
MAX_FILENAME_LEN);
strncpy(link->linkname, attr[i + 1], MAX_FILENAME_LEN);
linkname_set = 1;
continue;
}
@ -289,12 +285,12 @@ XML_parser_general(void *data, const char *elem, const char **attr)
}
if (!strcmp("title", attr[i])) {
title = (char *)attr[i + 1];
title = (char *) attr[i + 1];
continue;
}
if (!strcmp("suffix", attr[i])) {
suffix = (char *)attr[i + 1];
suffix = (char *) attr[i + 1];
continue;
}
}
@ -371,7 +367,8 @@ LinkTable *sonic_LinkTable_new_index(const char *id)
} else {
url = sonic_gen_url_first_part("getIndexes");
}
LinkTable *linktbl = sonic_url_to_LinkTable(url, XML_parser_general, 0);
LinkTable *linktbl =
sonic_url_to_LinkTable(url, XML_parser_general, 0);
FREE(url);
return linktbl;
}
@ -408,8 +405,7 @@ XML_parser_id3_root(void *data, const char *elem, const char **attr)
link->type = LINK_DIR;
for (int i = 0; attr[i]; i += 2) {
if (!strcmp("name", attr[i])) {
strncpy(link->linkname, attr[i + 1],
MAX_FILENAME_LEN);
strncpy(link->linkname, attr[i + 1], MAX_FILENAME_LEN);
linkname_set = 1;
/*
* Allocate a new LinkTable
@ -435,8 +431,7 @@ XML_parser_id3_root(void *data, const char *elem, const char **attr)
link->sonic_depth = 3;
for (int i = 0; attr[i]; i += 2) {
if (!strcmp("name", attr[i])) {
strncpy(link->linkname, attr[i + 1],
MAX_FILENAME_LEN);
strncpy(link->linkname, attr[i + 1], MAX_FILENAME_LEN);
linkname_set = 1;
continue;
}
@ -444,8 +439,7 @@ XML_parser_id3_root(void *data, const char *elem, const char **attr)
if (!strcmp("id", attr[i])) {
link->sonic_id =
CALLOC(MAX_FILENAME_LEN + 1, sizeof(char));
strncpy(link->sonic_id, attr[i + 1],
MAX_FILENAME_LEN);
strncpy(link->sonic_id, attr[i + 1], MAX_FILENAME_LEN);
id_set = 1;
continue;
}
@ -485,8 +479,7 @@ LinkTable *sonic_LinkTable_new_id3(int depth, const char *id)
*/
case 3:
url = sonic_getArtist_link(id);
linktbl =
sonic_url_to_LinkTable(url, XML_parser_general, depth);
linktbl = sonic_url_to_LinkTable(url, XML_parser_general, depth);
FREE(url);
break;
/*
@ -494,8 +487,7 @@ LinkTable *sonic_LinkTable_new_id3(int depth, const char *id)
*/
case 4:
url = sonic_getAlbum_link(id);
linktbl =
sonic_url_to_LinkTable(url, XML_parser_general, depth);
linktbl = sonic_url_to_LinkTable(url, XML_parser_general, depth);
FREE(url);
break;
default: