Add Windows version info resource.

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

diff --git a/fileset.c b/fileset.c
index 81cc739d7f596882304733c64fbc5aaa7c6d45a7..08201f7ee33d5f446b34cf472d342f13de892600 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -84,8 +84,8 @@ fileset_filename_match_pattern(const char *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';
@@ -145,6 +145,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) {
@@ -272,9 +275,7 @@ fileset_add_dir(const char *fname)
     } 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);
-        }
+        /* don't add the file to the dialog here, this will be done in fileset_update_dlg() below */
     }
 
     g_string_free(dirname, TRUE /* free_segment */);