mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: Use LFS calls when reading config files

Browse source 
Although at first glance it doesn't seem useful to support config
files larger than 2GB, LFS also influences inode size. Without this,
32-bit libasound may be unable to read config files on filesystems
with 64-bit inodes, such as Btrfs or NFS.

Fixes: https://github.com/alsa-project/alsa-lib/pull/223
Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Sebastian Krzyszkowiak 2022-04-28 22:46:56 +02:00 • committed by Jaroslav Kysela
parent 87034d6fc6
commit 45b65fa4c1
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/conf.c
View file

@ -4064,7 +4064,7 @@ static int snd_config_hooks(snd_config_t *config, snd_config_t *private_data)
return err; return err;
} }
static int config_filename_filter(const struct dirent *dirent) static int config_filename_filter(const struct dirent64 *dirent)
{ {
size_t flen; size_t flen;
@ -4102,13 +4102,13 @@ static int config_file_open(snd_config_t *root, const char *filename)
static int config_file_load(snd_config_t *root, const char *fn, int errors) static int config_file_load(snd_config_t *root, const char *fn, int errors)
{ {
struct stat st; struct stat64 st;
struct dirent **namelist; struct dirent64 **namelist;
int err, n; int err, n;
if (!errors && access(fn, R_OK) < 0) if (!errors && access(fn, R_OK) < 0)
return 1; return 1;
if (stat(fn, &st) < 0) { if (stat64(fn, &st) < 0) {
SNDERR("cannot stat file/directory %s", fn); SNDERR("cannot stat file/directory %s", fn);
return 1; return 1;
} }
@ -4116,12 +4116,12 @@ static int config_file_load(snd_config_t *root, const char *fn, int errors)
return config_file_open(root, fn); return config_file_open(root, fn);
#ifndef DOC_HIDDEN #ifndef DOC_HIDDEN
#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID) #if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID)
#define SORTFUNC versionsort #define SORTFUNC versionsort64
#else #else
#define SORTFUNC alphasort #define SORTFUNC alphasort64
#endif #endif
#endif #endif
n = scandir(fn, &namelist, config_filename_filter, SORTFUNC); n = scandir64(fn, &namelist, config_filename_filter, SORTFUNC);
if (n > 0) { if (n > 0) {
int j; int j;
err = 0; err = 0;
@ -4545,9 +4545,9 @@ int snd_config_update_r(snd_config_t **_top, snd_config_update_t **_update, cons
c++; c++;
} }
for (k = 0; k < local->count; ++k) { for (k = 0; k < local->count; ++k) {
struct stat st; struct stat64 st;
struct finfo *lf = &local->finfo[k]; struct finfo *lf = &local->finfo[k];
if (stat(lf->name, &st) >= 0) { if (stat64(lf->name, &st) >= 0) {
lf->dev = st.st_dev; lf->dev = st.st_dev;
lf->ino = st.st_ino; lf->ino = st.st_ino;
lf->mtime = st.st_mtime; lf->mtime = st.st_mtime;