1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

Still merging 1.4.3 code back

This commit is contained in:
Werner Koch 2006-04-21 12:56:40 +00:00
parent d0907e64f4
commit 4459fcb032
16 changed files with 246 additions and 165 deletions

View file

@ -234,15 +234,19 @@ length_sans_trailing_ws (const unsigned char *line, size_t len)
*
*/
char *
make_basename(const char *filepath)
make_basename(const char *filepath, const char *inputpath)
{
char *p;
#ifdef __riscos__
return riscos_make_basename(filepath, inputpath);
#endif
if ( !(p=strrchr(filepath, '/')) )
#ifdef HAVE_DRIVE_LETTERS
#ifdef HAVE_DRIVE_LETTERS
if ( !(p=strrchr(filepath, '\\')) )
if ( !(p=strrchr(filepath, ':')) )
#endif
#endif
{
return jnlib_xstrdup(filepath);
}