Add sgetXXent_r() thread-safe variant functions
#1363
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alejandro-colomar
changed the title
*get*ent_r() thread-safe variant functions
alejandro-colomar
force-pushed
the
shadow_r
branch
10 times, most recently
from
c6713c5 to
db2f315
Compare
alejandro-colomar
force-pushed
the
shadow_r
branch
3 times, most recently
from
593c73f to
5124f13
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| int e; | ||
| char *p, *end; | ||
| size_t n, lssize, size; |
Check warning
Code scanning / CodeQL
Expression has no effect Warning
|
|
||
| struct group *sgetgrent(const char *s); | ||
| int sgetgrent_r(size_t size; | ||
| const char *restrict s, struct group *restrict grent, |
Check notice
Code scanning / CodeQL
Short global name Note
| static struct passwd pwent = {}; | ||
|
|
||
| int e; | ||
| size_t size; |
Check warning
Code scanning / CodeQL
Expression has no effect Warning
|
|
||
| struct passwd *sgetpwent(const char *s); | ||
| int sgetpwent_r(size_t size; | ||
| const char *restrict s, struct passwd *restrict pwent, |
Check notice
Code scanning / CodeQL
Short global name Note
alejandro-colomar
force-pushed
the
shadow_r
branch
5 times, most recently
from
e5f4e87 to
ab412ac
Compare
| sgetgrent(const char *s) | ||
| { | ||
| static char *buf = NULL; | ||
| static struct group grent = {}; |
Check notice
Code scanning / CodeQL
Local variable hides global variable Note
| static struct subordinate_range sient = {}; | ||
|
|
||
| int e; | ||
| size_t size; |
Check warning
Code scanning / CodeQL
Expression has no effect Warning
| #ifdef ENABLE_SUBIDS | ||
| struct subordinate_range *sgetsient(const char *s); | ||
| int sgetsient_r(size_t size; | ||
| const char *restrict s, struct subordinate_range *restrict sient, |
Check notice
Code scanning / CodeQL
Short global name Note
alejandro-colomar
changed the title
*get*ent_r() thread-safe variant functionssgetXXent_r() thread-safe variant functions
alejandro-colomar
force-pushed
the
shadow_r
branch
7 times, most recently
from
2d1b76a to
12b5f03
Compare
alejandro-colomar
force-pushed
the
shadow_r
branch
from
de6b450 to
e3856ab
Compare
alejandro-colomar
force-pushed
the
shadow_r
branch
from
e3856ab to
9cd7eb2
Compare
This is for consistency with how this is done in sgetsgent(). Now we need to make sure that the list is NULL before the first call, which means that the 'grent' structure must be cleared. Since it's a static object, it's already true, but let's be explicit about it. Since we remember the address of the list in grent.gr_mem (which is static), we don't need to keep 'members' being static too, so we get rid of one static thing. Signed-off-by: Alejandro Colomar <[email protected]>
Imitate how this is done in sgetgrent(). BE CAREFUL: The NULL check needs to be performed after *both* build_list() calls, since we need to make sure that either a NULL or a valid pointer is stored in both .sg_adm and .sg_mem, since we'll call free(3) next time sgetsgent() is called. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
Move build_list() to "lib/list.c", where we can reuse it. Signed-off-by: Alejandro Colomar <[email protected]>
In some places we call comma_to_list(), and in others build_list(), and they're essentially the same thing: they transform a comma-separated list into an array of strings. Both of them consider an empty list to have 0 members instead of one. However, they differ in how they treat trailing commas: - comma_to_list() interprets that as an empty field. - build_list() ignores the trailing comma. The behavior of build_list() seems more appropriate, since it allows tools to generate the CSVs more easily. Also, these lists are used to represent user names or group names, so an empty user name makes no sense. This patch makes both functions be more consistent, which will eventually allow us to de-duplicate code. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
get_gid() will fail to parse a number if the field is empty. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
This name tells better what this API does. The name has a leading 'a', as it allocates memory, and then 'csv2ls' because it parses a CSV into a list. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
We already use many GNU extensions, so it makes no sense to try to conform to ISO C in this regard. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
The a2i() family of APIs (called a few lines later) already fails for an empty string. We don't need to explicitly reject it. Signed-off-by: Alejandro Colomar <[email protected]>
Remove obvious comments, and improve (or make more consistent) the useful ones. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
This will allow compacting the two buffers into one, which in turn, will allow implementing a re-entrant variant of the function. Signed-off-by: Alejandro Colomar <[email protected]>
This is in preparation for a following commit. Signed-off-by: Alejandro Colomar <[email protected]>
This will allow compacting the two buffers into one, which in turn, will allow implementing a re-entrant variant of the function. Signed-off-by: Alejandro Colomar <[email protected]>
This makes this function consistent with the other sgetXXent() functions. Signed-off-by: Alejandro Colomar <[email protected]>
This will allow implementing a re-entrant variant of the function. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
This will reduce the diff when adding re-entrant variants of these functions. Signed-off-by: Alejandro Colomar <[email protected]>
This is not guaranteed to work by the C standard, but it's the only thing we can do to have reasonable confidence that a pointer is aligned. Signed-off-by: Alejandro Colomar <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
That change was temporary to allow adding a re-entrant variant of the function with a small diff. Remove it now that it's done. Signed-off-by: Alejandro Colomar <[email protected]>
alejandro-colomar
force-pushed
the
shadow_r
branch
from
9cd7eb2 to
093c763
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Suggested-by: @blm768
Queued after #1272.