add new function tvb_get_ephemeral_stringz()

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

diff --git a/fileset.c b/fileset.c
index f8d2c34ffd74fb9f15dd20d7bcaa68cff2fecf9c..0a1191be8ea40f3de595e4559366a9b9b87c5d75 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -26,6 +26,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
@@ -34,6 +38,10 @@
 #include <fcntl.h>
 #endif
 
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
@@ -43,6 +51,7 @@
 #endif
 
 #include <string.h>
+#include <ctype.h>
 
 #include <glib.h>
 
@@ -105,7 +114,7 @@ fileset_filename_match_pattern(const char *fname)
     while(minlen--) {
         baselen--;
 
-        if(!isdigit(filename[baselen])) {
+        if(!isdigit( (int) filename[baselen])) {
             g_free(filename);
             return FALSE;
         }
@@ -119,6 +128,7 @@ fileset_filename_match_pattern(const char *fname)
 
 
 /* test, if both files could be in the same file set */
+/* (the filenames must already be in correct shape) */
 gboolean
 fileset_is_file_in_set(const char *fname1, const char *fname2)
 {
@@ -129,12 +139,17 @@ fileset_is_file_in_set(const char *fname1, const char *fname2)
     int         minlen = strlen("_00001_20050418010750");
 
 
+    /* just to be sure ... */
+    g_assert(fileset_filename_match_pattern(fname1));
+    g_assert(fileset_filename_match_pattern(fname2));
+
     dup_f1 = g_strdup(fname1);
     dup_f2 = g_strdup(fname2);
 
     pfx1 = strrchr(dup_f1, '.');
     pfx2 = strrchr(dup_f2, '.');
 
+    /* the optional suffix (file extension) must be equal */
     if(strcmp(pfx1, pfx2) != 0) {
         g_free(dup_f1);
         g_free(dup_f2);
@@ -250,33 +265,42 @@ fileset_add_dir(const char *fname)
     
     dirname = g_string_append_c(dirname, G_DIR_SEPARATOR);
 
-    dummy = g_malloc(sizeof(GError *));
-    *dummy = NULL;
+    /* 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 GLIB_MAJOR_VERSION < 2
+        if ((dir = opendir(dirname->str)) != NULL) {
+               while ((file = readdir(dir)) != NULL) {
+                   name = (gchar *)file->d_name;
+#else
+        dummy = g_malloc(sizeof(GError *));
+        *dummy = NULL;
 
-    /* if the current file can't be part of any fileset, do nothing */
-    if(!fileset_filename_match_pattern(fname)) {
-        entry = fileset_add_file(dirname->str, get_basename(fname), TRUE /* current */);
-        if(entry) {
-            fileset_dlg_add_file(entry);
-        }
-    }
+        if ((dir = g_dir_open(dirname->str, 0, dummy)) != NULL) {
+            while ((name = g_dir_read_name(dir)) != NULL) {
+#endif
+                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 */
 
-    /* go through the files in the directory and check if it's part of the current file set */
 #if GLIB_MAJOR_VERSION < 2
-    if ((dir = opendir(dirname)) != NULL) {
-           while ((file = readdir(dir)) != NULL) {
-               name = (gchar *)file->d_name;
+            closedir(dir);
 #else
-    if ((dir = g_dir_open(dirname->str, 0, dummy)) != NULL) {
-        while ((name = g_dir_read_name(dir)) != NULL) {
+            g_dir_close(dir);
 #endif
-            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 */);
-            }
+        } /* if */
+#if GLIB_MAJOR_VERSION >= 2
+        g_free(dummy);
+#endif
+    } else {
+        /* no, this is a "standalone file", just add this one */
+        entry = fileset_add_file(dirname->str, get_basename(fname), TRUE /* current */);
+        if(entry) {
+            fileset_dlg_add_file(entry);
         }
     }
 
-    g_free(dummy);
     g_string_free(dirname, TRUE /* free_segment */);
 
     /* sort entries by creation time */
@@ -359,7 +383,7 @@ fileset_get_previous(void)
 
 
 /* delete a single entry */
-void fileset_entry_delete(gpointer data, gpointer user_data)
+void fileset_entry_delete(gpointer data, gpointer user_data _U_)
 {
     fileset_entry *entry = data;