Changeset 5d67baa in mainline for kernel/generic/src/console/kconsole.c
- Timestamp:
- 2008-06-30T20:33:18Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 939e9c1
- Parents:
- ac0e791
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/console/kconsole.c
rac0e791 r5d67baa 170 170 171 171 /** Try to find a command beginning with prefix */ 172 static const char * 172 static const char *cmdtab_search_one(const char *name,link_t **startpos) 173 173 { 174 174 size_t namelen = strlen(name); … … 204 204 static int cmdtab_compl(char *name) 205 205 { 206 static char output[MAX_SYMBOL_NAME +1];206 static char output[MAX_SYMBOL_NAME + 1]; 207 207 link_t *startpos = NULL; 208 208 const char *foundtxt; … … 214 214 startpos = startpos->next; 215 215 if (!found) 216 strncpy(output, foundtxt, strlen(foundtxt) +1);216 strncpy(output, foundtxt, strlen(foundtxt) + 1); 217 217 else { 218 218 for (i = 0; output[i] && foundtxt[i] && … … 241 241 } 242 242 243 static char * clever_readline(const char *prompt, chardev_t *input) 243 //char *clever_readline(const char *prompt, chardev_t *input); 244 static char *clever_readline(const char *prompt, chardev_t *input) 244 245 { 245 246 static int histposition = 0; 246 247 247 static char tmp[MAX_CMDLINE +1];248 static char tmp[MAX_CMDLINE + 1]; 248 249 int curlen = 0, position = 0; 249 250 char *current = history[histposition]; … … 258 259 putchar(c); 259 260 break; 260 } if (c == '\b') { /* Backspace */ 261 } 262 if (c == '\b') { /* Backspace */ 261 263 if (position == 0) 262 264 continue; … … 544 546 strncpy(buf, (const char *) &cmdline[start], 545 547 min((end - start) + 2, cmd->argv[i].len)); 546 buf[min((end - start) + 1, cmd->argv[i].len - 1)] = '\0'; 548 buf[min((end - start) + 1, cmd->argv[i].len - 1)] = 549 '\0'; 547 550 break; 548 551 case ARG_TYPE_INT: … … 561 564 cmd->argv[i].intval = (unative_t) buf; 562 565 cmd->argv[i].vartype = ARG_TYPE_STRING; 563 } else if (!parse_int_arg(cmdline + start, end - start + 1,564 &cmd->argv[i].intval)) {566 } else if (!parse_int_arg(cmdline + start, 567 end - start + 1, &cmd->argv[i].intval)) { 565 568 cmd->argv[i].vartype = ARG_TYPE_INT; 566 569 } else {
Note:
See TracChangeset
for help on using the changeset viewer.