Cleanup of file fastbufs.

[libucw.git] / lib / fb-param.c

diff --git a/lib/fb-param.c b/lib/fb-param.c
index 0180f62b4a66e3a938b8ea86ce81eae8c43e7715..bbe9e3409579b10bd3c295934993ab87ea1aabda 100644 (file)
--- a/lib/fb-param.c
+++ b/lib/fb-param.c
@@ -2,6 +2,7 @@
  *     UCW Library -- FastIO on files with run-time parametrization
  *
  *     (c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *     (c) 2007 Martin Mares <mj@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
@@ -49,9 +50,9 @@ fbpar_global_init(void)
 }
 
 static struct fastbuf *
-bopen_fd_internal(int fd, struct fb_params *params, uns mode, const byte *name)
+bopen_fd_internal(int fd, struct fb_params *params, uns mode, const char *name)
 {
-  byte buf[32];
+  char buf[32];
   if (!name)
     {
       sprintf(buf, "fd%d", fd);
@@ -84,8 +85,10 @@ bopen_fd_internal(int fd, struct fb_params *params, uns mode, const byte *name)
 }
 
 static struct fastbuf *
-bopen_file_internal(const byte *name, int mode, struct fb_params *params, int try)
+bopen_file_internal(const char *name, int mode, struct fb_params *params, int try)
 {
+  if (!params)
+    params = &fbpar_def;
   if (params->type == FB_DIRECT && !fbdir_cheat)
     mode |= O_DIRECT;
   if (params->type == FB_MMAP && (mode & O_ACCMODE) == O_WRONLY)
@@ -106,13 +109,13 @@ bopen_file_internal(const byte *name, int mode, struct fb_params *params, int tr
 struct fastbuf *
 bopen_file(const char *name, int mode, struct fb_params *params)
 {
-  return bopen_file_internal(name, mode, params ? : &fbpar_def, 0);
+  return bopen_file_internal(name, mode, params, 0);
 }
 
 struct fastbuf *
 bopen_file_try(const char *name, int mode, struct fb_params *params)
 {
-  return bopen_file_internal(name, mode, params ? : &fbpar_def, 1);
+  return bopen_file_internal(name, mode, params, 1);
 }
 
 struct fastbuf *
@@ -121,12 +124,47 @@ bopen_fd(int fd, struct fb_params *params)
   return bopen_fd_internal(fd, params ? : &fbpar_def, ~0U, NULL);
 }
 
+/* Function for use by individual file back-ends */
+
+void
+bclose_file_helper(struct fastbuf *f, int fd, int is_temp_file)
+{
+  switch (is_temp_file)
+    {
+    case 1:
+      if (unlink(f->name) < 0)
+       msg(L_ERROR, "unlink(%s): %m", f->name);
+    case 0:
+      if (close(fd))
+       die("close(%s): %m", f->name);
+    }
+}
+
+/* Compatibility wrappers */
+
 struct fastbuf *
-bopen_tmp_file(struct fb_params *params)
+bopen_try(const char *name, uns mode, uns buflen)
 {
-  byte buf[TEMP_FILE_NAME_LEN];
-  temp_file_name(buf);
-  struct fastbuf *fb = bopen_file_internal(buf, O_RDWR | O_CREAT | O_TRUNC, params, 0);
-  bconfig(fb, BCONFIG_IS_TEMP_FILE, 1);
-  return fb;
+  return bopen_file_try(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
 }
+
+struct fastbuf *
+bopen(const char *name, uns mode, uns buflen)
+{
+  return bopen_file(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
+struct fastbuf *
+bfdopen(int fd, uns buflen)
+{
+  return bopen_fd(fd, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
+struct fastbuf *
+bfdopen_shared(int fd, uns buflen)
+{
+  struct fastbuf *f = bfdopen(fd, buflen);
+  bconfig(f, BCONFIG_IS_TEMP_FILE, -1);
+  return f;
+}
+