[MPlayer-dev-eng] [PATCH] fseeko doesn't exist everywhere - osdep module attached

[Steven M. Schultz]

Greetings --

	I've run into fseeko/ftello problems on other projects and in the
	spirit of code re-use I've attached a patch which adds a 
	osdep/fseeko.c I've been using for some time.   Also the patch
	updates the configure script and osdep/Makefile.

	I noticed that there was a hack to map ftello to ftell if ftello
	was not present.   That is not needed now because the compatibility
	module's ftello() can be used.   Seems cleaner to use a real compat
	function anyhow ;)

	Cheers,
	Steven Schultz
-------------- next part --------------
--- configure.dist	Sat Mar 13 21:28:54 2004
+++ configure	Wed Mar 24 20:01:24 2004
@@ -2613,6 +2613,19 @@
 fi
 echores "$_strsep"
 
+echocheck "fseeko()"
+cat > $TMPC << EOF
+#include <stdio.h>
+int main (void) { int i; i = fseeko(stdin, 0, 0); return 0; }
+EOF
+_fseeko=no
+cc_check && _fseeko=yes
+if test "$_fseeko" = yes ; then
+ _def_fseeko='#define HAVE_FSEEKO 1'
+else
+ _def_fseeko='#undef HAVE_FSEEKO'
+fi
+echores "$_fseeko"
 
 echocheck "vsscanf()"
 cat > $TMPC << EOF
@@ -5697,9 +5710,10 @@
 fi
 
 echocheck "ftello()"
-# if we don't have ftello map it to ftell
+# if we don't have ftello use the osdep/ compatibility module
 cat > $TMPC << EOF
 #include <stdio.h>
+#include <sys/types.h>
 int main (void) { ftello(stdin); return 0; }
 EOF
 _ftello=no
@@ -6126,11 +6140,14 @@
 /* Define this if your system has the sysinfo header */
 $_def_sys_sysinfo
 
-/* Define this if your system uses ftello() for off_t seeking */
+/* Define this if your system has ftello() */
 
 $_def_ftello
 #ifndef HAVE_FTELLO
-# define ftello(a) ftell(a)
+/* Need these for FILE and off_t an config.h is usually before other includes*/
+#include <stdio.h>
+#include <sys/types.h>
+off_t ftello(FILE *);
 #endif
 
 /* Define this if your system has the "malloc.h" header file */
@@ -6168,6 +6185,15 @@
 
 /* Define this if your system has strsep */
 $_def_strsep
+
+/* Define this if your system has fseeko */
+$_def_fseeko
+#ifndef HAVE_FSEEKO
+/* Need these for FILE and off_t an config.h is usually before other includes*/
+#include <stdio.h>
+#include <sys/types.h>
+int fseek(FILE *, off_t, int);
+#endif
 
 /* Define this if your system has vsscanf */
 $_def_vsscanf
--- osdep/Makefile.dist	Thu May 22 13:51:06 2003
+++ osdep/Makefile	Wed Mar 24 19:35:16 2004
@@ -3,7 +3,7 @@
 
 LIBNAME = libosdep.a
 
-SRCS= shmem.c strsep.c vsscanf.c scandir.c gettimeofday.c # timer.c
+SRCS= shmem.c strsep.c vsscanf.c scandir.c gettimeofday.c fseeko.c # timer.c
 
 ifeq ($(TARGET_ARCH_X86),yes)
 ifeq ($(TARGET_OS),Linux)
-------------- next part --------------
/*
 * fseeko.c
 *	  64-bit versions of fseeko/ftello() for systems which do not have them
 */

#if !defined(HAVE_FSEEKO) || !defined(HAVE_FTELLO)
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#endif

/*
 *	On BSD/OS and NetBSD (and perhaps others), off_t and fpos_t are the 
 *      same.  Standards say off_t is an arithmetic type, but not necessarily 
 *      integral, while fpos_t might be neither.
 *
 *	This is thread-safe on BSD/OS using flockfile/funlockfile.
 */

#ifndef HAVE_FSEEKO
int
fseeko(FILE *stream, off_t offset, int whence)
{
	off_t floc;
	struct stat filestat;

	switch (whence)
	{
		case SEEK_CUR:
			flockfile(stream);
			if (fgetpos(stream, &floc) != 0)
				goto failure;
			floc += offset;
			if (fsetpos(stream, &floc) != 0)
				goto failure;
			funlockfile(stream);
			return 0;
			break;
		case SEEK_SET:
			if (fsetpos(stream, &offset) != 0)
				return -1;
			return 0;
			break;
		case SEEK_END:
			flockfile(stream);
			if (fstat(fileno(stream), &filestat) != 0)
				goto failure;
			floc = filestat.st_size;
			if (fsetpos(stream, &floc) != 0)
				goto failure;
			funlockfile(stream);
			return 0;
			break;
		default:
			errno =	EINVAL;
			return -1;
	}

failure:
	funlockfile(stream);
	return -1;
}
#endif


#ifndef HAVE_FTELLO
off_t
ftello(FILE *stream)
{
	off_t floc;

	if (fgetpos(stream, &floc) != 0)
		return -1;
	return floc;
}
#endif