Factor walk_dir into a library function #402
Open
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
ericonr
commented
May 12, 2021
Comment on lines
+73
to
+80
| cleanup: | ||
| free(list[i]); | ||
| } | ||
|
|
||
| } | ||
| for (; i >= 0; i--) { | ||
| free(list[i]); | ||
| } |
There was a problem hiding this comment.
I'm not sure this doesn't double free, should check first before merging.
There was a problem hiding this comment.
If you refer to breaking out of previous loop: it is not.
It's used in both xbps-create and xbps-uchroot. Even though neither uses the "dirent" arg in fn, leave it in for possible future use. This implementation also fixes a bug with the version of walk_dir in those binaries where it leaks all the list[i] items. This version frees them after using them and does a final cleanup in case the for loop ended before going through all of them. xbps-create requires this function to use alphasort, but xbps-uchroot wouldn't. For implemenation simplicity, use alphasort in all cases.
Chocimier
approved these changes
Sep 16, 2021
| for (i = count - 1; i >= 0; i--) { | ||
| if (strcmp(list[i]->d_name, ".") == 0 || strcmp(list[i]->d_name, "..") == 0) | ||
| goto cleanup; | ||
| if (strlen(path) + strlen(list[i]->d_name) + 1 >= PATH_MAX - 1) { |
There was a problem hiding this comment.
>, as terminating null is already subtracted from PATH_MAX?
Comment on lines
+73
to
+80
| cleanup: | ||
| free(list[i]); | ||
| } | ||
|
|
||
| } | ||
| for (; i >= 0; i--) { | ||
| free(list[i]); | ||
| } |
There was a problem hiding this comment.
If you refer to breaking out of previous loop: it is not.
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.
Also introduce
xbps_utils.hheader, because otherwise we'd have had to includedirent.hinxbps_api_impl.h, and that header is pretty full already.