Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Code Issues Wiki Activity

Merge pull request #2279 from mluessi/ml_fix_strtok

Browse source 
CLI: use strtok_r instead of strtok
This commit is contained in:
Michael Keller 2017-02-03 19:06:33 +13:00 • committed by GitHub
commit b7114ecc22
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/fc/cli.c
View file

@ -1838,7 +1838,8 @@ static void cliSerialPassthrough(char *cmdline)
int id = -1; int id = -1;
uint32_t baud = 0; uint32_t baud = 0;
unsigned mode = 0; unsigned mode = 0;
char* tok = strtok(cmdline, " "); char *saveptr;
char* tok = strtok_r(cmdline, " ", &saveptr);
int index = 0; int index = 0;
while (tok != NULL) { while (tok != NULL) {
@ -1857,7 +1858,7 @@ static void cliSerialPassthrough(char *cmdline)
break; break;
} }
index++; index++;
tok = strtok(NULL, " "); tok = strtok_r(NULL, " ", &saveptr);
} }
serialPort_t *passThroughPort; serialPort_t *passThroughPort;
@ -2297,10 +2298,11 @@ static void cliModeColor(char *cmdline)
enum {MODE = 0, FUNCTION, COLOR, ARGS_COUNT}; enum {MODE = 0, FUNCTION, COLOR, ARGS_COUNT};
int args[ARGS_COUNT]; int args[ARGS_COUNT];
int argNo = 0; int argNo = 0;
char* ptr = strtok(cmdline, " "); char *saveptr;
char* ptr = strtok_r(cmdline, " ", &saveptr);
while (ptr && argNo < ARGS_COUNT) { while (ptr && argNo < ARGS_COUNT) {
args[argNo++] = atoi(ptr); args[argNo++] = atoi(ptr);
ptr = strtok(NULL, " "); ptr = strtok_r(NULL, " ", &saveptr);
} }
if (ptr != NULL || argNo != ARGS_COUNT) { if (ptr != NULL || argNo != ARGS_COUNT) {
@ -2560,10 +2562,11 @@ static void cliServoMix(char *cmdline)
return; return;
} }
ptr = strtok(ptr, " "); char *saveptr;
ptr = strtok_r(ptr, " ", &saveptr);
while (ptr != NULL && check < ARGS_COUNT - 1) { while (ptr != NULL && check < ARGS_COUNT - 1) {
args[check++] = atoi(ptr); args[check++] = atoi(ptr);
ptr = strtok(NULL, " "); ptr = strtok_r(NULL, " ", &saveptr);
} }
if (ptr == NULL || check != ARGS_COUNT - 1) { if (ptr == NULL || check != ARGS_COUNT - 1) {
@ -2584,10 +2587,11 @@ static void cliServoMix(char *cmdline)
cliServoMix("reverse"); cliServoMix("reverse");
} else { } else {
enum {RULE = 0, TARGET, INPUT, RATE, SPEED, MIN, MAX, BOX, ARGS_COUNT}; enum {RULE = 0, TARGET, INPUT, RATE, SPEED, MIN, MAX, BOX, ARGS_COUNT};
char *ptr = strtok(cmdline, " "); char *saveptr;
char *ptr = strtok_r(cmdline, " ", &saveptr);
while (ptr != NULL && check < ARGS_COUNT) { while (ptr != NULL && check < ARGS_COUNT) {
args[check++] = atoi(ptr); args[check++] = atoi(ptr);
ptr = strtok(NULL, " "); ptr = strtok_r(NULL, " ", &saveptr);
} }
if (ptr != NULL || check != ARGS_COUNT) { if (ptr != NULL || check != ARGS_COUNT) {