Attachment #191792 for bug #270436





#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__bsdi__)
typedef unsigned long request_t;
typedef off_t off64_t;
#else
typedef int request_t;
#endif

	      const char *pathname, int flags, ...)
{
  va_list args;
  mode_t mode = 0;

  dsp_init ();

  if ((flags & O_CREAT) != 0)
    {
      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);
    }

  if (!strcmp (pathname, "/dev/dsp"))
    {

{
  static int (*func) (const char *, int, mode_t) = NULL;
  va_list args;
  mode_t mode = 0;

  DPRINTF ("open\n");


	}
    }

  if ((flags & O_CREAT) != 0)
    {
      va_start (args, flags);
      mode = va_arg (args, mode_t);
      va_end (args);
    }

  return open_wrapper(func, pathname, flags, mode);
}

{
  static int (*func) (const char *, int, mode_t) = NULL;
  va_list args;
  mode_t mode = 0;

  DPRINTF ("open64\n");


	}
    }

  if ((flags & O_CREAT) != 0)
    {
      va_start (args, flags);
      mode = va_arg (args, mode_t);
      va_end (args);
    }

  return open_wrapper(func, pathname, flags, mode);
}

Lines 106-112 Link Here

(-)esound-0.2.41.orig/esddsp.in (-1 / +1 lines)
106	prefix=@prefix@	106	prefix=@prefix@
107	exec_prefix=@exec_prefix@	107	exec_prefix=@exec_prefix@
108		108
109	LD_PRELOAD="libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"	109	LD_PRELOAD="libesddsp.so libesd.so $LD_PRELOAD"
110	export LD_PRELOAD	110	export LD_PRELOAD
111		111
112	# invoke the program with the args given	112	# invoke the program with the args given

Return to bug 270436

Lines 70-75 Link Here

(-)esound-0.2.41.orig/esddsp.c (-13 / +23 lines)
70		70
71	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__bsdi__)	71	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__bsdi__)
72	typedef unsigned long request_t;	72	typedef unsigned long request_t;
		73	typedef off_t off64_t;
73	#else	74	#else
74	typedef int request_t;	75	typedef int request_t;
75	#endif	76	#endif
Lines 228-243 Link Here
228	const char *pathname, int flags, ...)	229	const char *pathname, int flags, ...)
229	{	230	{
230	va_list args;	231	va_list args;
231	mode_t mode;	232	mode_t mode = 0;
232		233
233	dsp_init ();	234	dsp_init ();
234		235
235	va_start (args, flags);	236	if ((flags & O_CREAT) != 0)
236	if (sizeof (mode_t) < sizeof (int))	237	{
		238	va_start (args, flags);
		239	if (sizeof (mode_t) < sizeof (int))
237	mode = va_arg (args, int);	240	mode = va_arg (args, int);
238	else	241	else
239	mode = va_arg (args, mode_t);	242	mode = va_arg (args, mode_t);
240	va_end (args);	243	va_end (args);
		244	}
241		245
242	if (!strcmp (pathname, "/dev/dsp"))	246	if (!strcmp (pathname, "/dev/dsp"))
243	{	247	{
Lines 268-274 Link Here
268	{	272	{
269	static int (func) (const char , int, mode_t) = NULL;	273	static int (func) (const char , int, mode_t) = NULL;
270	va_list args;	274	va_list args;
271	mode_t mode;	275	mode_t mode = 0;
272		276
273	DPRINTF ("open\n");	277	DPRINTF ("open\n");
274		278
Lines 283-291 Link Here
283	}	287	}
284	}	288	}
285		289
286	va_start (args, flags);	290	if ((flags & O_CREAT) != 0)
287	mode = va_arg (args, mode_t);	291	{
288	va_end (args);	292	va_start (args, flags);
		293	mode = va_arg (args, mode_t);
		294	va_end (args);
		295	}
289		296
290	return open_wrapper(func, pathname, flags, mode);	297	return open_wrapper(func, pathname, flags, mode);
291	}	298	}
Lines 295-301 Link Here
295	{	302	{
296	static int (func) (const char , int, mode_t) = NULL;	303	static int (func) (const char , int, mode_t) = NULL;
297	va_list args;	304	va_list args;
298	mode_t mode;	305	mode_t mode = 0;
299		306
300	DPRINTF ("open64\n");	307	DPRINTF ("open64\n");
301		308
Lines 310-318 Link Here
310	}	317	}
311	}	318	}
312		319
313	va_start (args, flags);	320	if ((flags & O_CREAT) != 0)
314	mode = va_arg (args, mode_t);	321	{
315	va_end (args);	322	va_start (args, flags);
		323	mode = va_arg (args, mode_t);
		324	va_end (args);
		325	}
316		326
317	return open_wrapper(func, pathname, flags, mode);	327	return open_wrapper(func, pathname, flags, mode);
318	}	328	}