Changes in / [a8435881:d9812b4] in mainline
- Files:
-
- 3 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/Makefile
ra8435881 rd9812b4 196 196 generic/src/console/chardev.c \ 197 197 generic/src/console/console.c \ 198 generic/src/console/prompt.c \ 198 199 generic/src/cpu/cpu.c \ 199 200 generic/src/ddi/ddi.c \ -
kernel/generic/include/debug.h
ra8435881 rd9812b4 37 37 38 38 #include <panic.h> 39 #include <symtab .h>39 #include <symtab_lookup.h> 40 40 41 41 #define CALLER ((uintptr_t) __builtin_return_address(0)) -
kernel/generic/include/symtab.h
ra8435881 rd9812b4 36 36 #define KERN_SYMTAB_H_ 37 37 38 #include <typedefs.h> 38 #include <symtab_lookup.h> 39 #include <console/chardev.h> 39 40 40 #define MAX_SYMBOL_NAME 6441 42 struct symtab_entry {43 uint64_t address_le;44 char symbol_name[MAX_SYMBOL_NAME];45 };46 47 extern int symtab_name_lookup(uintptr_t, const char **, uintptr_t *);48 extern const char *symtab_fmt_name_lookup(uintptr_t);49 extern int symtab_addr_lookup(const char *, uintptr_t *);50 41 extern void symtab_print_search(const char *); 51 extern int symtab_compl(char *, size_t); 52 53 #ifdef CONFIG_SYMTAB 54 55 /** Symtable linked together by build process 56 * 57 */ 58 extern struct symtab_entry symbol_table[]; 59 60 #endif /* CONFIG_SYMTAB */ 42 extern int symtab_compl(char *, size_t, indev_t *); 61 43 62 44 #endif -
kernel/generic/src/console/kconsole.c
ra8435881 rd9812b4 43 43 #include <console/chardev.h> 44 44 #include <console/cmd.h> 45 #include <console/prompt.h> 45 46 #include <print.h> 46 47 #include <panic.h> … … 201 202 * 202 203 */ 203 NO_TRACE static int cmdtab_compl(char *input, size_t size )204 NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t * indev) 204 205 { 205 206 const char *name = input; 206 207 207 208 size_t found = 0; 209 /* Maximum Match Length : Length of longest matching common substring in 210 case more than one match is found */ 211 size_t max_match_len = size; 212 size_t max_match_len_tmp = size; 213 size_t input_len = str_length(input); 208 214 link_t *pos = NULL; 209 215 const char *hint; 210 216 char *output = malloc(MAX_CMDLINE, 0); 217 size_t hints_to_show = MAX_TAB_HINTS - 1; 218 size_t total_hints_shown = 0; 219 bool continue_showing_hints = true; 211 220 212 221 output[0] = 0; … … 218 227 pos = pos->next; 219 228 found++; 229 } 230 231 /* If possible completions are more than MAX_TAB_HINTS, ask user whether to display them or not. */ 232 if (found > MAX_TAB_HINTS) { 233 printf("\n"); 234 continue_showing_hints = console_prompt_display_all_hints(indev, found); 220 235 } 221 236 … … 225 240 while (cmdtab_search_one(name, &pos)) { 226 241 cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link); 227 printf("%s (%s)\n", hlp->name, hlp->description); 242 243 if (continue_showing_hints) { 244 printf("%s (%s)\n", hlp->name, hlp->description); 245 --hints_to_show; 246 ++total_hints_shown; 247 248 if (hints_to_show == 0 && total_hints_shown != found) { /* Time to ask user to continue */ 249 continue_showing_hints = console_prompt_more_hints(indev, &hints_to_show); 250 } 251 } 252 228 253 pos = pos->next; 229 } 254 for(max_match_len_tmp = 0; output[max_match_len_tmp] == hlp->name[input_len + max_match_len_tmp] 255 && max_match_len_tmp < max_match_len; ++max_match_len_tmp); 256 max_match_len = max_match_len_tmp; 257 } 258 /* keep only the characters common in all completions */ 259 output[max_match_len] = 0; 230 260 } 231 261 … … 294 324 if (beg == 0) { 295 325 /* Command completion */ 296 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE) );326 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev); 297 327 } else { 298 328 /* Symbol completion */ 299 found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE) );329 found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev); 300 330 } 301 331 302 332 if (found == 0) 303 333 continue; 304 305 if (found > 1) { 306 /* No unique hint, list was printed */ 307 printf("%s> ", prompt); 308 printf("%ls", current); 309 print_cc('\b', wstr_length(current) - position); 310 continue; 311 } 312 313 /* We have a hint */ 314 334 335 /* We have hints, may be many. In case of more than one hint, 336 tmp will contain the common prefix. */ 315 337 size_t off = 0; 316 338 size_t i = 0; … … 320 342 i++; 321 343 } 344 345 if (found > 1) { 346 /* No unique hint, list was printed */ 347 printf("%s> ", prompt); 348 printf("%ls", current); 349 position += str_length(tmp); 350 print_cc('\b', wstr_length(current) - position); 351 continue; 352 } 353 354 /* We have a hint */ 322 355 323 356 printf("%ls", current + position); … … 540 573 /** Parse command line. 541 574 * 542 * @param cmdline Command line as read from input device. 575 * @param cmdline Command line as read from input device. 543 576 * @param size Size (in bytes) of the string. 544 577 * -
kernel/generic/src/debug/symtab.c
ra8435881 rd9812b4 43 43 #include <typedefs.h> 44 44 #include <errno.h> 45 #include <console/prompt.h> 45 46 46 47 /** Get name of a symbol that seems most likely to correspond to address. … … 209 210 * 210 211 */ 211 int symtab_compl(char *input, size_t size )212 int symtab_compl(char *input, size_t size, indev_t * indev) 212 213 { 213 214 #ifdef CONFIG_SYMTAB … … 226 227 const char *hint; 227 228 char output[MAX_SYMBOL_NAME]; 229 /* Maximum Match Length : Length of longest matching common substring in 230 case more than one match is found */ 231 size_t max_match_len = size; 232 size_t max_match_len_tmp = size; 233 size_t input_len = str_length(input); 234 char *sym_name; 235 size_t hints_to_show = MAX_TAB_HINTS - 1; 236 size_t total_hints_shown = 0; 237 bool continue_showing_hints = true; 228 238 229 239 output[0] = 0; 240 241 while ((hint = symtab_search_one(name, &pos))) { 242 ++pos; 243 } 244 245 pos = 0; 230 246 231 247 while ((hint = symtab_search_one(name, &pos))) { … … 235 251 pos++; 236 252 found++; 253 } 254 255 /* If possible completions are more than MAX_TAB_HINTS, ask user whether to display them or not. */ 256 if (found > MAX_TAB_HINTS) { 257 printf("\n"); 258 continue_showing_hints = console_prompt_display_all_hints(indev, found); 237 259 } 238 260 … … 241 263 pos = 0; 242 264 while (symtab_search_one(name, &pos)) { 243 printf("%s\n", symbol_table[pos].symbol_name);265 sym_name = symbol_table[pos].symbol_name; 244 266 pos++; 267 268 if (continue_showing_hints) { /* We are still showing hints */ 269 printf("%s\n", sym_name); 270 --hints_to_show; 271 ++total_hints_shown; 272 273 if (hints_to_show == 0 && total_hints_shown != found) { /* Time to ask user to continue */ 274 continue_showing_hints = console_prompt_more_hints(indev, &hints_to_show); 275 } 276 } 277 278 for(max_match_len_tmp = 0; output[max_match_len_tmp] == sym_name[input_len + max_match_len_tmp] 279 && max_match_len_tmp < max_match_len; ++max_match_len_tmp); 280 max_match_len = max_match_len_tmp; 245 281 } 282 /* keep only the characters common in all completions */ 283 output[max_match_len] = 0; 246 284 } 247 285 -
uspace/app/bdsh/cmds/modules/cat/cat.c
ra8435881 rd9812b4 62 62 static sysarg_t console_rows = 0; 63 63 static bool should_quit = false; 64 static bool dash_represents_stdin = false; 64 65 65 66 static console_ctrl_t *console = NULL; … … 73 74 { "more", no_argument, 0, 'm' }, 74 75 { "hex", no_argument, 0, 'x' }, 76 { "stdin", no_argument, 0, 's' }, 75 77 { 0, 0, 0, 0 } 76 78 }; … … 93 95 " -m, --more Pause after each screen full\n" 94 96 " -x, --hex Print bytes as hex values\n" 97 " -s --stdin Treat `-' in file list as standard input\n" 95 98 "Currently, %s is under development, some options don't work.\n", 96 99 cmdname, cmdname); … … 172 175 off64_t file_size = 0, length = 0; 173 176 174 fd = open(fname, O_RDONLY); 177 bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0); 178 179 if (reading_stdin) { 180 fd = fileno(stdin); 181 /* Allow storing the whole UTF-8 character. */ 182 blen = STR_BOUNDS(1); 183 } else { 184 fd = open(fname, O_RDONLY); 185 } 175 186 if (fd < 0) { 176 187 printf("Unable to open %s\n", fname); … … 207 218 208 219 do { 209 bytes = read(fd, buff + copied_bytes, ( 210 (length != CAT_FULL_FILE && length - (off64_t)count <= (off64_t)(blen - copied_bytes)) ? 211 (size_t)(length - count) : 212 (blen - copied_bytes) ) ); 220 size_t bytes_to_read; 221 if (reading_stdin) { 222 bytes_to_read = 1; 223 } else { 224 if ((length != CAT_FULL_FILE) 225 && (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) { 226 bytes_to_read = (size_t) (length - count); 227 } else { 228 bytes_to_read = blen - copied_bytes; 229 } 230 } 231 bytes = read(fd, buff + copied_bytes, bytes_to_read); 213 232 bytes += copied_bytes; 214 233 copied_bytes = 0; … … 242 261 reads++; 243 262 } 263 264 if (reading_stdin) { 265 fflush(stdout); 266 } 244 267 } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE)); 245 268 … … 284 307 285 308 for (c = 0, optind = 0, opt_ind = 0; c != -1;) { 286 c = getopt_long(argc, argv, "xhvmH:t:b: ", long_options, &opt_ind);309 c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind); 287 310 switch (c) { 288 311 case 'h': … … 318 341 hex = true; 319 342 break; 343 case 's': 344 dash_represents_stdin = true; 345 break; 320 346 } 321 347 } -
uspace/srv/hid/console/console.c
ra8435881 rd9812b4 76 76 } console_state_t; 77 77 78 #define UTF8_CHAR_BUFFER_SIZE (STR_BOUNDS(1) + 1) 79 78 80 typedef struct { 79 81 atomic_t refcnt; /**< Connection reference count */ 80 82 prodcons_t input_pc; /**< Incoming keyboard events */ 83 char char_remains[UTF8_CHAR_BUFFER_SIZE]; /**< Not yet sent bytes of last char event. */ 84 size_t char_remains_len; /**< Number of not yet sent bytes. */ 81 85 82 86 fibril_mutex_t mtx; /**< Lock protecting mutable fields */ … … 613 617 614 618 size_t pos = 0; 619 620 /* 621 * Read input from keyboard and copy it to the buffer. 622 * We need to handle situation when wchar is split by 2 following 623 * reads. 624 */ 615 625 while (pos < size) { 616 link_t *link = prodcons_consume(&cons->input_pc); 617 kbd_event_t *event = list_get_instance(link, kbd_event_t, link); 618 619 if (event->type == KEY_PRESS) { 620 buf[pos] = event->c; 626 /* Copy to the buffer remaining characters. */ 627 while ((pos < size) && (cons->char_remains_len > 0)) { 628 buf[pos] = cons->char_remains[0]; 621 629 pos++; 622 } 623 624 free(event); 630 /* Unshift the array. */ 631 for (size_t i = 1; i < cons->char_remains_len; i++) { 632 cons->char_remains[i - 1] = cons->char_remains[i]; 633 } 634 cons->char_remains_len--; 635 } 636 /* Still not enough? Then get another key from the queue. */ 637 if (pos < size) { 638 link_t *link = prodcons_consume(&cons->input_pc); 639 kbd_event_t *event = list_get_instance(link, kbd_event_t, link); 640 641 /* Accept key presses of printable chars only. */ 642 if ((event->type == KEY_PRESS) && (event->c != 0)) { 643 wchar_t tmp[2] = { event->c, 0 }; 644 wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp); 645 cons->char_remains_len = str_size(cons->char_remains); 646 } 647 648 free(event); 649 } 625 650 } 626 651 … … 930 955 fibril_mutex_initialize(&consoles[i].mtx); 931 956 prodcons_initialize(&consoles[i].input_pc); 957 consoles[i].char_remains_len = 0; 932 958 933 959 if (graphics_state == GRAPHICS_FULL) {
Note:
See TracChangeset
for help on using the changeset viewer.