Page MenuHomeFreeBSD

Various fixes to the load() function.

Authored by jhb on Sep 1 2020, 4:22 PM.


  • Use getline() instead of fgetln(). This ensures the returned string is always null-terminated without losing the last character if the last line in a file doesn't have a newline. Also, while fgetln says the returned buffer can be modified, that doesn't actually seem safe as the current implementation means you are modifying stdio's internal buffer.
  • Remove a spurious if before an ATF_REQUIRE that was clearly supposed to be non-optional.
  • Remove a pointless compare of 'ptr' against '\0' (really NULL) that duplicated the middle condition in the for().
  • Once a comment is found, skip the rest of the line, not just the current word.
Test Plan
  • ran the resolv_test tests

Diff Detail

rS FreeBSD src repository - subversion
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jhb requested review of this revision.Sep 1 2020, 4:22 PM
jhb created this revision.
88 ↗(On Diff #76498)


LGTM modulo the memory leak pointed out by brooks.

  • Free the line in load().
This revision is now accepted and ready to land.Sep 3 2020, 2:27 PM
This revision was automatically updated to reflect the committed changes.