replace *a lot* of file related calls by their GLib counterparts. This is necessary...

[obnox/wireshark/wip.git] / ringbuffer.c

diff --git a/ringbuffer.c b/ringbuffer.c
index 1400420a68db6fb7411a6e77fbe81d7683c2d47e..0c1e7f4b759a1def7cf8d621bf084a10cd33f8ed 100644 (file)
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -48,10 +48,6 @@
 
 #ifdef HAVE_LIBPCAP
 
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -67,11 +63,8 @@
 
 #include <wiretap/wtap.h>
 #include "ringbuffer.h"
+#include "file_util.h"
 
-/* Win32 needs the O_BINARY flag for open() */
-#ifndef O_BINARY
-#define O_BINARY       0
-#endif
 
 /* Ringbuffer file structure */
 typedef struct _rb_file {
@@ -81,8 +74,8 @@ typedef struct _rb_file {
 /* Ringbuffer data structure */
 typedef struct _ringbuf_data {
   rb_file      *files;
-  guint         num_files;           /* Number of ringbuffer files */
-  guint         curr_file_num;       /* Number of the current file */
+  guint         num_files;           /* Number of ringbuffer files (1 to ...) */
+  guint         curr_file_num;       /* Number of the current file (ever increasing) */
   gchar        *fprefix;             /* Filename prefix */
   gchar        *fsuffix;             /* Filename suffix */
   gboolean      unlimited;           /* TRUE if unlimited number of files */
@@ -109,7 +102,7 @@ static int ringbuf_open_file(rb_file *rfile, int *err)
   if (rfile->name != NULL) {
     if (rb_data.unlimited == FALSE) {
       /* remove old file (if any, so ignore error) */
-      unlink(rfile->name);
+      eth_unlink(rfile->name);
     }
     g_free(rfile->name);
   }
@@ -129,7 +122,7 @@ static int ringbuf_open_file(rb_file *rfile, int *err)
     return -1;
   }
 
-  rb_data.fd = open(rfile->name, O_RDWR|O_BINARY|O_TRUNC|O_CREAT, 0600);
+  rb_data.fd = eth_open(rfile->name, O_RDWR|O_BINARY|O_TRUNC|O_CREAT, 0600);
 
   if (rb_data.fd == -1 && err != NULL) {
     *err = errno;
@@ -241,7 +234,7 @@ ringbuf_init_wtap_dump_fdopen(int filetype, int linktype, int snaplen, int *err)
   rb_data.linktype = linktype;
   rb_data.snaplen  = snaplen;
 
-  rb_data.pdh = wtap_dump_fdopen(rb_data.fd, filetype, linktype, snaplen, err);
+  rb_data.pdh = wtap_dump_fdopen(rb_data.fd, filetype, linktype, snaplen, FALSE /* compressed */, err);
 
   return rb_data.pdh;
 }
@@ -258,7 +251,7 @@ ringbuf_switch_file(wtap_dumper **pdh, gchar **save_file, int *save_file_fd, int
   /* close current file */
 
   if (!wtap_dump_close(rb_data.pdh, err)) {
-    close(rb_data.fd); /* XXX - the above should have closed this already */
+    eth_close(rb_data.fd);     /* XXX - the above should have closed this already */
     rb_data.pdh = NULL;        /* it's still closed, we just got an error while closing */
     rb_data.fd = -1;
     return FALSE;
@@ -269,7 +262,8 @@ ringbuf_switch_file(wtap_dumper **pdh, gchar **save_file, int *save_file_fd, int
 
   /* get the next file number and open it */
 
-  next_file_num = (rb_data.curr_file_num + 1) % rb_data.num_files;  
+  rb_data.curr_file_num++ /* = next_file_num*/;
+  next_file_num = (rb_data.curr_file_num) % rb_data.num_files;  
   next_rfile = &rb_data.files[next_file_num];
 
   if (ringbuf_open_file(next_rfile, err) == -1) {
@@ -282,7 +276,6 @@ ringbuf_switch_file(wtap_dumper **pdh, gchar **save_file, int *save_file_fd, int
   }
 
   /* switch to the new file */
-  rb_data.curr_file_num = next_file_num;
   *save_file = next_rfile->name;
   *save_file_fd = rb_data.fd;
   (*pdh) = rb_data.pdh;
@@ -301,7 +294,7 @@ ringbuf_wtap_dump_close(gchar **save_file, int *err)
   /* close current file, if it's open */
   if (rb_data.pdh != NULL) {
     if (!wtap_dump_close(rb_data.pdh, err)) {
-      close(rb_data.fd);
+      eth_close(rb_data.fd);
       ret_val = FALSE;
     }
 
@@ -310,7 +303,7 @@ ringbuf_wtap_dump_close(gchar **save_file, int *err)
   }
 
   /* set the save file name to the current file */
-  *save_file = rb_data.files[rb_data.curr_file_num].name;
+  *save_file = rb_data.files[rb_data.curr_file_num % rb_data.num_files].name;
   return ret_val;
 }
 
@@ -362,14 +355,14 @@ ringbuf_error_cleanup(void)
   /* XXX - it shouldn't still be open; "wtap_dump_close()" should leave the
      file closed even if it fails */
   if (rb_data.fd != -1) {
-    close(rb_data.fd);
+    eth_close(rb_data.fd);
     rb_data.fd = -1;
   }
 
   if (rb_data.files != NULL) {
     for (i=0; i < rb_data.num_files; i++) {
       if (rb_data.files[i].name != NULL) {
-        unlink(rb_data.files[i].name);
+        eth_unlink(rb_data.files[i].name);
       }
     }
   }