merge post-1.3.0 fixes

This commit is contained in:
Denis Vlasenko
2006-12-26 18:17:42 +00:00
parent 270c17c0e6
commit 666da5e2c6
12 changed files with 48 additions and 21 deletions

View File

@@ -120,7 +120,6 @@ struct sed_globals {
} bbg;
void sed_free_and_close_stuff(void);
#if ENABLE_FEATURE_CLEAN_UP
static void sed_free_and_close_stuff(void)
{
@@ -156,6 +155,8 @@ static void sed_free_and_close_stuff(void)
while (bbg.current_input_file < bbg.input_file_count)
fclose(bbg.input_file_list[bbg.current_input_file++]);
}
#else
void sed_free_and_close_stuff(void);
#endif
/* If something bad happens during -i operation, delete temp file */