shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dev-cache: change locales just once

Browse Source
This commit is contained in:
Zdenek Kabelac 2024-03-24 00:05:57 +01:00
parent 2eff6e1974
commit ab3c690077
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/device/dev-cache.c
View File

@ -870,7 +870,6 @@ static int _insert_dir(const char *dir)
if (len && path[len - 1] != '/') if (len && path[len - 1] != '/')
path[len++] = '/'; path[len++] = '/';
setlocale(LC_COLLATE, "C"); /* Avoid sorting by locales */
dirent_count = scandir(dir, &dirent, NULL, alphasort); dirent_count = scandir(dir, &dirent, NULL, alphasort);
if (dirent_count > 0) { if (dirent_count > 0) {
for (n = 0; n < dirent_count; n++) { for (n = 0; n < dirent_count; n++) {
@ -890,7 +889,6 @@ static int _insert_dir(const char *dir)
free(dirent[n]); free(dirent[n]);
free(dirent); free(dirent);
} }
setlocale(LC_COLLATE, "");
return r; return r;
} }
@ -1198,7 +1196,9 @@ void dev_cache_scan(struct cmd_context *cmd)
_cache.has_scanned = 1; _cache.has_scanned = 1;
setlocale(LC_COLLATE, "C"); /* Avoid sorting by locales */
_insert_dirs(&_cache.dirs); _insert_dirs(&_cache.dirs);
setlocale(LC_COLLATE, "");
if (cmd->check_devs_used) if (cmd->check_devs_used)
(void) dev_cache_index_devs(); (void) dev_cache_index_devs();