bugfix in area-based image scaling

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

diff --git a/lib/fb-file.c b/lib/fb-file.c
index 9fa3f8f545a6a98fece1b1a4eab9e55f23739ad6..9ef992a8b6bf9cf80f3006a579f4000923ddfbc6 100644 (file)
--- a/lib/fb-file.c
+++ b/lib/fb-file.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Fast Buffered I/O on Files
+ *     UCW Library -- Fast Buffered I/O on Files
  *
  *     (c) 1997--2004 Martin Mares <mj@ucw.cz>
  *
@@ -11,7 +11,6 @@
 #include "lib/fastbuf.h"
 #include "lib/lfs.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -119,20 +118,26 @@ bfdopen_internal(int fd, uns buflen, byte *name)
 }
 
 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;
 }