mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

work around newest open() magic in fedora glibc

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1905 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-25 00:53:49 +00:00
parent 1687226811
commit 5fe1589c8e
1 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/utils/padsp.c
View file

@ -61,6 +61,10 @@
# define SIOCINQ FIONREAD # define SIOCINQ FIONREAD
#endif #endif
/* make sure gcc doesn't redefine open and friends as macros */
#undef open
#undef open64
typedef enum { typedef enum {
FD_INFO_MIXER, FD_INFO_MIXER,
FD_INFO_STREAM, FD_INFO_STREAM,
@ -1436,35 +1440,23 @@ fail:
return -1; return -1;
} }
#undef open static int real_open(const char *filename, int flags, mode_t mode) {
int open(const char *filename, int flags, ...) {
va_list args;
mode_t mode = 0;
int r, _errno = 0; int r, _errno = 0;
debug(DEBUG_LEVEL_VERBOSE, __FILE__": open(%s)\n", filename); debug(DEBUG_LEVEL_VERBOSE, __FILE__": open(%s)\n", filename);
va_start(args, flags);
if (flags & O_CREAT) {
if (sizeof(mode_t) < sizeof(int))
mode = va_arg(args, int);
else
mode = va_arg(args, mode_t);
}
va_end(args);
if (!function_enter()) { if (!function_enter()) {
LOAD_OPEN_FUNC(); LOAD_OPEN_FUNC();
return _open(filename, flags, mode); return _open(filename, flags, mode);
} }
if (dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0)) { if (dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0))
r = dsp_open(flags, &_errno); r = dsp_open(flags, &_errno);
} else if (mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) { else if (mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0)
r = mixer_open(flags, &_errno); r = mixer_open(flags, &_errno);
} else if (sndstat_cloak_enable() && strcmp(filename, "/dev/sndstat") == 0) { else if (sndstat_cloak_enable() && strcmp(filename, "/dev/sndstat") == 0)
r = sndstat_open(flags, &_errno); r = sndstat_open(flags, &_errno);
} else { else {
function_exit(); function_exit();
LOAD_OPEN_FUNC(); LOAD_OPEN_FUNC();
return _open(filename, flags, mode); return _open(filename, flags, mode);
@ -1478,6 +1470,22 @@ int open(const char *filename, int flags, ...) {
return r; return r;
} }
int open(const char *filename, int flags, ...) {
va_list args;
mode_t mode = 0;
if (flags & O_CREAT) {
va_start(args, flags);
if (sizeof(mode_t) < sizeof(int))
mode = va_arg(args, int);
else
mode = va_arg(args, mode_t);
va_end(args);
}
return real_open(filename, flags, mode);
}
static int mixer_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno) { static int mixer_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno) {
int ret = -1; int ret = -1;
@ -2491,17 +2499,20 @@ int stat64(const char *pathname, struct stat64 *buf) {
return 0; return 0;
} }
#undef open64
int open64(const char *filename, int flags, ...) { int open64(const char *filename, int flags, ...) {
va_list args; va_list args;
mode_t mode = 0; mode_t mode = 0;
debug(DEBUG_LEVEL_VERBOSE, __FILE__": open64(%s)\n", filename); debug(DEBUG_LEVEL_VERBOSE, __FILE__": open64(%s)\n", filename);
va_start(args, flags); if (flags & O_CREAT) {
if (flags & O_CREAT) va_start(args, flags);
mode = va_arg(args, mode_t); if (sizeof(mode_t) < sizeof(int))
va_end(args); mode = va_arg(args, int);
else
mode = va_arg(args, mode_t);
va_end(args);
}
if (strcmp(filename, "/dev/dsp") != 0 && if (strcmp(filename, "/dev/dsp") != 0 &&
strcmp(filename, "/dev/adsp") != 0 && strcmp(filename, "/dev/adsp") != 0 &&
@ -2511,7 +2522,7 @@ int open64(const char *filename, int flags, ...) {
return _open64(filename, flags, mode); return _open64(filename, flags, mode);
} }
return open(filename, flags, mode); return real_open(filename, flags, mode);
} }
#endif #endif
@ -2603,7 +2614,7 @@ FILE* fopen(const char *filename, const char *mode) {
if ((((mode[1] == 'b') || (mode[1] == 't')) && (mode[2] == '+')) || (mode[1] == '+')) if ((((mode[1] == 'b') || (mode[1] == 't')) && (mode[2] == '+')) || (mode[1] == '+'))
m = O_RDWR; m = O_RDWR;
if ((fd = open(filename, m)) < 0) if ((fd = real_open(filename, m, 0)) < 0)
return NULL; return NULL;
if (!(f = fdopen(fd, mode))) { if (!(f = fdopen(fd, mode))) {