The Styleguide section has been moved to the Wireshark Developer's Guide.

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

diff --git a/fileset.c b/fileset.c
index c0c192d65d590590765409a8cd5b3c0a4e9f67da..b2db436383c562c055594b3673e7f512624251ac 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -46,12 +46,13 @@
 # include <sys/wait.h>
 #endif
 
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
 
-#include <wiretap/file_util.h>
+#include <wsutil/file_util.h>
 #include "globals.h"
 
 #include <epan/filesystem.h>
@@ -61,12 +62,12 @@
 
 
 typedef struct _fileset {
-  GList         *entries;
-  const char    *dirname;
+    GList   *entries;
+    char    *dirname;
 } fileset;
 
 /* this is the fileset's global data */
-fileset set = { NULL, NULL};
+static fileset set = { NULL, NULL};
 
 
 /* is this a probable file of a file set (does the naming pattern match)? */
@@ -74,18 +75,18 @@ gboolean
 fileset_filename_match_pattern(const char *fname)
 {
     char        *pfx;
-    int         baselen;
-    int         minlen = strlen("_00001_20050418010750");
+    size_t       baselen;
+    size_t      minlen = strlen("_00001_20050418010750");
     char        *filename;
-  
+
 
     /* d:\dir1\test_00001_20050418010750.cap */
     filename = g_strdup(get_basename(fname));
 
     /* test_00001_20050418010750.cap */
     pfx = strrchr(filename, '.');
-    if(pfx == NULL) {
-        return FALSE;
+    if(pfx == NULL) {  /* suffix is optional */
+        pfx = filename + strlen(filename);
     }
     /* test_00001_20050418010750 */
     *pfx = '\0';
@@ -111,7 +112,7 @@ fileset_filename_match_pattern(const char *fname)
     while(minlen--) {
         baselen--;
 
-        if(!isdigit( (int) filename[baselen])) {
+        if(!isdigit( (guchar) filename[baselen])) {
             g_free(filename);
             return FALSE;
         }
@@ -133,7 +134,7 @@ fileset_is_file_in_set(const char *fname1, const char *fname2)
     char        *pfx2;
     char        *dup_f1;
     char        *dup_f2;
-    int         minlen = strlen("_00001_20050418010750");
+    size_t       minlen = strlen("_00001_20050418010750");
 
 
     /* just to be sure ... */
@@ -145,6 +146,9 @@ fileset_is_file_in_set(const char *fname1, const char *fname2)
 
     pfx1 = strrchr(dup_f1, '.');
     pfx2 = strrchr(dup_f2, '.');
+    /* suffix is optional */
+    if (!pfx1) pfx1 = dup_f1 + strlen(dup_f1);
+    if (!pfx2) pfx2 = dup_f2 + strlen(dup_f2);
 
     /* the optional suffix (file extension) must be equal */
     if(strcmp(pfx1, pfx2) != 0) {
@@ -180,7 +184,7 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current)
 
     path = g_strdup_printf("%s%s", dirname, fname);
 
-    fh = eth_open( path, O_RDONLY, 0000 /* no creation so don't matter */);
+    fh = ws_open( path, O_RDONLY, 0000 /* no creation so don't matter */);
     if(fh !=  -1) {
 
         /* Get statistics */
@@ -188,7 +192,7 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current)
 
         /* Show statistics if they are valid */
         if( result == 0 ) {
-            entry = g_malloc(sizeof(fileset_entry));
+            entry = (fileset_entry *)g_malloc(sizeof(fileset_entry));
 
             entry->fullname = g_strdup(path);
             entry->name     = g_strdup(fname);
@@ -200,7 +204,7 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current)
             set.entries = g_list_append(set.entries, entry);
         }
 
-        eth_close(fh);
+        ws_close(fh);
     }
 
     g_free(path);
@@ -213,10 +217,10 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current)
 static gint
 fileset_sort_compare(gconstpointer a, gconstpointer b)
 {
-    const fileset_entry *entry_a = a;
-    const fileset_entry *entry_b = b;
+    const fileset_entry *entry_a = (const fileset_entry *)a;
+    const fileset_entry *entry_b = (const fileset_entry *)b;
 
-       return strcmp(entry_a->name, entry_b->name);
+    return strcmp(entry_a->name, entry_b->name);
 }
 
 
@@ -229,7 +233,7 @@ void fileset_update_dlg(void)
     /* add all entires to the dialog */
     le = g_list_first(set.entries);
     while(le) {
-        fileset_dlg_add_file(le->data);
+        fileset_dlg_add_file((fileset_entry *)le->data);
         le = g_list_next(le);
     }
 }
@@ -239,10 +243,9 @@ void fileset_update_dlg(void)
 void
 fileset_add_dir(const char *fname)
 {
-    ETH_DIR       *dir;             /* scanned directory */
-    ETH_DIRENT    *file;            /* current file */
+    WS_DIR        *dir;             /* scanned directory */
+    WS_DIRENT     *file;            /* current file */
     const char    *name;
-    fileset_entry *entry;
     GString       *dirname;
     gchar         *fname_dup;
 
@@ -252,26 +255,26 @@ fileset_add_dir(const char *fname)
     dirname = g_string_new(fname_dup);
     g_free(fname_dup);
 
-    set.dirname = g_strdup(dirname->str);    
-    
+    set.dirname = g_strdup(dirname->str);
+
     dirname = g_string_append_c(dirname, G_DIR_SEPARATOR);
 
     /* is the current file probably a part of any fileset? */
     if(fileset_filename_match_pattern(fname)) {
         /* yes, go through the files in the directory and check if the file in question is part of the current file set */
-        if ((dir = eth_dir_open(dirname->str, 0, NULL)) != NULL) {
-               while ((file = eth_dir_read_name(dir)) != NULL) {
-                   name = eth_dir_get_name(file);
+        if ((dir = ws_dir_open(dirname->str, 0, NULL)) != NULL) {
+            while ((file = ws_dir_read_name(dir)) != NULL) {
+                name = ws_dir_get_name(file);
                 if(fileset_filename_match_pattern(name) && fileset_is_file_in_set(name, get_basename(fname))) {
                     fileset_add_file(dirname->str, name, strcmp(name, get_basename(fname))== 0 /* current */);
                 }
             } /* while */
 
-            eth_dir_close(dir);
+            ws_dir_close(dir);
         } /* if */
     } else {
         /* no, this is a "standalone file", just add this one */
-        entry = fileset_add_file(dirname->str, get_basename(fname), TRUE /* current */);
+        fileset_add_file(dirname->str, get_basename(fname), TRUE /* current */);
         /* don't add the file to the dialog here, this will be done in fileset_update_dlg() below */
     }
 
@@ -303,7 +306,7 @@ fileset_get_current(void)
     /* add all entires to the dialog */
     le = g_list_first(set.entries);
     while(le) {
-        entry = le->data;
+        entry = (fileset_entry *)le->data;
         if(entry->current) {
             return le;
         }
@@ -331,7 +334,7 @@ fileset_get_next(void)
         return NULL;
     }
 
-    return le->data;
+    return (fileset_entry *)le->data;
 }
 
 
@@ -352,19 +355,20 @@ fileset_get_previous(void)
         return NULL;
     }
 
-    return le->data;
+    return (fileset_entry *)le->data;
 }
 
 
 /* delete a single entry */
 static void fileset_entry_delete(gpointer data, gpointer user_data _U_)
 {
-    fileset_entry *entry = data;
+    fileset_entry *entry = (fileset_entry *)data;
 
     g_free( (gpointer) entry->fullname);
     entry->fullname = NULL;
     g_free( (gpointer) entry->name);
     entry->name = NULL;
+    g_free(entry);
 }