added a getopt system, with -f and -h flags

1 files changed, 51 insertions, 22 deletions

diff --git a/testing/nTox.c b/testing/nTox.c
index a498e9a1..319002fd 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -85,7 +85,7 @@ void print_friendlist()
     char name[MAX_NAME_LENGTH];
     int i = 0;
     new_lines("[i] Friend List:");
-    while(getname(i++, (uint8_t *)name) != -1) {
+    while(getname(i, (uint8_t *)name) != -1) {
         /* account for the longest name and the longest "base" string */
         char fstring[MAX_NAME_LENGTH + strlen("[i] Friend: NULL\n\tid: ")];
 
@@ -94,10 +94,11 @@ void print_friendlist()
         } else {
             sprintf(fstring, "[i] Friend: %s\n\tid: %i", (uint8_t*)name, i);
         }
+        i++;
         new_lines(fstring);
     }
 
-    if(i == 1)
+    if(i == 0)
         new_lines("\tno friends! D:");
 }
 
@@ -241,8 +242,7 @@ void line_eval(char *line)
             do_refresh();
         }
        else if (inpt_command == 'h') { //help
-           new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
-           new_lines("[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)");
+           new_lines(help);
         }
        else if (inpt_command == 'i') { //info
            char idstring[200];
@@ -358,10 +358,10 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
     new_lines(msg);
 }
 
-void load_key() 
+void load_key(char *path)
 {
-    FILE *data_file = NULL;
-    data_file = fopen("data","r");
+    FILE *data_file = fopen(path, "r");
+
     if (data_file) {
         //load keys
         fseek(data_file, 0, SEEK_END);
@@ -373,12 +373,21 @@ void load_key()
             exit(1);
         }
         Messenger_load(data, size);
+
     } else { 
+        fputs("(saving new keys now)\n", stderr);
+
         //else save new keys
         int size = Messenger_size();
         uint8_t data[size];
         Messenger_save(data);
-        data_file = fopen("data","w");
+        data_file = fopen(path, "w");
+
+        if(!data_file) {
+            perror("[!] load_key");
+            exit(1);
+        }
+
         if (fwrite(data, sizeof(uint8_t), size, data_file) != size){
             printf("[i] could not write data file\n[i] exiting\n");
             exit(1);
@@ -387,38 +396,58 @@ void load_key()
    fclose(data_file);
 }
 
+void print_help(void)
+{
+    printf("nTox %.1f - Command-line tox-core client\n", 0.1);
+    puts("Options:");
+    puts("\t-h\t-\tPrint this help and exit.");
+    puts("\t-f\t-\tSpecify a keyfile to read from.");
+}
+
 int main(int argc, char *argv[])
 {
+    int on = 0;
+    int c = 0;
+    int i = 0;
+    char *filename = "data";
+    char idstring[200] = {0};
+
     if (argc < 4) {
-        printf("[!] Usage: %s [IP] [port] [public_key] <nokey>\n", argv[0]);
+        printf("[!] Usage: %s [IP] [port] [public_key] <keyfile>\n", argv[0]);
         exit(0);
     }
-    int c;
-    int on = 0;
-    initMessenger();
-    //if keyfiles exist
-    if(argc > 4){
-        if(strncmp(argv[4], "nokey", 6) < 0){
-        //load_key();
+
+    for(i = 0; i < argc; i++) {
+        if(argv[i][0] == '-') {
+            if(argv[i][1] == 'h') {
+                print_help();
+                exit(0);
+            } else if(argv[i][1] == 'f') {
+                if(argv[i + 1] != NULL)
+                    filename = argv[i + 1];
+                else {
+                    fputs("[!] you passed '-f' without giving an argument!\n", stderr);
+                }
+            }
         }
-    } else {
-        load_key();
     }
+
+    initMessenger();
+    load_key(filename);
+
     m_callback_friendrequest(print_request);
     m_callback_friendmessage(print_message);
     m_callback_namechange(print_nickchange);
     m_callback_userstatus(print_statuschange);
 
-    char idstring[200];
-    get_id(idstring);
-
     initscr();
     noecho();
     raw();
     getmaxyx(stdscr, y, x);
 
     new_lines("/h for list of commands");
-    new_lines(idstring);
+    get_id(idstring);
+    puts(idstring);
     strcpy(line, "");
 
     IP_Port bootstrap_ip_port;