deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

I made a mess out of the dec64 command being moved to a new module; this commit should fix the previous issues though

Browse source
This commit is contained in:
adamdunkels 2010-02-03 21:53:51 +00:00
parent 551f7fc7a7
commit dda757aca7
1 changed files with 41 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
apps/shell/shell-text.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-text.c,v 1.5 2010/02/03 21:39:25 adamdunkels Exp $ * $Id: shell-text.c,v 1.6 2010/02/03 21:53:51 adamdunkels Exp $
*/ */
/** /**
@ -75,68 +75,54 @@ PROCESS_THREAD(shell_echo_process, ev, data)
{ {
PROCESS_BEGIN(); PROCESS_BEGIN();
shell_output(&echo_command, data, (int)strlen(data), "", 0); shell_output(&echo_command, data, (int)strlen(data), "\n", 1);
PROCESS_END(); PROCESS_END();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define BASE64_MAX_LINELEN 76 PROCESS_THREAD(shell_hd_process, ev, data)
struct base64_decoder_state {
uint8_t data[3 * BASE64_MAX_LINELEN / 4];
int dataptr;
unsigned long tmpdata;
int sextets;
int padding;
};
/*---------------------------------------------------------------------------*/
static int
base64_decode_char(char c)
{ {
if(c >= 'A' && c <= 'Z') { struct shell_input *input;
return c - 'A'; uint16_t *ptr;
} else if(c >= 'a' && c <= 'z') { int i;
return c - 'a' + 26; char buf[57], *bufptr;
} else if(c >= '0' && c <= '9') {
return c - '0' + 52; PROCESS_BEGIN();
} else if(c == '+') {
return 62; while(1) {
} else if(c == '/') { PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input);
return 63; input = data;
} else {
return 0; if(input->len1 + input->len2 == 0) {
} PROCESS_EXIT();
}
/*---------------------------------------------------------------------------*/
static int
base64_add_char(struct base64_decoder_state *s, char c)
{
if(isspace(c)) {
return 0;
} }
if(s->dataptr >= sizeof(s->data)) { bufptr = buf;
return 0; ptr = (uint16_t *)input->data1;
for(i = 0; i < input->len1 && i < input->len1 - 1; i += 2) {
bufptr += sprintf(bufptr, "0x%04x ", *ptr);
if(bufptr - buf >= sizeof(buf) - 7) {
shell_output_str(&hd_command, buf, "");
bufptr = buf;
} }
if(c == '=') { ptr++;
++s->padding;
} }
s->tmpdata = (s->tmpdata << 6) | base64_decode_char(c); ptr = (uint16_t *)input->data2;
++s->sextets; for(i = 0; i < input->len2 && i < input->len2 - 1; i += 2) {
if(s->sextets == 4) { bufptr += sprintf(bufptr, "0x%04x ", *ptr);
s->sextets = 0; if(bufptr - buf >= sizeof(buf) - 7) {
s->data[s->dataptr] = (uint8_t)(s->tmpdata >> 16); shell_output_str(&hd_command, buf, "");
s->data[s->dataptr + 1] = (uint8_t)(s->tmpdata >> 8); bufptr = buf;
s->data[s->dataptr + 2] = (uint8_t)(s->tmpdata);
s->dataptr += 3;
if(s->dataptr == sizeof(s->data)) {
return 0;
} else {
return 1;
} }
ptr++;
} }
return 1; if(bufptr != buf) {
shell_output_str(&hd_command, buf, "");
}
}
PROCESS_END();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(shell_binprint_process, ev, data) PROCESS_THREAD(shell_binprint_process, ev, data)
@ -218,7 +204,6 @@ shell_text_init(void)
shell_register_command(&binprint_command); shell_register_command(&binprint_command);
shell_register_command(&hd_command); shell_register_command(&hd_command);
shell_register_command(&echo_command); shell_register_command(&echo_command);
shell_register_command(&dec64_command);
shell_register_command(&size_command); shell_register_command(&size_command);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/