Skip to content

P
Postgres FD Implementation
Commit 7e4d4354 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

flockfile/funlockfile is POSIX, so NetBSD has them too --- use them.

parent 0a02d47a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 13 deletions
src/port/fseeko.c
View file @ 7e4d4354
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/port/fseeko.c,v 1.8 2003/01/02 06:00:33 momjian Exp $ * $Header: /cvsroot/pgsql/src/port/fseeko.c,v 1.9 2003/01/02 23:22:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#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>
...@@ -46,17 +44,13 @@ fseeko(FILE *stream, off_t offset, int whence) ...@@ -46,17 +44,13 @@ 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:
...@@ -65,17 +59,13 @@ fseeko(FILE *stream, off_t offset, int whence) ...@@ -65,17 +59,13 @@ 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:
...@@ -84,9 +74,7 @@ fseeko(FILE *stream, off_t offset, int whence) ...@@ -84,9 +74,7 @@ fseeko(FILE *stream, off_t offset, int whence)
} }
failure: failure:
#ifdef bsdi
funlockfile(stream); funlockfile(stream);
#endif
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment