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

remove the _t postfix from type names because POSIX reserves types ending in _t

Browse Source
This commit is contained in:
josch
2014-09-19 23:13:29 +02:00
parent e0ee1e5f8f
commit 4b2563d800
34 changed files with 294 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mfshell/commands.h
View File

@@ -23,34 +23,34 @@
#include "mfshell.h"
int mfshell_cmd_help(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_help(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_debug(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_debug(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_host(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_host(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_auth(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_auth(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_whomai(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_whomai(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_list(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_list(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_chdir(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_chdir(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_pwd(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_pwd(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_lpwd(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_lpwd(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_lcd(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_lcd(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_file(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_file(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_links(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_links(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_mkdir(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_mkdir(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_get(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_get(mfshell *mfshell, int argc, char **argv);
int mfshell_cmd_whoami(mfshell_t *mfshell, int argc, char **argv);
int mfshell_cmd_whoami(mfshell *mfshell, int argc, char **argv);
#endif

8
mfshell/commands/auth.c
View File

@@ -34,7 +34,7 @@ static char*
_get_passwd_from_user(void);
int
mfshell_cmd_auth(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_auth(mfshell *mfshell, int argc, char **argv)
{
char *username;
char *password;
@@ -62,15 +62,15 @@ mfshell_cmd_auth(mfshell_t *mfshell, int argc, char **argv)
if(username == NULL || password == NULL) return -1;
mfshell->mfconn = mfconn_create(mfshell->server, username, password,
mfshell->conn = mfconn_create(mfshell->server, username, password,
mfshell->app_id, mfshell->app_key);
if (mfshell->mfconn != NULL)
if (mfshell->conn != NULL)
printf("\n\rAuthentication SUCCESS\n\r");
else
printf("\n\rAuthentication FAILURE\n\r");
return (mfshell->mfconn != NULL);
return (mfshell->conn != NULL);
}
char*

8
mfshell/commands/chdir.c
View File

@@ -27,9 +27,9 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_chdir(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_chdir(mfshell *mfshell, int argc, char **argv)
{
folder_t *folder_new;
mffolder *folder_new;
const char *folder_curr;
const char *folder_parent;
const char *folderkey;
@@ -83,9 +83,9 @@ mfshell_cmd_chdir(mfshell_t *mfshell, int argc, char **argv)
}
else
{
retval = mfconn_api_folder_get_info(mfshell->mfconn,
retval = mfconn_api_folder_get_info(mfshell->conn,
folder_new,(char*)folderkey);
mfconn_update_secret_key(mfshell->mfconn);
mfconn_update_secret_key(mfshell->conn);
}
if(retval == 0)

8
mfshell/commands/debug.c
View File

@@ -28,7 +28,7 @@
#include "../commands.h"
int
mfshell_cmd_debug(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_debug(mfshell *mfshell, int argc, char **argv)
{
(void)argv;
if (argc != 1) {
@@ -40,9 +40,9 @@ mfshell_cmd_debug(mfshell_t *mfshell, int argc, char **argv)
"server:",
mfshell->server);
const char *session_token = mfconn_get_session_token(mfshell->mfconn);
const char *secret_time = mfconn_get_secret_time(mfshell->mfconn);
uint32_t secret_key = mfconn_get_secret_key(mfshell->mfconn);
const char *session_token = mfconn_get_session_token(mfshell->conn);
const char *secret_time = mfconn_get_secret_time(mfshell->conn);
uint32_t secret_key = mfconn_get_secret_key(mfshell->conn);
if(session_token != NULL && secret_time != NULL)
{
printf(" %-15.15s %"PRIu32"\n\r",

8
mfshell/commands/file.c
View File

@@ -26,9 +26,9 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_file(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_file(mfshell *mfshell, int argc, char **argv)
{
file_t *file;
mffile *file;
int len;
int retval;
const char *quickkey;
@@ -51,11 +51,11 @@ mfshell_cmd_file(mfshell_t *mfshell, int argc, char **argv)
file = file_alloc();
retval = mfconn_api_file_get_info(mfshell->mfconn,file,(char*)quickkey);
retval = mfconn_api_file_get_info(mfshell->conn,file,(char*)quickkey);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
}
mfconn_update_secret_key(mfshell->mfconn);
mfconn_update_secret_key(mfshell->conn);
quickkey = file_get_key(file);
name = file_get_name(file);

12
mfshell/commands/get.c
View File

@@ -29,9 +29,9 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_get(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_get(mfshell *mfshell, int argc, char **argv)
{
file_t *file;
mffile *file;
int len;
int retval;
ssize_t bytes_read;
@@ -54,8 +54,8 @@ mfshell_cmd_get(mfshell_t *mfshell, int argc, char **argv)
file = file_alloc();
// get file name
retval = mfconn_api_file_get_info(mfshell->mfconn,file,(char*)quickkey);
mfconn_update_secret_key(mfshell->mfconn);
retval = mfconn_api_file_get_info(mfshell->conn,file,(char*)quickkey);
mfconn_update_secret_key(mfshell->conn);
if(retval == -1)
{
@@ -64,8 +64,8 @@ mfshell_cmd_get(mfshell_t *mfshell, int argc, char **argv)
}
// request a direct download (streaming) link
retval = mfconn_api_file_get_links(mfshell->mfconn,file,(char*)quickkey);
mfconn_update_secret_key(mfshell->mfconn);
retval = mfconn_api_file_get_links(mfshell->conn,file,(char*)quickkey);
mfconn_update_secret_key(mfshell->conn);
if(retval == -1)
{

4
mfshell/commands/help.c
View File

@@ -26,7 +26,7 @@
#include "../commands.h"
int
mfshell_cmd_help(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_help(mfshell *mfshell, int argc, char **argv)
{
(void)argv;
if (argc != 1) {
@@ -44,7 +44,7 @@ mfshell_cmd_help(mfshell_t *mfshell, int argc, char **argv)
unsigned int column1_width = 0;
unsigned int column2_width = 0;
cmd_t* curr_cmd;
mfcmd* curr_cmd;
for (curr_cmd = mfshell->commands; curr_cmd->name != NULL; curr_cmd++) {
if (strlen(curr_cmd->name) > column1_width)
column1_width = strlen(curr_cmd->name);

4
mfshell/commands/host.c
View File

@@ -29,7 +29,7 @@ static char*
_get_host_from_user(void);
int
mfshell_cmd_host(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_host(mfshell *mfshell, int argc, char **argv)
{
char *alt_host = NULL;
char *host;
@@ -65,7 +65,7 @@ mfshell_cmd_host(mfshell_t *mfshell, int argc, char **argv)
mfshell->server = strdup(host);
mfconn_destroy(mfshell->mfconn);
mfconn_destroy(mfshell->conn);
if(alt_host != NULL) free(alt_host);

2
mfshell/commands/lcd.c
View File

@@ -27,7 +27,7 @@
#include "../commands.h"
int
mfshell_cmd_lcd(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_lcd(mfshell *mfshell, int argc, char **argv)
{
int retval;
const char *dir;

8
mfshell/commands/links.c
View File

@@ -26,9 +26,9 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_links(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_links(mfshell *mfshell, int argc, char **argv)
{
file_t *file;
mffile *file;
int len;
int retval;
const char *quickkey;
@@ -52,11 +52,11 @@ mfshell_cmd_links(mfshell_t *mfshell, int argc, char **argv)
file = file_alloc();
retval = mfconn_api_file_get_links(mfshell->mfconn,file,(char*)quickkey);
retval = mfconn_api_file_get_links(mfshell->conn,file,(char*)quickkey);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
}
mfconn_update_secret_key(mfshell->mfconn);
mfconn_update_secret_key(mfshell->conn);
share_link = file_get_share_link(file);
direct_link = file_get_direct_link(file);

10
mfshell/commands/list.c
View File

@@ -27,7 +27,7 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_list(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_list(mfshell *mfshell, int argc, char **argv)
{
(void)argv;
int retval;
@@ -51,12 +51,12 @@ mfshell_cmd_list(mfshell_t *mfshell, int argc, char **argv)
folder_set_key(mfshell->folder_curr,"myfiles");
// first folders
retval = mfconn_api_folder_get_content(mfshell->mfconn, 0, mfshell->folder_curr);
mfconn_update_secret_key(mfshell->mfconn);
retval = mfconn_api_folder_get_content(mfshell->conn, 0, mfshell->folder_curr);
mfconn_update_secret_key(mfshell->conn);
// then files
retval = mfconn_api_folder_get_content(mfshell->mfconn, 1, mfshell->folder_curr);
mfconn_update_secret_key(mfshell->mfconn);
retval = mfconn_api_folder_get_content(mfshell->conn, 1, mfshell->folder_curr);
mfconn_update_secret_key(mfshell->conn);
return retval;
}

2
mfshell/commands/lpwd.c
View File

@@ -27,7 +27,7 @@
#include "../commands.h"
int
mfshell_cmd_lpwd(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_lpwd(mfshell *mfshell, int argc, char **argv)
{
(void)argv;
if(mfshell == NULL) return -1;

6
mfshell/commands/mkdir.c
View File

@@ -27,7 +27,7 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_mkdir(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_mkdir(mfshell *mfshell, int argc, char **argv)
{
int retval;
const char *folder_curr;
@@ -55,8 +55,8 @@ mfshell_cmd_mkdir(mfshell_t *mfshell, int argc, char **argv)
folder_curr = folder_get_key(mfshell->folder_curr);
retval = mfconn_api_folder_create(mfshell->mfconn,(char*)folder_curr,(char*)name);
mfconn_update_secret_key(mfshell->mfconn);
retval = mfconn_api_folder_create(mfshell->conn,(char*)folder_curr,(char*)name);
mfconn_update_secret_key(mfshell->conn);
return retval;
}

2
mfshell/commands/pwd.c
View File

@@ -27,7 +27,7 @@
#include "../../utils/strings.h"
int
mfshell_cmd_pwd(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_pwd(mfshell *mfshell, int argc, char **argv)
{
(void)argv;
const char *folder_name;

6
mfshell/commands/whoami.c
View File

@@ -27,7 +27,7 @@
#include "../../mfapi/apicalls.h"
int
mfshell_cmd_whoami(mfshell_t *mfshell, int argc, char **argv)
mfshell_cmd_whoami(mfshell *mfshell, int argc, char **argv)
{
(void)argv;
int retval;
@@ -37,8 +37,8 @@ mfshell_cmd_whoami(mfshell_t *mfshell, int argc, char **argv)
return -1;
}
retval = mfconn_api_user_get_info(mfshell->mfconn);
mfconn_update_secret_key(mfshell->mfconn);
retval = mfconn_api_user_get_info(mfshell->conn);
mfconn_update_secret_key(mfshell->conn);
return retval;
}

10
mfshell/main.c
View File

@@ -30,10 +30,10 @@
#include "../utils/strings.h"
static void
mfshell_run(mfshell_t *mfshell);
mfshell_run(mfshell *mfshell);
static void
mfshell_parse_commands(mfshell_t *mfshell, char *command);
mfshell_parse_commands(mfshell *mfshell, char *command);
void print_help(char *cmd)
{
@@ -120,7 +120,7 @@ void parse_argv(int argc, char **argv, char **username,
int main(int argc,char **argv)
{
mfshell_t *mfshell;
mfshell *mfshell;
char *server = "www.mediafire.com";
char *username = NULL;
char *password = NULL;
@@ -145,7 +145,7 @@ int main(int argc,char **argv)
}
static void
mfshell_parse_commands(mfshell_t *mfshell, char *command)
mfshell_parse_commands(mfshell *mfshell, char *command)
{
char *next;
int ret;
@@ -173,7 +173,7 @@ mfshell_parse_commands(mfshell_t *mfshell, char *command)
}
static void
mfshell_run(mfshell_t *mfshell)
mfshell_run(mfshell *mfshell)
{
char *cmd = NULL;
size_t len;

36
mfshell/mfshell.c
View File

@@ -37,7 +37,7 @@
#include "mfshell.h"
#include "commands.h"
struct cmd_t commands[] = {
struct mfcmd commands[] = {
{"help", "", "show this help", mfshell_cmd_help},
{"debug", "", "show debug information", mfshell_cmd_debug},
{"host", "<server>", "change target server", mfshell_cmd_host},
@@ -60,10 +60,10 @@ struct cmd_t commands[] = {
{NULL, NULL, NULL, NULL}
};
mfshell_t*
mfshell*
mfshell_create(int app_id,char *app_key,char *server)
{
mfshell_t *mfshell;
mfshell *shell;
if(app_id <= 0) return NULL;
if(app_key == NULL) return NULL;
@@ -76,41 +76,41 @@ mfshell_create(int app_id,char *app_key,char *server)
*/
if(strchr(server,'/') != NULL) return NULL;
mfshell = (mfshell_t*)calloc(1,sizeof(mfshell_t));
shell = (mfshell*)calloc(1,sizeof(mfshell));
mfshell->app_id = app_id;
mfshell->app_key = strdup(app_key);
mfshell->server = strdup(server);
shell->app_id = app_id;
shell->app_key = strdup(app_key);
shell->server = strdup(server);
// object to track folder location
mfshell->folder_curr = folder_alloc();
folder_set_key(mfshell->folder_curr,"myfiles");
shell->folder_curr = folder_alloc();
folder_set_key(shell->folder_curr,"myfiles");
// shell commands
mfshell->commands = commands;
shell->commands = commands;
return mfshell;
return shell;
}
int
mfshell_exec(mfshell_t *mfshell, int argc, char **argv)
mfshell_exec(mfshell *shell, int argc, char **argv)
{
cmd_t* curr_cmd;
for (curr_cmd = mfshell->commands; curr_cmd->name != NULL; curr_cmd++) {
mfcmd* curr_cmd;
for (curr_cmd = shell->commands; curr_cmd->name != NULL; curr_cmd++) {
if (strcmp(argv[0], curr_cmd->name) == 0) {
return curr_cmd->handler(mfshell, argc, argv);
return curr_cmd->handler(shell, argc, argv);
}
}
return -1;
}
int
mfshell_exec_shell_command(mfshell_t *mfshell,char *command)
mfshell_exec_shell_command(mfshell *shell,char *command)
{
wordexp_t p;
int retval;
if(mfshell == NULL) return -1;
if(shell == NULL) return -1;
if(command == NULL) return -1;
// FIXME: handle non-zero return value of wordexp
@@ -132,7 +132,7 @@ mfshell_exec_shell_command(mfshell_t *mfshell,char *command)
return 0;
// TODO: handle retval
retval = mfshell_exec(mfshell, p.we_wordc, p.we_wordv);
retval = mfshell_exec(shell, p.we_wordc, p.we_wordv);
wordfree(&p);

24
mfshell/mfshell.h
View File

@@ -24,42 +24,42 @@
#include "../mfapi/folder.h"
#include "../mfapi/mfconn.h"
typedef struct cmd_t cmd_t;
typedef struct mfshell_t mfshell_t;
typedef struct mfcmd mfcmd;
typedef struct mfshell mfshell;
struct cmd_t
struct mfcmd
{
char *name;
char *argstring;
char *help;
int (*handler) (mfshell_t *mfshell, int argc, char **argv);
int (*handler) (mfshell *mfshell, int argc, char **argv);
};
struct mfshell_t
struct mfshell
{
int app_id;
char *app_key;
char *server;
/* REST API tracking */
folder_t *folder_curr;
mffolder *folder_curr;
/* Local tracking */
char *local_working_dir;
/* shell commands */
cmd_t *commands;
mfcmd *commands;
mfconn_t *mfconn;
mfconn *conn;
};
mfshell_t* mfshell_create(int app_id,char *app_key,char *server);
mfshell* mfshell_create(int app_id,char *app_key,char *server);
int mfshell_authenticate_user(mfshell_t *mfshell);
int mfshell_authenticate_user(mfshell *mfshell);
int mfshell_exec(mfshell_t *mfshell, int argc, char **argv);
int mfshell_exec(mfshell *mfshell, int argc, char **argv);
int mfshell_exec_shell_command(mfshell_t *mfshell,char *command);
int mfshell_exec_shell_command(mfshell *mfshell,char *command);
#endif