sys: use strstr() to detect installed packages #8
Conversation
This file contains 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
Don't rely on sscanf() doesn't care about unused suffixes of the status string. Use strstr() instead to make sure only actually installed packages are returned. Suggested-by: Eric Fahlgren <[email protected]> Reported-by: Eric Fahlgren <[email protected]> Fixes: openwrt#6 Signed-off-by: Daniel Golle <[email protected]>
|
Looks good to me! |
|
Good |
stokito
approved these changes
Oct 23, 2024
| @@ -233,8 +233,7 @@ rpc_sys_packagelist(struct ubus_context *ctx, struct ubus_object *obj, | |||
| break; | |||
| case 'S': | |||
| if (is_field("Status", line)) | |||
| if (sscanf(line, "Status: install %63s installed", tmp) == 1) | |||
| installed = true; | |||
| installed = !!strstr(line, " installed"); | |||
There was a problem hiding this comment.
Just to ensure: this line can't be not installed, right?.
It would be nice to place a comment with a sample string Status: install 3 installed. But that's a minor thing
There was a problem hiding this comment.
Correct, the other possible strings are half-installed or not-installed with a dash. (Although I've never seen the half- version in the wild, not sure what it does.)
There was a problem hiding this comment.
Well, to be completely correct, here's the list (I only cared about the *installed ones above):
static const enum_map_t pkg_state_status_map[] = {
{SS_NOT_INSTALLED, "not-installed"},
{SS_UNPACKED, "unpacked"},
{SS_HALF_CONFIGURED, "half-configured"},
{SS_INSTALLED, "installed"},
{SS_HALF_INSTALLED, "half-installed"},
{SS_CONFIG_FILES, "config-files"},
{SS_POST_INST_FAILED, "post-inst-failed"},
{SS_REMOVAL_FAILED, "removal-failed"}
};
|
This should now be committed on the 24.10 branch (and earlier), as #10 on main will supersede it. |
|
ping |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Don't rely on sscanf() doesn't care about unused suffixes of the status string. Use strstr() instead to make sure only actually installed packages are returned.
Suggested-by: @efahl
Reported-by: @efahl
Fixes: #6