From 5f59a34ab747dde8ede7357f3431bf06bd6002fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Mar 2026 17:28:33 +0100 Subject: New upstream version 1.4.2 --- tests/basename-lgpl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'tests/basename-lgpl.c') diff --git a/tests/basename-lgpl.c b/tests/basename-lgpl.c index 2aecb0dd..53f3bae5 100644 --- a/tests/basename-lgpl.c +++ b/tests/basename-lgpl.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2025 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2026 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -29,13 +29,11 @@ char * last_component (char const *name) { char const *base = name + FILE_SYSTEM_PREFIX_LEN (name); - char const *p; - bool last_was_slash = false; - while (ISSLASH (*base)) base++; - for (p = base; *p; p++) + bool last_was_slash = false; + for (char const *p = base; *p; p++) { if (ISSLASH (*p)) last_was_slash = true; @@ -53,8 +51,6 @@ size_t base_len (char const *name) { size_t len; - size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (name); - for (len = strlen (name); 1 < len && ISSLASH (name[len - 1]); len--) continue; @@ -62,6 +58,7 @@ base_len (char const *name) && ISSLASH (name[0]) && ISSLASH (name[1]) && ! name[2]) return 2; + size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (name); if (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE && prefix_len && len == prefix_len && ISSLASH (name[prefix_len])) return prefix_len + 1; -- cgit v1.2.3