]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/cli-stub.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / cli-stub.c
index c1194c1cbe733283dc60a7f674e15e533464ab3c..4cd8d264bbff08005675b16c0a50e6d7642fa780 100644 (file)
@@ -1,7 +1,7 @@
 /* cli.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
- * 
+ *
  * author: Daniel Otte
- * email:  daniel.otte@rub.de
+ * email:  bg@nerilex.org
  * license: GPLv3 or later
- * 
+ *
  * components to help implementing simple command based interaction
- * 
+ *
  **/
-#include <stdlib.h> 
+
+#include <stdlib.h>
 #include <stdint.h>
 #include <ctype.h>
 #include <string.h>
@@ -40,21 +40,21 @@ cli_rx_fpt cli_rx = NULL;
 cli_tx_fpt cli_tx = NULL;
 uint8_t    cli_echo = 1;
 
-void     echo_ctrl(chars);
+void     echo_ctrl(char *s);
 uint16_t max_cmd_length(PGM_VOID_P cmdlist);
-int8_t   search_and_call(charcmd, uint16_t maxcmdlength, PGM_VOID_P cmdlist);
-void     cli_option_listing(charbuffer, PGM_VOID_P cmdlist);
-void     cli_auto_help(uint16_t maxcmdlength, PGM_VOID_P cmdlist);     
+int8_t   search_and_call(char *cmd, uint16_t maxcmdlength, PGM_VOID_P cmdlist);
+void     cli_option_listing(char *buffer, PGM_VOID_P cmdlist);
+void     cli_auto_help(uint16_t maxcmdlength, PGM_VOID_P cmdlist);
 
 typedef void(*str_fpt)(char*);
 #define CLI_ENTER     13
 #define CLI_BACKSPACE  8
 #define CLI_TABULATOR  9
 
-uint8_t cli_completion(charbuffer, uint16_t maxcmdlength, PGM_VOID_P cmdlist){
+uint8_t cli_completion(char *buffer, uint16_t maxcmdlength, PGM_VOID_P cmdlist){
        uint8_t i=0;
        char ref[maxcmdlength+1];
-       charitemstr;
+       char *itemstr;
        ref[0]='\0';
        /* check if we are behind the first word */
        while(buffer[i]){
@@ -85,7 +85,7 @@ int8_t cmd_interface(PGM_VOID_P cmd_desc){
        uint16_t cli_buffer_index;
        int8_t exit_code;
        uint8_t completion_failed=0;
-       charcli_buffer;
+       char *cli_buffer;
        char c;
        uint16_t maxcmdlength = max_cmd_length(cmd_desc);
        cli_buffer = calloc(1,cli_buffer_size=maxcmdlength+2);
@@ -98,12 +98,15 @@ int8_t cmd_interface(PGM_VOID_P cmd_desc){
                c = cli_rx();
                switch (c){
                case CLI_ENTER:
-                       if((exit_code=search_and_call(cli_buffer, maxcmdlength, cmd_desc))<=0){
+                       if((exit_code = search_and_call(cli_buffer, maxcmdlength, cmd_desc)) <=0 ){
                                free(cli_buffer);
                                return exit_code;
                        }
+                       /* cli_putstr(cli_buffer); */
+
                        memset(cli_buffer, 0, cli_buffer_size);
                        cli_buffer_index=0;
+                       /* cli_putstr_P(PSTR(" DONE\r\n>")); */
                        cli_putstr_P(PSTR("\r\n>"));
                        completion_failed=0;
                        break;
@@ -123,7 +126,7 @@ int8_t cmd_interface(PGM_VOID_P cmd_desc){
                                        cli_option_listing(cli_buffer, cmd_desc);
                        } else {
                                uint16_t old_idx = cli_buffer_index;
-                               completion_failed = 
+                               completion_failed =
                                        ~cli_completion(cli_buffer, maxcmdlength, cmd_desc);
                                cli_buffer_index = strlen(cli_buffer);
                                if(cli_echo && cli_tx){