diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-16 20:03:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-16 20:03:43 +0200 |
| commit | 84cf6bd81bec93b49166cd48fccc7087fdbaa6fc (patch) | |
| tree | 63d744fbf9ac7db5246a60b48aa0396aaaa22c18 /src/filepath.c | |
| parent | 9af78769eeae0318e07aa8b6af4d6e2244481ca7 (diff) | |
patch 8.2.0988: getting directory contents is always case sortedv8.2.0988
Problem: Getting directory contents is always case sorted.
Solution: Add sort options and v:collate. (Christian Brabandt, closes #6229)
Diffstat (limited to 'src/filepath.c')
| -rw-r--r-- | src/filepath.c | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/src/filepath.c b/src/filepath.c index 90d04cfcf1..1fe757e850 100644 --- a/src/filepath.c +++ b/src/filepath.c @@ -1405,6 +1405,36 @@ theend: return retval; } + static int +readdirex_dict_arg(typval_T *tv, int *cmp) +{ + char_u *compare; + + if (tv->v_type != VAR_DICT) + { + emsg(_(e_dictreq)); + return FAIL; + } + + if (dict_find(tv->vval.v_dict, (char_u *)"sort", -1) != NULL) + compare = dict_get_string(tv->vval.v_dict, (char_u *)"sort", FALSE); + else + { + semsg(_(e_no_dict_key), "sort"); + return FAIL; + } + + if (STRCMP(compare, (char_u *) "none") == 0) + *cmp = READDIR_SORT_NONE; + else if (STRCMP(compare, (char_u *) "case") == 0) + *cmp = READDIR_SORT_BYTE; + else if (STRCMP(compare, (char_u *) "icase") == 0) + *cmp = READDIR_SORT_IC; + else if (STRCMP(compare, (char_u *) "collate") == 0) + *cmp = READDIR_SORT_COLLATE; + return OK; +} + /* * "readdir()" function */ @@ -1417,14 +1447,19 @@ f_readdir(typval_T *argvars, typval_T *rettv) char_u *p; garray_T ga; int i; + int sort = READDIR_SORT_BYTE; if (rettv_list_alloc(rettv) == FAIL) return; path = tv_get_string(&argvars[0]); expr = &argvars[1]; + if (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN && + readdirex_dict_arg(&argvars[2], &sort) == FAIL) + return; + ret = readdir_core(&ga, path, FALSE, (void *)expr, - (expr->v_type == VAR_UNKNOWN) ? NULL : readdir_checkitem); + (expr->v_type == VAR_UNKNOWN) ? NULL : readdir_checkitem, sort); if (ret == OK) { for (i = 0; i < ga.ga_len; i++) @@ -1480,14 +1515,19 @@ f_readdirex(typval_T *argvars, typval_T *rettv) char_u *path; garray_T ga; int i; + int sort = READDIR_SORT_BYTE; if (rettv_list_alloc(rettv) == FAIL) return; path = tv_get_string(&argvars[0]); expr = &argvars[1]; + if (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN && + readdirex_dict_arg(&argvars[2], &sort) == FAIL) + return; + ret = readdir_core(&ga, path, TRUE, (void *)expr, - (expr->v_type == VAR_UNKNOWN) ? NULL : readdirex_checkitem); + (expr->v_type == VAR_UNKNOWN) ? NULL : readdirex_checkitem, sort); if (ret == OK) { for (i = 0; i < ga.ga_len; i++) |