Implemented bfix_tmp_file(), which turns a temporary file fastbuf

[libucw.git] / lib / fastbuf.h

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 70e95336fb6d27b38ffd85d678e6baccecd760ea..9878beeb1593580664f27b5be370e8b088bba60c 100644 (file)
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -63,7 +63,7 @@ struct fastbuf {
   byte is_fastbuf[0];                  /* Dummy field for checking of type casts */
   byte *bptr, *bstop;                  /* Access pointers */
   byte *buffer, *bufend;               /* Start and end of the buffer */
   byte is_fastbuf[0];                  /* Dummy field for checking of type casts */
   byte *bptr, *bstop;                  /* Access pointers */
   byte *buffer, *bufend;               /* Start and end of the buffer */

-  byte *name;                          /* File name for error messages */
+  char *name;                          /* File name for error messages */

   sh_off_t pos;                                /* Position of bstop in the file */
   int (*refill)(struct fastbuf *);     /* Get a buffer with new data */
   void (*spout)(struct fastbuf *);     /* Write buffer data to the file */
   sh_off_t pos;                                /* Position of bstop in the file */
   int (*refill)(struct fastbuf *);     /* Get a buffer with new data */
   void (*spout)(struct fastbuf *);     /* Write buffer data to the file */


@@ -96,35 +96,36 @@ struct cf_section;
 extern struct cf_section fbpar_cf;
 extern struct fb_params fbpar_def;
 
 extern struct cf_section fbpar_cf;
 extern struct fb_params fbpar_def;
 

-struct fastbuf *bopen_file(const byte *name, int mode, struct fb_params *params);      /* Use params==NULL for defaults */
-struct fastbuf *bopen_file_try(const byte *name, int mode, struct fb_params *params);
+struct fastbuf *bopen_file(const char *name, int mode, struct fb_params *params);      /* Use params==NULL for defaults */
+struct fastbuf *bopen_file_try(const char *name, int mode, struct fb_params *params);

 struct fastbuf *bopen_tmp_file(struct fb_params *params);
 struct fastbuf *bopen_fd(int fd, struct fb_params *params);
 
 struct fastbuf *bopen_tmp_file(struct fb_params *params);
 struct fastbuf *bopen_fd(int fd, struct fb_params *params);
 

-/* FastIO on standard files (specify buffer size 0 to enable mmaping) */
+/* FastIO on standard files */

 
 

-struct fastbuf *bfdopen_internal(int fd, const byte *name, uns buflen);
-struct fastbuf *bopen(const byte *name, uns mode, uns buflen);
-struct fastbuf *bopen_try(const byte *name, uns mode, uns buflen);
+struct fastbuf *bfdopen_internal(int fd, const char *name, uns buflen);
+struct fastbuf *bopen(const char *name, uns mode, uns buflen);
+struct fastbuf *bopen_try(const char *name, uns mode, uns buflen);

 struct fastbuf *bopen_tmp(uns buflen);
 struct fastbuf *bfdopen(int fd, uns buflen);
 struct fastbuf *bfdopen_shared(int fd, uns buflen);
 void bfilesync(struct fastbuf *b);
 
 #define TEMP_FILE_NAME_LEN 256
 struct fastbuf *bopen_tmp(uns buflen);
 struct fastbuf *bfdopen(int fd, uns buflen);
 struct fastbuf *bfdopen_shared(int fd, uns buflen);
 void bfilesync(struct fastbuf *b);
 
 #define TEMP_FILE_NAME_LEN 256

-void temp_file_name(byte *name);
+void temp_file_name(char *name);
+void bfix_tmp_file(struct fastbuf *fb, const char *name);

 
 /* Internal functions of some file back-ends */
 
 
 /* Internal functions of some file back-ends */
 

-struct fastbuf *bfmmopen_internal(int fd, const byte *name, uns mode);
+struct fastbuf *bfmmopen_internal(int fd, const char *name, uns mode);

 
 extern uns fbdir_cheat;
 struct asio_queue;
 
 extern uns fbdir_cheat;
 struct asio_queue;

-struct fastbuf *fbdir_open_fd_internal(int fd, const byte *name, struct asio_queue *io_queue, uns buffer_size, uns read_ahead, uns write_back);
+struct fastbuf *fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *io_queue, uns buffer_size, uns read_ahead, uns write_back);

 
 /* FastIO on in-memory streams */
 
 
 /* FastIO on in-memory streams */
 

-struct fastbuf *fbmem_create(unsigned blocksize);      /* Create stream and return its writing fastbuf */
+struct fastbuf *fbmem_create(uns blocksize);           /* Create stream and return its writing fastbuf */

 struct fastbuf *fbmem_clone_read(struct fastbuf *);    /* Create reading fastbuf */
 
 /* FastI on file descriptors with limit */
 struct fastbuf *fbmem_clone_read(struct fastbuf *);    /* Create reading fastbuf */
 
 /* FastI on file descriptors with limit */


@@ -171,7 +172,7 @@ struct fb_atomic {
 };
 #define FB_ATOMIC(f) ((struct fb_atomic *)(f)->is_fastbuf)
 
 };
 #define FB_ATOMIC(f) ((struct fb_atomic *)(f)->is_fastbuf)
 

-struct fastbuf *fbatomic_open(const byte *name, struct fastbuf *master, uns bufsize, int record_len);
+struct fastbuf *fbatomic_open(const char *name, struct fastbuf *master, uns bufsize, int record_len);

 void fbatomic_internal_write(struct fastbuf *b);
 
 static inline void
 void fbatomic_internal_write(struct fastbuf *b);
 
 static inline void


@@ -294,14 +295,14 @@ static inline void bwrite(struct fastbuf *f, const void *b, uns l)
  *     bgets_stk()     the same, but on the stack by alloca()
  */
 
  *     bgets_stk()     the same, but on the stack by alloca()
  */
 

-byte *bgets(struct fastbuf *f, byte *b, uns l);
-byte *bgets0(struct fastbuf *f, byte *b, uns l);
-int bgets_nodie(struct fastbuf *f, byte *b, uns l);
+char *bgets(struct fastbuf *f, char *b, uns l);
+char *bgets0(struct fastbuf *f, char *b, uns l);
+int bgets_nodie(struct fastbuf *f, char *b, uns l);

 
 struct mempool;
 struct bb_t;
 uns bgets_bb(struct fastbuf *f, struct bb_t *b, uns limit);
 
 struct mempool;
 struct bb_t;
 uns bgets_bb(struct fastbuf *f, struct bb_t *b, uns limit);

-byte *bgets_mp(struct fastbuf *f, struct mempool *mp);
+char *bgets_mp(struct fastbuf *f, struct mempool *mp);

 
 struct bgets_stk_struct {
   struct fastbuf *f;
 
 struct bgets_stk_struct {
   struct fastbuf *f;


@@ -313,19 +314,19 @@ void bgets_stk_step(struct bgets_stk_struct *s);
 #define bgets_stk(fb) ({ struct bgets_stk_struct _s; _s.f = (fb); for (bgets_stk_init(&_s); _s.cur_len; _s.cur_buf = alloca(_s.cur_len), bgets_stk_step(&_s)); _s.cur_buf; })
 
 static inline void
 #define bgets_stk(fb) ({ struct bgets_stk_struct _s; _s.f = (fb); for (bgets_stk_init(&_s); _s.cur_len; _s.cur_buf = alloca(_s.cur_len), bgets_stk_step(&_s)); _s.cur_buf; })
 
 static inline void

-bputs(struct fastbuf *f, const byte *b)
+bputs(struct fastbuf *f, const char *b)

 {
   bwrite(f, b, strlen(b));
 }
 
 static inline void
 {
   bwrite(f, b, strlen(b));
 }
 
 static inline void

-bputs0(struct fastbuf *f, const byte *b)
+bputs0(struct fastbuf *f, const char *b)

 {
   bwrite(f, b, strlen(b)+1);
 }
 
 static inline void
 {
   bwrite(f, b, strlen(b)+1);
 }
 
 static inline void

-bputsn(struct fastbuf *f, const byte *b)
+bputsn(struct fastbuf *f, const char *b)

 {
   bputs(f, b);
   bputc(f, '\n');
 {
   bputs(f, b);
   bputc(f, '\n');