From 7b74fddf6ae1f0f046eb9033920a463d5a3e8e93 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 12 May 2001 14:13:36 +0000 Subject: [PATCH] (ISSLASH, base_name): Remove; now in dirname.h. Include after size_t is defined. (addext): Use base_len to trim redundant trailing slashes instead of doing it ourselves. But do not trim the last slash if it is not redundant. --- lib/addext.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/addext.c b/lib/addext.c index a075ea3b1e..65db258f68 100644 --- a/lib/addext.c +++ b/lib/addext.c @@ -1,5 +1,5 @@ /* addext.c -- add an extension to a file name - Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright 1990, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,8 +29,6 @@ # define HAVE_LONG_FILE_NAMES 0 #endif -#include - #if HAVE_LIMITS_H # include #endif @@ -49,7 +47,8 @@ # include #endif -char *base_name PARAMS ((char const *)); +#include +#include /* Append to FILENAME the extension EXT, unless the result would be too long, in which case just append the character E. */ @@ -58,7 +57,7 @@ void addext (char *filename, char const *ext, int e) { char *s = base_name (filename); - size_t slen = strlen (s), extlen = strlen (ext); + size_t slen = base_len (s), extlen = strlen (ext); long slen_max = -1; #if HAVE_PATHCONF && defined _PC_NAME_MAX @@ -70,7 +69,8 @@ addext (char *filename, char const *ext, int e) else { char c = *s; - *s = 0; + if (! ISSLASH (c)) + *s = 0; slen_max = pathconf (filename, _PC_NAME_MAX); *s = c; } -- 2.30.2