On Win32, when splitting file names into directory and last component,

search for '\' rather than '/'.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1545 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/file.c b/file.c
index a07ade05032f4f9f6d8b2c2c8c3ab521f54a6c28..aa6291ffa2fae261c75282f688b40fb0e7dc589a 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.155 2000/01/24 19:32:13 guy Exp $
+ * $Id: file.c,v 1.156 2000/01/25 00:17:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -245,7 +245,7 @@ set_display_filename(capture_file *cf)
   if (!cf->is_tempfile) {
     /* Get the last component of the file name, and put that in the
        status bar. */
-    if ((name_ptr = (gchar *) strrchr(cf->filename, '/')) == NULL)
+    if ((name_ptr = (gchar *) strrchr(cf->filename, PATH_SEPARATOR)) == NULL)
       name_ptr = cf->filename;
     else
       name_ptr++;
@@ -279,7 +279,7 @@ read_cap_file(capture_file *cf)
   char    errmsg_errno[1024+1];
   gchar   err_str[2048+1];
 
-  if ((name_ptr = (gchar *) strrchr(cf->filename, '/')) == NULL)
+  if ((name_ptr = (gchar *) strrchr(cf->filename, PATH_SEPARATOR)) == NULL)
     name_ptr = cf->filename;
   else
     name_ptr++;
@@ -1320,7 +1320,7 @@ save_cap_file(char *fname, capture_file *cf, gboolean save_filtered,
   struct wtap_pkthdr hdr;
   guint8        pd[65536];
 
-  if ((name_ptr = (gchar *) strrchr(fname, '/')) == NULL)
+  if ((name_ptr = (gchar *) strrchr(fname, PATH_SEPARATOR)) == NULL)
     name_ptr = fname;
   else
     name_ptr++;

diff --git a/globals.h b/globals.h
index 0c0f4e7edb478cc38ea46fa0585195892443f3c3..c8766d93884423dbe2d15ea16d027cd111f615e8 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.15 2000/01/24 04:44:35 guy Exp $
+ * $Id: globals.h,v 1.16 2000/01/25 00:17:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -74,6 +74,13 @@
 # define MIN(x, y) ((x) < (y) ? (x) : (y))
 #endif
 
+/* Pathname separator. */
+#ifdef WIN32
+#define PATH_SEPARATOR  '\\'
+#else
+#define PATH_SEPARATOR  '/'
+#endif
+
 extern FILE        *data_out_file;
 extern packet_info  pi;
 extern capture_file cf;