Skip to content

Re-design strr[c]spn(), to make it simpler and more useful #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alejandro-colomar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Re-design strr[c]spn(), to make it simpler and more useful #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8378517
lib/string/strspn/: strr[c]spn(): Return the length counting from the…
alejandro-colomar Mar 1, 2026
adb25ed
src/login_nopam.c: from_match(): Use strrspn_() instead of its pattern
alejandro-colomar Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/string/strspn/stprcspn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause


Expand All @@ -10,15 +10,16 @@

#include <string.h>

#include "string/strchr/strnul.h"
#include "string/strspn/strrcspn.h"


// string returns-pointer rear complement substring prefix length
#define stprcspn(s, reject) \
({ \
__auto_type s_ = (s); \
\
s_ + strrcspn(s_, reject); \
// stprcspn - string returns-pointer rear complement span
#define stprcspn(s, reject) \
({ \
__auto_type s_ = (s); \
\
strnul(s_) - strrcspn(s_, reject); \
})


Expand Down
17 changes: 8 additions & 9 deletions lib/string/strspn/stprspn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause


Expand All @@ -10,17 +10,16 @@

#include <string.h>

#include "string/strchr/strnul.h"
#include "string/strspn/strrspn.h"


// string returns-pointer rear substring prefix length
// Available in Oracle Solaris as strrspn(3GEN).
// <https://docs.oracle.com/cd/E36784_01/html/E36877/strrspn-3gen.html>
#define stprspn(s, accept) \
({ \
__auto_type s_ = (s); \
\
s_ + strrspn_(s_, accept); \
// stprspn - string returns-pointer rear span
#define stprspn(s, accept) \
({ \
__auto_type s_ = (s); \
\
strnul(s_) - strrspn_(s_, accept); \
})


Expand Down
11 changes: 6 additions & 5 deletions lib/string/strspn/strrcspn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause


Expand All @@ -20,19 +20,20 @@ ATTR_STRING(2)
inline size_t strrcspn(const char *s, const char *reject);


// string rear complement substring prefix length
// strrcspn - string rear complement span
inline size_t
strrcspn(const char *s, const char *reject)
{
size_t spn;
const char *p;

p = strnul(s);
while (p > s) {
for (spn = 0; p > s; spn++) {
p--;
if (strchr(reject, *p) != NULL)
return p + 1 - s;
return spn;
}
return 0;
return spn;
}


Expand Down
11 changes: 6 additions & 5 deletions lib/string/strspn/strrspn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause


Expand All @@ -20,19 +20,20 @@ ATTR_STRING(2)
inline size_t strrspn_(const char *s, const char *accept);


// string rear substring prefix length
// strrspn_ - string rear span
inline size_t
strrspn_(const char *s, const char *accept)
{
size_t spn;
const char *p;

p = strnul(s);
while (p > s) {
for (spn = 0; p > s; spn++) {
p--;
if (strchr(accept, *p) == NULL)
return p + 1 - s;
return spn;
}
return 0;
return spn;
}


Expand Down
3 changes: 2 additions & 1 deletion src/login_nopam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
#include "string/strcmp/strcaseeq.h"
#include "string/strcmp/streq.h"
#include "string/strcmp/strprefix.h"
#include "string/strspn/strrspn.h"
#include "string/strspn/stprspn.h"
#include "string/strtok/stpsep.h"

Expand Down Expand Up @@ -315,7 +316,7 @@ static bool from_match (char *tok, const char *string)
} else if (strcaseeq(tok, "LOCAL")) { /* LOCAL: no dots */
if (!strchr(string, '.'))
return true;
} else if ( (!streq(tok, "") && tok[strlen(tok) - 1] == '.') /* network */
} else if ( strrspn_(tok, ".") /* network */
&& strprefix(resolve_hostname(string), tok)) {
return true;
}
Expand Down
Loading