Changeset f4b1535 in mainline for kernel/generic/src/console/kconsole.c
- Timestamp:
- 2009-04-09T23:04:10Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
- Children:
- 6eb2e96
- Parents:
- 095003a8
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/console/kconsole.c
r095003a8 rf4b1535 215 215 while ((hint = cmdtab_search_one(name, &pos))) { 216 216 if ((found == 0) || (str_length(output) > str_length(hint))) 217 str_ ncpy(output, hint, MAX_CMDLINE);217 str_cpy(output, MAX_CMDLINE, hint); 218 218 219 219 pos = pos->next; … … 232 232 233 233 if (found > 0) 234 str_ ncpy(input, output, size);234 str_cpy(input, size, output); 235 235 236 236 return found; … … 439 439 if ((text[0] < '0') || (text[0] > '9')) { 440 440 char symname[MAX_SYMBOL_NAME]; 441 str_ncpy(symname, text, min(len + 1, MAX_SYMBOL_NAME));441 str_ncpy(symname, MAX_SYMBOL_NAME, text, len + 1); 442 442 443 443 uintptr_t symaddr; … … 581 581 case ARG_TYPE_STRING: 582 582 buf = (char *) cmd->argv[i].buffer; 583 str_ncpy(buf, cmd line + start,584 min((end - start) + 1, cmd->argv[i].len));583 str_ncpy(buf, cmd->argv[i].len, cmdline + start, 584 (end - start) + 1); 585 585 break; 586 586 case ARG_TYPE_INT: … … 593 593 if (cmdline[end - 1] == '"') { 594 594 buf = (char *) cmd->argv[i].buffer; 595 str_ncpy(buf, cmdline + start + 1, 596 min((end - start) - 1, cmd->argv[i].len)); 595 str_ncpy(buf, cmd->argv[i].len, 596 cmdline + start + 1, 597 (end - start) - 1); 597 598 cmd->argv[i].intval = (unative_t) buf; 598 599 cmd->argv[i].vartype = ARG_TYPE_STRING;
Note:
See TracChangeset
for help on using the changeset viewer.