#include "lib/fastbuf.h"
#include "lib/lfs.h"
-#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
struct fb_file {
struct fastbuf fb;
- int fd; /* File descriptor, -1 if not a real file */
+ int fd; /* File descriptor */
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)
f->bptr = f->buffer = FB_BUFFER(f);
}
-static void
+static int
bfd_seek(struct fastbuf *f, sh_off_t pos, int whence)
{
- sh_off_t l;
-
- if (whence == SEEK_SET && pos == f->pos)
- return;
-
- l = sh_seek(FB_FILE(f)->fd, pos, whence);
+ sh_off_t l = sh_seek(FB_FILE(f)->fd, pos, whence);
if (l < 0)
- die("lseek on %s: %m", f->name);
+ return 0;
f->pos = l;
+ return 1;
}
static void
}
}
-static struct fastbuf *
-bfdopen_internal(int fd, uns buflen, byte *name)
+struct fastbuf *
+bfdopen_internal(int fd, byte *name, uns buflen)
{
+ ASSERT(buflen);
int namelen = strlen(name) + 1;
struct fb_file *F = xmalloc(sizeof(struct fb_file) + buflen + namelen);
struct fastbuf *f = &F->fb;
return f;
}
+struct fastbuf *
+bopen_try(byte *name, uns mode, uns buflen)
+{
+ return bopen_file_try(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
struct fastbuf *
bopen(byte *name, uns mode, uns buflen)
{
- struct fastbuf *b;
- int fd;
-
- if (!buflen)
- return bopen_mm(name, mode);
- fd = sh_open(name, mode, 0666);
- if (fd < 0)
- die("Unable to %s file %s: %m",
- (mode & O_CREAT) ? "create" : "open", name);
- b = bfdopen_internal(fd, buflen, name);
- if (mode & O_APPEND)
- bfd_seek(b, 0, SEEK_END);
- return b;
+ return bopen_file(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
}
struct fastbuf *
bfdopen(int fd, uns buflen)
{
- byte x[32];
-
- sprintf(x, "fd%d", fd);
- return bfdopen_internal(fd, buflen, x);
+ return bopen_fd(fd, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
}
struct fastbuf *
#ifdef TEST
-int main(int argc, char **argv)
+int main(int argc UNUSED, char **argv UNUSED)
{
struct fastbuf *f, *t;