$ git rd 
1: f865a4ba61bb = 1: f865a4ba61bb lib/, src/, lib/string/strspn/: Compact files
2: 5274442fc893 = 2: 5274442fc893 lib/limits.c: Use stpspn() to simplify
-: ------------ > 3: 0b112a7cc9eb lib/, src/, lib/string/strcmp/: Compact files

$ git rd 
1: f865a4ba61bb ! 1: fe4ccbda8b05 lib/, src/, lib/string/strspn/: Compact files
 @@ lib/string/strspn/stprspn.h (deleted)
 -})
 -
 -
 +-#endif // include guard
 +
 + ## lib/string/strspn/stpspn.h (deleted) ##
 +@@
 +-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
 +-// SPDX-License-Identifier: BSD-3-Clause
 +-
 +-
 +-#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
 +-#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
 +-
 +-
 +-#include "config.h"
 +-
 +-#include <string.h>
 +-
 +-#include "attr.h"
 +-
 +-
 +-// string returns-pointer substring prefix length
 +-// Similar to strspn(3), but return a pointer instead of an offset.
 +-// Similar to strchrnul(3), but search for any bytes not in 'accept'.
 +-#define stpspn(s, accept) \
 +-({ \
 +- __auto_type s_ = s; \
 +- \
 +- s_ + strspn(s_, accept); \
 +-})
 +-
 +-
 -#endif // include guard
 
 ## lib/string/strspn/strrcspn.h ##
 @@ lib/string/strspn/stpspn.c => lib/string/strspn/strspn.c
 -#include "string/strspn/stpspn.h"
 +#include "string/strspn/strspn.h"
 
 - ## lib/string/strspn/stpspn.h => lib/string/strspn/strspn.h ##
 + ## lib/string/strspn/strspn.h (new) ##
 @@
 - // SPDX-License-Identifier: BSD-3-Clause
 - 
 - 
 --#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
 --#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STPSPN_H_
 ++// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
 ++// SPDX-License-Identifier: BSD-3-Clause
 ++
 ++
 +#ifndef SHADOW_INCLUDE_LIB_STRING_STRSPN_STRSPN_H_
 +#define SHADOW_INCLUDE_LIB_STRING_STRSPN_STRSPN_H_
 - 
 - 
 - #include "config.h"
 -@@
 - #include "attr.h"
 - 
 - 
 --// string returns-pointer substring prefix length
 --// Similar to strspn(3), but return a pointer instead of an offset.
 --// Similar to strchrnul(3), but search for any bytes not in 'accept'.
 -+// stpspn - string offset-pointer substring prefix length
 - #define stpspn(s, accept) \
 - ({ \
 - __auto_type s_ = s; \
 ++
 ++
 ++#include "config.h"
 ++
 ++#include <string.h>
 ++
 ++#include "attr.h"
 ++
 ++
 ++// stpspn - string offset-pointer span
 ++#define stpspn(s, accept) \
 ++({ \
 ++ __auto_type s_ = s; \
 ++ \
 ++ s_ + strspn(s_, accept); \
 ++})
 ++
 ++
 ++#endif // include guard
 
 ## src/login_nopam.c ##
 @@
2: 5274442fc893 = 2: 6bac1f4b8951 lib/limits.c: Use stpspn() to simplify
3: 0b112a7cc9eb = 3: c4a36d59e349 lib/, src/, lib/string/strcmp/: Compact files