]>
Commit | Line | Data |
---|---|---|
c2c3c609 | 1 | Bug report: #14693 |
2 | Reported by: Vincent Renardias <vincent@waw.com> | |
3 | Patch: jdassen@wi.leidenuniv.nl (J.H.M.Dassen) | |
4 | Since Version: 2.5-2 | |
5 | ||
6 | --- patch-2.5.orig/inp.c | |
7 | +++ patch-2.5/inp.c | |
8 | @@ -71,6 +71,14 @@ | |
9 | } | |
10 | } | |
11 | ||
12 | +void | |
81132c97 | 13 | +reset_scan_input_vars(void) |
c2c3c609 | 14 | +{ |
15 | + using_plan_a = 1; | |
16 | + i_buffer = NULL; | |
17 | + i_ptr = NULL; | |
18 | +} | |
19 | + | |
20 | /* Construct the line index, somehow or other. */ | |
21 | ||
22 | void | |
23 | --- patch-2.5.orig/patch.c | |
24 | +++ patch-2.5/patch.c | |
25 | @@ -210,7 +210,10 @@ | |
26 | ||
27 | /* find out where all the lines are */ | |
28 | if (!skip_rest_of_patch) | |
29 | - scan_input (inname); | |
30 | + scan_input (inname); | |
31 | + else | |
32 | + reset_scan_input_vars (); | |
33 | + | |
34 | ||
35 | /* from here on, open no standard i/o files, because malloc */ | |
36 | /* might misfire and we can't catch it easily */ | |
81132c97 JB |
37 | --- patch-2.5.9.orig/inp.h |
38 | +++ patch-2.5.9/inp.h | |
c2c3c609 | 39 | @@ -7,4 +7,5 @@ |
81132c97 JB |
40 | char const *ifetch (LINENUM, bool, size_t *); |
41 | void get_input_file (char const *, char const *); | |
42 | void re_input (void); | |
43 | +void reset_scan_input_vars (void); | |
44 | void scan_input (char *); |