KolibriOS/umka
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for getopt, include unicode.inc from the kernel.

Browse Source
This commit is contained in:
Ivan Baravy 2020-02-28 05:18:09 +03:00
parent 13c5b4ac7a
commit f10976c16a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
umka.asm
View File

@ -104,6 +104,7 @@ include 'blkdev/disk.inc'
include 'blkdev/disk_cache.inc' include 'blkdev/disk_cache.inc'
include 'fs/fs_lfn.inc' include 'fs/fs_lfn.inc'
include 'crc.inc' include 'crc.inc'
include 'unicode.inc'
include 'core/string.inc' include 'core/string.inc'
include 'core/malloc.inc' include 'core/malloc.inc'
include 'core/heap.inc' include 'core/heap.inc'

10
umka_shell.c
View File

@ -727,22 +727,22 @@ void umka_ls(int argc, char **argv, const char *usage, f70or80_t f70or80) {
uint32_t readdir_enc = DEFAULT_READDIR_ENCODING; uint32_t readdir_enc = DEFAULT_READDIR_ENCODING;
uint32_t path_enc = DEFAULT_PATH_ENCODING; uint32_t path_enc = DEFAULT_PATH_ENCODING;
uint32_t from_idx = 0, count = MAX_DIRENTS_TO_READ; uint32_t from_idx = 0, count = MAX_DIRENTS_TO_READ;
if (argc > 1 && *argv[1] != '-') { if (argc > 1 && *argv[optind] != '-') {
path = argv[optind++]; path = argv[optind++];
} }
while ((opt = getopt(argc, argv, optstring)) != -1) { while ((opt = getopt(argc, argv, optstring)) != -1) {
switch (opt) { switch (opt) {
case 'f': case 'f':
from_idx = strtoul(argv[optind++], NULL, 0); from_idx = strtoul(optarg, NULL, 0);
break; break;
case 'c': case 'c':
count = strtoul(argv[optind++], NULL, 0); count = strtoul(optarg, NULL, 0);
break; break;
case 'e': case 'e':
readdir_enc = parse_encoding(argv[optind++]); readdir_enc = parse_encoding(optarg);
break; break;
case 'p': case 'p':
path_enc = parse_encoding(argv[optind++]); path_enc = parse_encoding(optarg);
break; break;
default: default:
puts(usage); puts(usage);