di0ib
/
controller
Seguir 1
Destacar 0
Fork 0
Código Lanzamientos 0 Actividad
Explorar el Código

Cleanup CLI history 

Add all the spaces :)
bringup
Rowan Decker hace 9 años
padre
ad9a081e8b
commit
add8b3e90c
Se han modificado 2 ficheros con 35 adiciones y 32 borrados
Unificar vista Mostrar estadísticas de diff
  1. 32
    29
      Debug/cli/cli.c
  2. 3
    3
      Debug/cli/cli.h

+ 32
- 29
Debug/cli/cli.c Ver fichero

CLI_commandLookup(); CLI_commandLookup();


// Add the command to the history // Add the command to the history
cli_saveHistory(CLILineBuffer);
cli_saveHistory( CLILineBuffer );


// Keep the array circular, discarding the older entries // Keep the array circular, discarding the older entries
if (CLIHistoryTail < CLIHistoryHead)
CLIHistoryHead = (CLIHistoryHead+1)%CLIMaxHistorySize;
if ( CLIHistoryTail < CLIHistoryHead )
CLIHistoryHead = ( CLIHistoryHead + 1 ) % CLIMaxHistorySize;
CLIHistoryTail++; CLIHistoryTail++;
if (CLIHistoryTail==CLIMaxHistorySize)
if ( CLIHistoryTail == CLIMaxHistorySize )
{ {
CLIHistoryTail = 0; CLIHistoryTail = 0;
CLIHistoryHead = 1; CLIHistoryHead = 1;
} }


CLIHistoryCurrent = CLIHistoryTail; // 'Up' starts at the last item CLIHistoryCurrent = CLIHistoryTail; // 'Up' starts at the last item
cli_saveHistory(NULL); // delete the old temp buffer
cli_saveHistory( NULL ); // delete the old temp buffer


// Reset the buffer // Reset the buffer
CLILineBufferCurrent = 0; CLILineBufferCurrent = 0;
// Check for other escape sequence // Check for other escape sequence


// \e[ is an escape code in vt100 compatable terminals // \e[ is an escape code in vt100 compatable terminals
if (CLILineBufferCurrent>=prev_buf_pos+3
&& CLILineBuffer[prev_buf_pos]==0x1B
&& CLILineBuffer[prev_buf_pos+1]==0x5B)
if ( CLILineBufferCurrent >= prev_buf_pos + 3
&& CLILineBuffer[ prev_buf_pos ] == 0x1B
&& CLILineBuffer[ prev_buf_pos + 1] == 0x5B )
{ {
// Arrow Keys: A (0x41) = Up, B (0x42) = Down, C (0x43) = Right, D (0x44) = Left // Arrow Keys: A (0x41) = Up, B (0x42) = Down, C (0x43) = Right, D (0x44) = Left


if (CLILineBuffer[prev_buf_pos+2]==0x41) // Hist prev
if ( CLILineBuffer[ prev_buf_pos + 2 ] == 0x41 ) // Hist prev
{ {
if (CLIHistoryCurrent==CLIHistoryTail)
if ( CLIHistoryCurrent == CLIHistoryTail )
{ {
// Is first time pressing arrow. Save the current buffer // Is first time pressing arrow. Save the current buffer
CLILineBuffer[prev_buf_pos] = '\0';
cli_saveHistory(CLILineBuffer);
CLILineBuffer[ prev_buf_pos ] = '\0';
cli_saveHistory( CLILineBuffer );
} }


// Grab the previus item from the history if there is one // Grab the previus item from the history if there is one
if (RING_PREV(CLIHistoryCurrent)!=RING_PREV(CLIHistoryHead))
CLIHistoryCurrent = RING_PREV(CLIHistoryCurrent);
cli_retreiveHistory(CLIHistoryCurrent);
if ( RING_PREV( CLIHistoryCurrent ) != RING_PREV( CLIHistoryHead ) )
CLIHistoryCurrent = RING_PREV( CLIHistoryCurrent );
cli_retreiveHistory( CLIHistoryCurrent );
} }
if (CLILineBuffer[prev_buf_pos+2]==0x42) // Hist next
if ( CLILineBuffer[ prev_buf_pos + 2 ] == 0x42 ) // Hist next
{ {
// Grab the next item from the history if it exists // Grab the next item from the history if it exists
if (RING_NEXT(CLIHistoryCurrent)!=RING_NEXT(CLIHistoryTail))
CLIHistoryCurrent = RING_NEXT(CLIHistoryCurrent);
cli_retreiveHistory(CLIHistoryCurrent);
if ( RING_NEXT( CLIHistoryCurrent ) != RING_NEXT( CLIHistoryTail ) )
CLIHistoryCurrent = RING_NEXT( CLIHistoryCurrent );
cli_retreiveHistory( CLIHistoryCurrent );
} }
} }
return; return;
} }
} }


inline int wrap(int kX, int const kLowerBound, int const kUpperBound)
inline int CLI_wrap( int kX, int const kLowerBound, int const kUpperBound )
{ {
int range_size = kUpperBound - kLowerBound + 1; int range_size = kUpperBound - kLowerBound + 1;


if (kX < kLowerBound)
if ( kX < kLowerBound )
kX += range_size * ((kLowerBound - kX) / range_size + 1); kX += range_size * ((kLowerBound - kX) / range_size + 1);


return kLowerBound + (kX - kLowerBound) % range_size; return kLowerBound + (kX - kLowerBound) % range_size;
} }


inline void cli_saveHistory(char *buff) {
if (buff==NULL) {
inline void CLI_saveHistory( char *buff )
{
if ( buff == NULL )
{
//clear the item //clear the item
CLIHistoryBuffer[CLIHistoryTail][0] = '\0';
CLIHistoryBuffer[ CLIHistoryTail ][ 0 ] = '\0';
return; return;
} }


// Copy the line to the history // Copy the line to the history
int i; int i;
for (i=0; i<CLILineBufferCurrent; i++)
for (i = 0; i < CLILineBufferCurrent; i++)
{ {
CLIHistoryBuffer[CLIHistoryTail][i] = CLILineBuffer[i];
CLIHistoryBuffer[ CLIHistoryTail ][ i ] = CLILineBuffer[ i ];
} }
} }


void cli_retreiveHistory(int index) {
char *histMatch = CLIHistoryBuffer[index];
void CLI_retreiveHistory( int index )
{
char *histMatch = CLIHistoryBuffer[ index ];


// Reset the buffer // Reset the buffer
CLILineBufferCurrent = 0; CLILineBufferCurrent = 0;
CLILineBufferCurrent = 0; CLILineBufferCurrent = 0;
while ( *histMatch != '\0' ) while ( *histMatch != '\0' )
{ {
CLILineBuffer[CLILineBufferCurrent++] = *histMatch++;
CLILineBuffer[ CLILineBufferCurrent++ ] = *histMatch++;
} }
} }



+ 3
- 3
Debug/cli/cli.h Ver fichero

void CLI_registerDictionary( const CLIDictItem *cmdDict, const char* dictName ); void CLI_registerDictionary( const CLIDictItem *cmdDict, const char* dictName );
void CLI_argumentIsolation( char* string, char** first, char** second ); void CLI_argumentIsolation( char* string, char** first, char** second );


int wrap( int x, int low, int high );
int CLI_wrap( int x, int low, int high );
void CLI_commandLookup(); void CLI_commandLookup();
void CLI_tabCompletion(); void CLI_tabCompletion();
void cli_saveHistory( char *buff );
void cli_retreiveHistory( int index );
void CLI_saveHistory( char *buff );
void CLI_retreiveHistory( int index );


// CLI Command Functions // CLI Command Functions
void cliFunc_arch ( char* args ); void cliFunc_arch ( char* args );