*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
# 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>
+#include <epan/strutil.h>
#include "fileset.h"
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)? */
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';
while(minlen--) {
baselen--;
- if(!isdigit( (int) filename[baselen])) {
+ if(!isdigit( (guchar) filename[baselen])) {
g_free(filename);
return FALSE;
}
/* test, if both files could be in the same file set */
/* (the filenames must already be in correct shape) */
-gboolean
+static gboolean
fileset_is_file_in_set(const char *fname1, const char *fname2)
{
char *pfx1;
char *pfx2;
char *dup_f1;
char *dup_f2;
- int minlen = strlen("_00001_20050418010750");
+ size_t minlen = strlen("_00001_20050418010750");
/* just to be sure ... */
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) {
return TRUE;
}
+/* GCompareFunc helper for g_list_find_custom() */
+static gint
+fileset_find_by_path(gconstpointer a, gconstpointer b)
+{
+ const fileset_entry *entry;
+ const char *path;
+
+ entry = (const fileset_entry *) a;
+ path = (const char *) b;
+
+ return g_strcmp0(entry->fullname, path);
+}
+
+/* update the time and size of this file in the list */
+void
+fileset_update_file(const char *path)
+{
+ int fh, result;
+ ws_statb64 buf;
+ fileset_entry *entry = NULL;
+ GList *entry_list;
+
+ fh = ws_open( path, O_RDONLY, 0000 /* no creation so don't matter */);
+ if(fh != -1) {
+
+ /* Get statistics */
+ result = ws_fstat64( fh, &buf );
+
+ /* Show statistics if they are valid */
+ if( result == 0 ) {
+ entry_list = g_list_find_custom(set.entries, path,
+ fileset_find_by_path);
+
+ if (entry_list) {
+ entry = (fileset_entry *) entry_list->data;
+ entry->ctime = buf.st_ctime;
+ entry->mtime = buf.st_mtime;
+ entry->size = buf.st_size;
+ }
+ }
+
+ ws_close(fh);
+ }
+}
/* we know this file is part of the set, so add it */
static fileset_entry *
fileset_add_file(const char *dirname, const char *fname, gboolean current)
{
int fh, result;
- struct stat buf;
+ ws_statb64 buf;
char *path;
fileset_entry *entry = NULL;
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 */
- result = fstat( fh, &buf );
+ result = ws_fstat64( fh, &buf );
/* 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);
set.entries = g_list_append(set.entries, entry);
}
- eth_close(fh);
+ ws_close(fh);
}
g_free(path);
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);
}
/* add all file set entries to the dialog */
-void fileset_update_dlg(void)
+void fileset_update_dlg(void *window)
{
GList *le;
/* 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, window);
le = g_list_next(le);
}
}
/* walk through the directory of the loaded file and add every file matching the current file */
void
-fileset_add_dir(const char *fname)
+fileset_add_dir(const char *fname, void *window)
{
- 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;
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 */
}
/* sort entries by creation time */
set.entries = g_list_sort(set.entries, fileset_sort_compare);
- fileset_update_dlg();
+ fileset_update_dlg(window);
}
/* 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;
}
return NULL;
}
- return le->data;
+ return (fileset_entry *)le->data;
}
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);
}
set.dirname = NULL;
}
}
-
-
git.samba.org / metze / wireshark / wip.git / blobdiff