Ark/mediafire-fuse
1
0
Fork 0
mirror of https://github.com/xorgy/mediafire-fuse synced 2026-01-13 13:14:29 -08:00
Code Issues Packages Projects Releases Wiki Activity

build with -Wall -Wextra -Werror and fix errors

Browse Source
This commit is contained in:
josch
2014-09-19 09:21:28 +02:00
parent ef3b2aa844
commit b322f68ad2
21 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mfshell/commands/auth.c
View File

@@ -36,7 +36,6 @@ _get_passwd_from_user(void);
int
mfshell_cmd_auth(mfshell_t *mfshell, int argc, char **argv)
{
int retval;
char *username;
char *password;

1
mfshell/commands/debug.c
View File

@@ -30,6 +30,7 @@
int
mfshell_cmd_debug(mfshell_t *mfshell, int argc, char **argv)
{
(void)argv;
if (argc != 1) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;

3
mfshell/commands/file.c
View File

@@ -52,6 +52,9 @@ mfshell_cmd_file(mfshell_t *mfshell, int argc, char **argv)
file = file_alloc();
retval = mfconn_api_file_get_info(mfshell->mfconn,file,(char*)quickkey);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
}
mfconn_update_secret_key(mfshell->mfconn);
quickkey = file_get_key(file);

4
mfshell/commands/get.c
View File

@@ -80,9 +80,9 @@ mfshell_cmd_get(mfshell_t *mfshell, int argc, char **argv)
getcwd(mfshell->local_working_dir,PATH_MAX);
}
retval = file_download_direct(file, mfshell->local_working_dir);
bytes_read = file_download_direct(file, mfshell->local_working_dir);
if(retval != -1)
if(bytes_read != -1)
printf("\r Downloaded %zd bytes OK!\n\r",bytes_read);
else
printf("\r\n Download FAILED!\n\r");

10
mfshell/commands/help.c
View File

@@ -28,6 +28,12 @@
int
mfshell_cmd_help(mfshell_t *mfshell, int argc, char **argv)
{
(void)argv;
if (argc != 1) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;
}
printf(
" arguments:\n\r"
" <optional>\n\r"
@@ -35,8 +41,8 @@ mfshell_cmd_help(mfshell_t *mfshell, int argc, char **argv)
printf("\n\r");
int column1_width = 0;
int column2_width = 0;
unsigned int column1_width = 0;
unsigned int column2_width = 0;
_cmd_t* curr_cmd;
for (curr_cmd = mfshell->commands; curr_cmd->name != NULL; curr_cmd++) {

3
mfshell/commands/links.c
View File

@@ -53,6 +53,9 @@ mfshell_cmd_links(mfshell_t *mfshell, int argc, char **argv)
file = file_alloc();
retval = mfconn_api_file_get_links(mfshell->mfconn,file,(char*)quickkey);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
}
mfconn_update_secret_key(mfshell->mfconn);
share_link = file_get_share_link(file);

1
mfshell/commands/list.c
View File

@@ -29,6 +29,7 @@
int
mfshell_cmd_list(mfshell_t *mfshell, int argc, char **argv)
{
(void)argv;
int retval;
const char *folder_curr;

1
mfshell/commands/lpwd.c
View File

@@ -29,6 +29,7 @@
int
mfshell_cmd_lpwd(mfshell_t *mfshell, int argc, char **argv)
{
(void)argv;
if(mfshell == NULL) return -1;
if (argc != 1) {

1
mfshell/commands/pwd.c
View File

@@ -29,6 +29,7 @@
int
mfshell_cmd_pwd(mfshell_t *mfshell, int argc, char **argv)
{
(void)argv;
const char *folder_name;
char *folder_name_tmp = NULL;

1
mfshell/commands/whoami.c
View File

@@ -29,6 +29,7 @@
int
mfshell_cmd_whoami(mfshell_t *mfshell, int argc, char **argv)
{
(void)argv;
int retval;
if (argc != 1) {

19
mfshell/main.c
View File

@@ -35,7 +35,7 @@ mfshell_run(mfshell_t *mfshell);
static void
mfshell_parse_commands(mfshell_t *mfshell, char *command);
void print_help(mfshell_t *mfshell, char *cmd)
void print_help(char *cmd)
{
fprintf(stderr, "A shell to access a MediaFire account.\n");
fprintf(stderr, "\n");
@@ -62,7 +62,7 @@ void print_help(mfshell_t *mfshell, char *cmd)
fprintf(stderr, "\n");
}
void parse_argv(mfshell_t *mfshell, int argc, char **argv, char **username,
void parse_argv(int argc, char **argv, char **username,
char **password, char **server, char **command)
{
static struct option long_options[] = {
@@ -94,7 +94,7 @@ void parse_argv(mfshell_t *mfshell, int argc, char **argv, char **username,
*server = strdup(optarg);
break;
case 'h':
print_help(mfshell, argv[0]);
print_help(argv[0]);
exit(0);
case 'v':
exit(0);
@@ -125,12 +125,10 @@ int main(int argc,char **argv)
char *username = NULL;
char *password = NULL;
char *command = NULL;
size_t len;
int retval;
SSL_library_init();
parse_argv(mfshell, argc, argv, &username, &password, &server, &command);
parse_argv(argc, argv, &username, &password, &server, &command);
mfshell = mfshell_create(35860,
"2c6dq0gb2sr8rgsue5a347lzpjnaay46yjazjcjg",server);
@@ -156,6 +154,15 @@ mfshell_parse_commands(mfshell_t *mfshell, char *command)
while ((next = strsep(&command, ";")) != NULL) {
// FIXME: handle non-zero return value of wordexp
ret = wordexp(next, &p, WRDE_SHOWERR | WRDE_UNDEF);
if (ret != 0) {
switch (ret) {
case WRDE_BADCHAR: fprintf(stderr, "wordexp: WRDE_BADCHAR\n"); break;
case WRDE_BADVAL: fprintf(stderr, "wordexp: WRDE_BADVAL\n"); break;
case WRDE_CMDSUB: fprintf(stderr, "wordexp: WRDE_CMDSUB\n"); break;
case WRDE_NOSPACE: fprintf(stderr, "wordexp: WRDE_NOSPACE\n"); break;
case WRDE_SYNTAX: fprintf(stderr, "wordexp: WRDE_SYNTAX\n"); break;
}
}
if (p.we_wordc < 1) {
fprintf(stderr, "Need more than zero arguments\n");
exit(1);

10
mfshell/mfshell.c
View File

@@ -101,6 +101,7 @@ mfshell_exec(mfshell_t *mfshell, int argc, char **argv)
return curr_cmd->handler(mfshell, argc, argv);
}
}
return -1;
}
int
@@ -114,6 +115,15 @@ mfshell_exec_shell_command(mfshell_t *mfshell,char *command)
// FIXME: handle non-zero return value of wordexp
retval = wordexp(command, &p, WRDE_SHOWERR | WRDE_UNDEF);
if (retval != 0) {
switch (retval) {
case WRDE_BADCHAR: fprintf(stderr, "wordexp: WRDE_BADCHAR\n"); break;
case WRDE_BADVAL: fprintf(stderr, "wordexp: WRDE_BADVAL\n"); break;
case WRDE_CMDSUB: fprintf(stderr, "wordexp: WRDE_CMDSUB\n"); break;
case WRDE_NOSPACE: fprintf(stderr, "wordexp: WRDE_NOSPACE\n"); break;
case WRDE_SYNTAX: fprintf(stderr, "wordexp: WRDE_SYNTAX\n"); break;
}
}
if (p.we_wordc < 1)
return 0;