From 1015edb2a262e2ca78c67d39fa01d32f5d94f165 Mon Sep 17 00:00:00 2001 From: cuz Date: Mon, 28 Apr 2003 06:42:11 +0000 Subject: [PATCH] New function FindName() git-svn-id: svn://svn.cc65.org/cc65/trunk@2094 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/common/fname.c | 27 +++++++++++++++++++++++---- src/common/fname.h | 13 +++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/common/fname.c b/src/common/fname.c index 49f3ed4d2..444d4c7b1 100644 --- a/src/common/fname.c +++ b/src/common/fname.c @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2000 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 2000-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -75,6 +75,25 @@ const char* FindExt (const char* Name) +const char* FindName (const char* Path) +/* Return a pointer to the file name in Path. If there is no path leading to + * the file, the function returns Path as name. + */ +{ + /* Get the length of the name */ + int Len = strlen (Path); + + /* Search for the path separator */ + while (Len > 0 && Path[Len-1] != '\\' && Path[Len-1] != '/') { + --Len; + } + + /* Return the name or path */ + return Path + Len; +} + + + char* MakeFilename (const char* Origin, const char* Ext) /* Make a new file name from Origin and Ext. If Origin has an extension, it * is removed and Ext is appended. If Origin has no extension, Ext is simply diff --git a/src/common/fname.h b/src/common/fname.h index de54bca3e..4d493d78a 100644 --- a/src/common/fname.h +++ b/src/common/fname.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2000 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 2000-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -47,6 +47,11 @@ const char* FindExt (const char* Name); /* Return a pointer to the file extension in Name or NULL if there is none */ +const char* FindName (const char* Path); +/* Return a pointer to the file name in Path. If there is no path leading to + * the file, the function returns Path as name. + */ + char* MakeFilename (const char* Origin, const char* Ext); /* Make a new file name from Origin and Ext. If Origin has an extension, it * is removed and Ext is appended. If Origin has no extension, Ext is simply -- 2.39.5