mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

basename: drop last_component null check

Browse source 
Prepare for fixes to the suffix pruning.  Since last_component doesn't
document a possible null result in lib/basename-lgpl.h, and the current
code also doesn't appear capable of producing one, drop the check.

libguile/filesys.c (basename): drop check for last_component null result.
This commit is contained in:
Rob Browning 2024-08-03 13:32:09 -05:00
parent 2047b532fa
commit 9a57c237d2
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/filesys.c
View file

@ -2043,7 +2043,7 @@ SCM_DEFINE (scm_basename, "basename", 1, 1, 0,
"@var{filename}, it is removed also.") "@var{filename}, it is removed also.")
#define FUNC_NAME s_scm_basename #define FUNC_NAME s_scm_basename
{ {
char *c_filename, *c_last_component; char *c_filename;
SCM res; SCM res;
scm_dynwind_begin (0); scm_dynwind_begin (0);
@ -2057,13 +2057,8 @@ SCM_DEFINE (scm_basename, "basename", 1, 1, 0,
"/" and "//" are treated specially. */ "/" and "//" are treated specially. */
res = scm_from_utf8_string ("/"); res = scm_from_utf8_string ("/");
else else
{ res = scm_from_utf8_string (last_component (c_filename));
c_last_component = last_component (c_filename);
if (!c_last_component)
res = filename;
else
res = scm_from_utf8_string (c_last_component);
}
scm_dynwind_end (); scm_dynwind_end ();
if (!SCM_UNBNDP (suffix) && if (!SCM_UNBNDP (suffix) &&