X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-file.c;h=9ef992a8b6bf9cf80f3006a579f4000923ddfbc6;hb=ba92e10cb8a623a5c59305b51f8ef364998cd871;hp=abb29ddf3f9bdd144c2f42417a94b2fe9eff1109;hpb=6a8ae5549f28ef50110e23ffd418105ef8f38d79;p=libucw.git

diff --git a/lib/fb-file.c b/lib/fb-file.c
index abb29ddf..9ef992a8 100644
--- a/lib/fb-file.c
+++ b/lib/fb-file.c
@@ -1,7 +1,7 @@
 /*
- *	Sherlock Library -- Fast Buffered I/O on Files
+ *	UCW Library -- Fast Buffered I/O on Files
  *
- *	(c) 1997--2002 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -11,7 +11,6 @@
 #include "lib/fastbuf.h"
 #include "lib/lfs.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -22,14 +21,15 @@ struct fb_file {
   int is_temp_file;			/* 0=normal file, 1=temporary file, delete on close, -1=shared FD */
 };
 #define FB_FILE(f) ((struct fb_file *)(f)->is_fastbuf)
+#define FB_BUFFER(f) (byte *)(FB_FILE(f) + 1)
 
 static int
 bfd_refill(struct fastbuf *f)
 {
+  f->bptr = f->buffer = FB_BUFFER(f);
   int l = read(FB_FILE(f)->fd, f->buffer, f->bufend-f->buffer);
   if (l < 0)
     die("Error reading %s: %m", f->name);
-  f->bptr = f->buffer;
   f->bstop = f->buffer + l;
   f->pos += l;
   return l;
@@ -39,7 +39,7 @@ static void
 bfd_spout(struct fastbuf *f)
 {
   int l = f->bptr - f->buffer;
-  char *c = f->buffer;
+  byte *c = f->buffer;
 
   f->pos += l;
   while (l)
@@ -50,7 +50,7 @@ bfd_spout(struct fastbuf *f)
       l -= z;
       c += z;
     }
-  f->bptr = f->buffer;
+  f->bptr = f->buffer = FB_BUFFER(f);
 }
 
 static void
@@ -89,8 +89,6 @@ bfd_config(struct fastbuf *f, uns item, int value)
     case BCONFIG_IS_TEMP_FILE:
       FB_FILE(f)->is_temp_file = value;
       return 0;
-    case BCONFIG_CAN_OVERWRITE:
-      return 1;
     default:
       return -1;
     }
@@ -104,7 +102,7 @@ bfdopen_internal(int fd, uns buflen, byte *name)
   struct fastbuf *f = &F->fb;
 
   bzero(F, sizeof(*F));
-  f->buffer = (char *)(F+1);
+  f->buffer = (byte *)(F+1);
   f->bptr = f->bstop = f->buffer;
   f->bufend = f->buffer + buflen;
   f->name = f->bufend;
@@ -115,44 +113,59 @@ bfdopen_internal(int fd, uns buflen, byte *name)
   f->seek = bfd_seek;
   f->close = bfd_close;
   f->config = bfd_config;
+  f->can_overwrite_buffer = 2;
   return f;
 }
 
 struct fastbuf *
-bopen(byte *name, uns mode, uns buffer)
+bopen_try(byte *name, uns mode, uns buflen)
 {
-  struct fastbuf *b;
-  int fd;
+  int fd = sh_open(name, mode, 0666);
+  if (fd < 0)
+    return NULL;
+  struct fastbuf *b = bfdopen_internal(fd, buflen, name);
+  if (mode & O_APPEND)
+    bfd_seek(b, 0, SEEK_END);
+  return b;
+}
 
-  if (!buffer)
+struct fastbuf *
+bopen(byte *name, uns mode, uns buflen)
+{
+  if (!buflen)
     return bopen_mm(name, mode);
-  fd = sh_open(name, mode, 0666);
-  if (fd < 0)
+  struct fastbuf *b = bopen_try(name, mode, buflen);
+  if (!b)
     die("Unable to %s file %s: %m",
 	(mode & O_CREAT) ? "create" : "open", name);
-  b = bfdopen_internal(fd, buffer, name);
-  if (mode & O_APPEND)
-    bfd_seek(b, 0, SEEK_END);
   return b;
 }
 
 struct fastbuf *
-bfdopen(int fd, uns buffer)
+bfdopen(int fd, uns buflen)
 {
   byte x[32];
 
   sprintf(x, "fd%d", fd);
-  return bfdopen_internal(fd, buffer, x);
+  return bfdopen_internal(fd, buflen, x);
 }
 
 struct fastbuf *
-bfdopen_shared(int fd, uns buffer)
+bfdopen_shared(int fd, uns buflen)
 {
-  struct fastbuf *f = bfdopen(fd, buffer);
+  struct fastbuf *f = bfdopen(fd, buflen);
   FB_FILE(f)->is_temp_file = -1;
   return f;
 }
 
+void
+bfilesync(struct fastbuf *b)
+{
+  bflush(b);
+  if (fsync(FB_FILE(b)->fd) < 0)
+    log(L_ERROR, "fsync(%s) failed: %m", b->name);
+}
+
 #ifdef TEST
 
 int main(int argc, char **argv)