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)
static void
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);
f->pos = l;
}
struct fastbuf *
-bopen(byte *name, uns mode, uns buflen)
+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;
+}
+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, buflen, name);
- if (mode & O_APPEND)
- bfd_seek(b, 0, SEEK_END);
return b;
}
#ifdef TEST
-int main(int argc, char **argv)
+int main(int argc UNUSED, char **argv UNUSED)
{
struct fastbuf *f, *t;