Skip to content
Snippets Groups Projects
Commit bb665255 authored by Bruce Momjian's avatar Bruce Momjian
Browse files

Back out flockfile change for NetBSD. Giles Lean reports they are not

supported.
parent 43057c7a
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/port/fseeko.c,v 1.9 2003/01/02 23:22:49 momjian Exp $ * $Header: /cvsroot/pgsql/src/port/fseeko.c,v 1.10 2003/01/11 19:38:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
#include "c.h" #include "c.h"
#ifdef bsdi
#include <pthread.h> #include <pthread.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
...@@ -44,13 +46,17 @@ fseeko(FILE *stream, off_t offset, int whence) ...@@ -44,13 +46,17 @@ fseeko(FILE *stream, off_t offset, int whence)
switch (whence) switch (whence)
{ {
case SEEK_CUR: case SEEK_CUR:
#ifdef bsdi
flockfile(stream); flockfile(stream);
#endif
if (fgetpos(stream, &floc) != 0) if (fgetpos(stream, &floc) != 0)
goto failure; goto failure;
floc += offset; floc += offset;
if (fsetpos(stream, &floc) != 0) if (fsetpos(stream, &floc) != 0)
goto failure; goto failure;
#ifdef bsdi
funlockfile(stream); funlockfile(stream);
#endif
return 0; return 0;
break; break;
case SEEK_SET: case SEEK_SET:
...@@ -59,13 +65,17 @@ fseeko(FILE *stream, off_t offset, int whence) ...@@ -59,13 +65,17 @@ fseeko(FILE *stream, off_t offset, int whence)
return 0; return 0;
break; break;
case SEEK_END: case SEEK_END:
#ifdef bsdi
flockfile(stream); flockfile(stream);
#endif
if (fstat(fileno(stream), &filestat) != 0) if (fstat(fileno(stream), &filestat) != 0)
goto failure; goto failure;
floc = filestat.st_size; floc = filestat.st_size;
if (fsetpos(stream, &floc) != 0) if (fsetpos(stream, &floc) != 0)
goto failure; goto failure;
#ifdef bsdi
funlockfile(stream); funlockfile(stream);
#endif
return 0; return 0;
break; break;
default: default:
...@@ -74,7 +84,9 @@ fseeko(FILE *stream, off_t offset, int whence) ...@@ -74,7 +84,9 @@ fseeko(FILE *stream, off_t offset, int whence)
} }
failure: failure:
#ifdef bsdi
funlockfile(stream); funlockfile(stream);
#endif
return -1; return -1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment