Encapsulate the code to take a pointer to a pathname and return a

pointer to the name of the file to which it refers (i.e., to the last
component of the pathname) in a "get_basename()" routine, and have the
code in "file.c" call it.

svn path=/trunk/; revision=1552

1 files changed, 38 insertions, 1 deletions

diff --git a/util.c b/util.c
index 676b055fc7..40c8635f28 100644
--- a/util.c
+++ b/util.c
@@ -1,7 +1,7 @@
 /* util.c
  * Utility routines
  *
- * $Id: util.c,v 1.27 2000/01/16 02:47:47 guy Exp $
+ * $Id: util.c,v 1.28 2000/01/25 04:31:16 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -88,6 +88,43 @@ typedef int mode_t;	/* for win32 */
 
 #endif
 
+/*
+ * Given a pathname, return the last component.
+ */
+char *
+get_basename(char *path)
+{
+	char *filename;
+
+#ifdef WIN32
+	/*
+	 * XXX - do we need to search for '/' as well?
+	 */
+	if ((filename = strrchr(path, '\\')) == NULL) {
+		/*
+		 * OK, no directories - but there might be a drive
+		 * letter....
+		 */
+		filename = strchr(path, ':');
+	}
+#else
+	filename = strrchr(path, '/');
+#endif
+	if (filename == NULL) {
+		/*
+		 * There're no directories, drive letters, etc. in the
+		 * name; the pathname *is* the file name.
+		 */
+		filename = path;
+	} else {
+		/*
+		 * Skip past the pathname or drive letter separator.
+		 */
+		filename++;
+	}
+	return filename;
+}
+
 static char *
 setup_tmpdir(char *dir)
 {