mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-03 20:01:16 +00:00
530cecdb7b
Clang complains about it:
error: second argument to 'va_arg' is of promotable type
'mode_t' (aka 'unsigned short'); this va_arg has undefined
behavior because arguments will be promoted to 'int'
[-Werror,-Wvarargs]
mode = va_arg(ap, mode_t);
^~~~~~
Work around the issue by passing int to va_arg() and casting
its return value to mode_t afterwards.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
139 lines
3.0 KiB
C
139 lines
3.0 KiB
C
/*
|
|
* Copyright (C) 2016 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Michal Privoznik <mprivozn@redhat.com>
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ifdef NSS
|
|
# include "virmock.h"
|
|
# include <sys/types.h>
|
|
# include <dirent.h>
|
|
# include <sys/stat.h>
|
|
# include <fcntl.h>
|
|
# include <unistd.h>
|
|
|
|
# include "configmake.h"
|
|
# include "virstring.h"
|
|
# include "viralloc.h"
|
|
|
|
static int (*real_open)(const char *path, int flags, ...);
|
|
static DIR * (*real_opendir)(const char *name);
|
|
static int (*real_access)(const char *path, int mode);
|
|
|
|
# define LEASEDIR LOCALSTATEDIR "/lib/libvirt/dnsmasq/"
|
|
|
|
/*
|
|
* Functions to load the symbols and init the environment
|
|
*/
|
|
static void
|
|
init_syms(void)
|
|
{
|
|
if (real_open)
|
|
return;
|
|
|
|
VIR_MOCK_REAL_INIT(open);
|
|
VIR_MOCK_REAL_INIT(opendir);
|
|
VIR_MOCK_REAL_INIT(access);
|
|
}
|
|
|
|
static int
|
|
getrealpath(char **newpath,
|
|
const char *path)
|
|
{
|
|
if (STRPREFIX(path, LEASEDIR)) {
|
|
if (virAsprintfQuiet(newpath, "%s/nssdata/%s",
|
|
abs_srcdir,
|
|
path + strlen(LEASEDIR)) < 0) {
|
|
errno = ENOMEM;
|
|
return -1;
|
|
}
|
|
} else {
|
|
if (VIR_STRDUP_QUIET(*newpath, path) < 0)
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
open(const char *path, int flags, ...)
|
|
{
|
|
int ret;
|
|
char *newpath = NULL;
|
|
|
|
init_syms();
|
|
|
|
if (STRPREFIX(path, LEASEDIR) &&
|
|
getrealpath(&newpath, path) < 0)
|
|
return -1;
|
|
|
|
if (flags & O_CREAT) {
|
|
va_list ap;
|
|
mode_t mode;
|
|
va_start(ap, flags);
|
|
mode = (mode_t) va_arg(ap, int);
|
|
va_end(ap);
|
|
ret = real_open(newpath ? newpath : path, flags, mode);
|
|
} else {
|
|
ret = real_open(newpath ? newpath : path, flags);
|
|
}
|
|
|
|
free(newpath);
|
|
return ret;
|
|
}
|
|
|
|
DIR *
|
|
opendir(const char *path)
|
|
{
|
|
DIR *ret;
|
|
char *newpath = NULL;
|
|
|
|
init_syms();
|
|
|
|
if (STRPREFIX(path, LEASEDIR) &&
|
|
getrealpath(&newpath, path) < 0)
|
|
return NULL;
|
|
|
|
ret = real_opendir(newpath ? newpath : path);
|
|
|
|
free(newpath);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
access(const char *path, int mode)
|
|
{
|
|
int ret;
|
|
char *newpath = NULL;
|
|
|
|
init_syms();
|
|
|
|
if (STRPREFIX(path, LEASEDIR) &&
|
|
getrealpath(&newpath, path) < 0)
|
|
return -1;
|
|
|
|
ret = real_access(newpath ? newpath : path, mode);
|
|
|
|
free(newpath);
|
|
return ret;
|
|
}
|
|
#else
|
|
/* Nothing to override if NSS plugin is not enabled */
|
|
#endif
|