check whether a connection exists before executing certain commands

This commit is contained in:
josch
2014-10-25 11:34:34 +02:00
parent 5e24f47c10
commit fe17cb517f
11 changed files with 78 additions and 3 deletions

View File

@@ -38,6 +38,11 @@ int mfshell_cmd_changes(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
switch (argc) {
case 1:
revision = 0;
@@ -54,6 +59,11 @@ int mfshell_cmd_changes(mfshell * mfshell, int argc, char *const argv[])
retval = mfconn_api_device_get_changes(mfshell->conn, revision, &changes);
mfconn_update_secret_key(mfshell->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_device_get_changes failed\n");
return -1;
}
for (i = 0; changes[i].change != MFCONN_DEVICE_CHANGE_END; i++) {
switch (changes[i].change) {
case MFCONN_DEVICE_CHANGE_DELETED_FOLDER:

View File

@@ -77,9 +77,18 @@ int mfshell_cmd_chdir(mfshell * mfshell, int argc, char *const argv[])
folder_set_key(folder_new, NULL);
retval = 0;
} else {
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
retval = mfconn_api_folder_get_info(mfshell->conn,
folder_new, (char *)folderkey);
mfconn_update_secret_key(mfshell->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_folder_get_info failed\n");
return -1;
}
}
if (retval == 0) {

View File

@@ -38,6 +38,11 @@ int mfshell_cmd_file(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 2) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;
@@ -55,11 +60,13 @@ int mfshell_cmd_file(mfshell * mfshell, int argc, char *const argv[])
file = file_alloc();
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->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_file_get_info failed\n");
return -1;
}
quickkey = file_get_key(file);
name = file_get_name(file);
hash = file_get_hash(file);

View File

@@ -52,6 +52,11 @@ int mfshell_cmd_folder(mfshell * mfshell, int argc, char *const argv[])
return -1;
}
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
switch (argc) {
case 1:
folderkey = NULL;

View File

@@ -42,6 +42,11 @@ int mfshell_cmd_get(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 2) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;

View File

@@ -39,6 +39,11 @@ int mfshell_cmd_links(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 2) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;

View File

@@ -38,6 +38,11 @@ int mfshell_cmd_list(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 1) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;
@@ -50,6 +55,10 @@ int mfshell_cmd_list(mfshell * mfshell, int argc, char *const argv[])
&folder_result, NULL);
mfconn_update_secret_key(mfshell->conn);
if (folder_result == NULL) {
return -1;
}
for (i = 0; folder_result[i] != NULL; i++) {
printf("%s %s\n", folder_get_name(folder_result[i]),
folder_get_key(folder_result[i]));

View File

@@ -34,6 +34,11 @@ int mfshell_cmd_mkdir(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 2) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;

View File

@@ -33,6 +33,11 @@ int mfshell_cmd_rmdir(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 2) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;

View File

@@ -35,6 +35,11 @@ int mfshell_cmd_status(mfshell * mfshell, int argc, char *const argv[])
if (mfshell == NULL)
return -1;
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 1) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;

View File

@@ -29,6 +29,16 @@ int mfshell_cmd_whoami(mfshell * mfshell, int argc, char *const argv[])
(void)argv;
int retval;
if (mfshell == NULL) {
fprintf(stderr, "mfshell is NULL\n");
return -1;
}
if (mfshell->conn == NULL) {
fprintf(stderr, "conn is NULL\n");
return -1;
}
if (argc != 1) {
fprintf(stderr, "Invalid number of arguments\n");
return -1;