Diff: prompt.cpp

Revision:

46:a670f187a704

Parent:

45:c80574f24dc3

Child:

48:195c97f12e8e

diff -r c80574f24dc3 -r a670f187a704 prompt.cpp
--- a/prompt.cpp	Tue Oct 07 12:10:36 2014 +0000
+++ b/prompt.cpp	Tue Oct 07 18:38:30 2014 +0000
@@ -234,7 +234,7 @@
         if (fip == NULL){
             fip = fopen("/qspi/myip.txt", "w");
             //fprintf(fip, "%s\n\r",__MY_IP__);   //myip
-            fprintf(fip, "%s",__MY_IP__);   //myip
+            fprintf(fip, "%s\n\r",__MY_IP__);   //myip
             exists = false;
         }
         
@@ -254,7 +254,7 @@
         if (fsip == NULL){
              fsip = fopen("/qspi/serverip.txt", "w");
              //fprintf(fsip, "%s\n\r",__SERVER_IP__ );  //asterisk ip
-             fprintf(fsip, "%s",__SERVER_IP__ );  //asterisk ip
+             fprintf(fsip, "%s\n\r",__SERVER_IP__ );  //asterisk ip
              exists = false;
         }
         
@@ -274,13 +274,13 @@
         fmask = fopen("/qspi/mymask.txt", "r");
         if (fmask == NULL){
             fmask = fopen("/qspi/mymask.txt", "w");
-            fprintf(fmask, "%s",__MY_MSK__);     //mymask
+            fprintf(fmask, "%s\n\r",__MY_MSK__);     //mymask
             exists = false;
         }
         fgate = fopen("/qspi/mygateway.txt", "r");
         if (fgate == NULL){
             fgate = fopen("/qspi/mygate.txt", "w");
-            fprintf(fgate, "%s",__MY_GTW__);    //mygateway
+            fprintf(fgate, "%s\n\r",__MY_GTW__);    //mygateway
             exists = false;
         }
         fudpport = fopen("/qspi/udpport.txt", "r" );
@@ -334,15 +334,15 @@
         fudpport = fopen( "/qspi/udpport.txt", "w" );
         ftcpport = fopen( "/qspi/tcpport.txt", "w" );
         
-        fprintf( fip, "%s", __MY_IP__  );   //myip
+        fprintf( fip, "%s\n\r", __MY_IP__  );   //myip
         fprintf( fport, "%i\n\r", __MY_PORT__ );  //mysipport // isso pode dar pala
         fprintf( fext, "%i\n\r", __MY_EXT__ );  //myext
         
-        fprintf( fsip, "%s", __SERVER_IP__  );  //asterisk ip
+        fprintf( fsip, "%s\n\r", __SERVER_IP__  );  //asterisk ip
         fprintf( fserext, "%i\n\r",__PEER_EXT__ );  //asterisk port
         fprintf( fsport, "%i\n\r",__SERVER_PORT__ );  //asterisk port
         
-        fprintf( fmask, "%s",__MY_MSK__ );     //mymask
+        fprintf( fmask, "%s\n\r",__MY_MSK__ );     //mymask
         fprintf( fgate, "%s\n\r", __MY_GTW__ );    //mygateway
         
         fprintf( fudpport, "%i\n\r",UDP_PORT_LISTENER );
@@ -519,7 +519,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "ipset ", 6 )) {
             miss_match = false;
             fip = fopen("/qspi/myip.txt", "w");
-            fprintf(fip,"%s",(debug_buf+6));
+            fprintf(fip,"%s\n\r",(debug_buf+6));
             fclose(fip);
             pc.printf("\n\r");
             files('s');
@@ -528,7 +528,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "extset ", 7 ) ){
             miss_match = false;
             fip = fopen("/qspi/myext.txt", "w");
-            fprintf(fip, "%s" , ( debug_buf + 7) );
+            fprintf(fip, "%i\n\r" , ( debug_buf + 7) );
             fclose(fip);
             pc.printf("\n\r");
             files('s');
@@ -546,7 +546,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "maskset ",8 ) ){
             miss_match = false;
             fmask = fopen("/qspi/mymask.txt", "w");
-            fprintf(fmask,"%s",(debug_buf+8));
+            fprintf(fmask,"%s\n\r",(debug_buf+8));
             fclose(fmask);
             pc.printf("\n\r");
             files('s');
@@ -555,7 +555,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "gatewayset ",11 ) ){
             miss_match = false;
             fgate = fopen("/qspi/mygate.txt", "w");
-            fprintf(fgate,"%s",(debug_buf+11));
+            fprintf(fgate,"%s\n\r",(debug_buf+11));
             fclose(fgate);
             pc.printf("\n\r");
             files('s');
@@ -573,7 +573,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "serverip ",9 ) ){
             miss_match = false;
             fsip = fopen("/qspi/serverip.txt", "w");
-            fprintf(fsip,"%s",(debug_buf+9));
+            fprintf(fsip,"%s\n\r",(debug_buf+9));
             fclose(fsip);
             pc.printf("\n\r");
             files('s');
@@ -623,7 +623,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "flood ",6 ) ){
             if (xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "on",2 ) ){
                 miss_match = false;
-                pc.printf("\n\r\t Flood ON\n\r\t");
+                pc.printf("\n\rFlood ON\n\r");
                 if( from_eth ){
                     snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood On\n\r" );
                     debug_buf[ strlen( debug_buf ) - 1 ] = '\0';
@@ -636,7 +636,7 @@
             }
             if (xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "off",3 )) {
                 miss_match = false;
-                pc.printf("\n\r\t Flood OFF\n\r\t");
+                pc.printf("\n\rFlood OFF\n\r");
                 if( from_eth ){
                     snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Flood Off\n\r" );
                     debug_buf[ strlen( debug_buf ) - 1 ] = '\0';
@@ -650,7 +650,7 @@
         if( xmemmatch( (uint8_t*)debug_buf, (uint8_t*) "debug ",6 )) {
             if( xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "on",2 )) {
                 miss_match = false;
-                pc.printf("\n\r\tDebug ON\n\r\t");
+                pc.printf("\n\rDebug ON\n\r");
                 if( from_eth ){
                     snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug On\n\r" );
                     debug_buf[ strlen( debug_buf ) - 1 ] = '\0';
@@ -659,7 +659,7 @@
             }
             if( xmemmatch( (uint8_t*)(debug_buf+6), (uint8_t*) "off",3 )) {
                 miss_match = false;
-                pc.printf("\n\r\tDebug OFF\n\r\t");
+                pc.printf("\n\rDebug OFF\n\r");
                 if( from_eth ){
                     snprintf( debug_buf, __PROMPT_ETH_BUFFER_SIZE__, "Debug Off\n\r" );
                     debug_buf[ strlen( debug_buf ) - 1 ] = '\0';