Process extra empty lines correctly.

This commit is contained in:
Matt Kraai 2001-10-18 17:03:59 +00:00
parent 3dd4f5ed69
commit a7512d74fa
2 changed files with 10 additions and 2 deletions

View File

@ -769,7 +769,11 @@ void write_status_file(deb_file_t **deb_file)
/* Update previously known packages */ /* Update previously known packages */
while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) { while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) {
tmp_string = strstr(control_buffer, "Package:") + 8; if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) {
continue;
}
tmp_string += 8;
tmp_string += strspn(tmp_string, " \n\t"); tmp_string += strspn(tmp_string, " \n\t");
package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
write_flag = FALSE; write_flag = FALSE;

6
dpkg.c
View File

@ -769,7 +769,11 @@ void write_status_file(deb_file_t **deb_file)
/* Update previously known packages */ /* Update previously known packages */
while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) { while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) {
tmp_string = strstr(control_buffer, "Package:") + 8; if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) {
continue;
}
tmp_string += 8;
tmp_string += strspn(tmp_string, " \n\t"); tmp_string += strspn(tmp_string, " \n\t");
package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
write_flag = FALSE; write_flag = FALSE;