Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

examples: be more defensive and replace strcmp() with strncmp()

Browse Source 
Signed-off-by: Alex Tereschenko <alext.mkrs@gmail.com>
This commit is contained in:
Alex Tereschenko
2017-05-17 19:45:05 +02:00
parent 398b851144
commit b73fdff00d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/mraa-i2c.c
View File

@@ -166,16 +166,16 @@ int
process_command(int argc, char** argv) process_command(int argc, char** argv)
{ {
int status = 0; int status = 0;
if (strcmp(argv[1], "help") == 0) { if (strncmp(argv[1], "help", strlen("help") + 1) == 0) {
print_help(); print_help();
return 0; return 0;
} else if (strcmp(argv[1], "version") == 0) { } else if (strncmp(argv[1], "version", strlen("version") + 1) == 0) {
print_version(); print_version();
return 0; return 0;
} else if (strcmp(argv[1], "list") == 0) { } else if (strncmp(argv[1], "list", strlen("list") + 1) == 0) {
print_busses(); print_busses();
return 0; return 0;
} else if (strcmp(argv[1], "detect") == 0) { } else if (strncmp(argv[1], "detect", strlen("detect") + 1) == 0) {
if (argc == 3) { if (argc == 3) {
int bus = strtol(argv[2], NULL, 0); int bus = strtol(argv[2], NULL, 0);
i2c_detect_devices(bus); i2c_detect_devices(bus);
@@ -184,10 +184,11 @@ process_command(int argc, char** argv)
print_command_error(); print_command_error();
return 1; return 1;
} }
} else if ((strcmp(argv[1], "get") == 0) || (strcmp(argv[1], "getrpt") == 0)) { } else if ((strncmp(argv[1], "get", strlen("get") + 1) == 0) ||
(strncmp(argv[1], "getrpt", strlen("getrpt") + 1) == 0)) {
if (argc == 5) { if (argc == 5) {
int interation = 0; int interation = 0;
mraa_boolean_t should_repeat = strcmp(argv[1], "getrpt") == 0; mraa_boolean_t should_repeat = strncmp(argv[1], "getrpt", strlen("getrpt") + 1) == 0;
int bus = strtol(argv[2], NULL, 0); int bus = strtol(argv[2], NULL, 0);
uint8_t device_address = strtol(argv[3], NULL, 0); uint8_t device_address = strtol(argv[3], NULL, 0);
uint8_t register_address = strtol(argv[4], NULL, 0); uint8_t register_address = strtol(argv[4], NULL, 0);
@@ -211,7 +212,7 @@ process_command(int argc, char** argv)
status = 1; status = 1;
} }
return status; return status;
} else if ((strcmp(argv[1], "set") == 0)) { } else if ((strncmp(argv[1], "set", strlen("set") + 1) == 0)) {
if (argc == 6) { if (argc == 6) {
int bus = strtol(argv[2], NULL, 0); int bus = strtol(argv[2], NULL, 0);
uint8_t device_address = strtol(argv[3], NULL, 0); uint8_t device_address = strtol(argv[3], NULL, 0);
@@ -246,7 +247,7 @@ run_interactive_mode()
fprintf(stdout, "Command: "); fprintf(stdout, "Command: ");
fgets(command, 80, stdin); fgets(command, 80, stdin);
command[strlen(command) - 1] = 0; command[strlen(command) - 1] = 0;
if (strcmp(command, "q") == 0) if (strncmp(command, "q", strlen("q") + 1) == 0)
return; return;
char* str = strtok(command, " "); char* str = strtok(command, " ");
int len = 0; int len = 0;