| Message ID | 20221020204825.3248771-1-torbjorn.svensson@foss.st.com |
|---|---|
| State | New |
| Headers | show |
| Series | cpp/remap: Only override if string matched | expand |
Hi, Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604062.html Ok for trunk? Kind regards, Torbjörn On 2022-10-20 22:48, Torbjörn SVENSSON wrote: > For systems with HAVE_DOS_BASED_FILE_SYSTEM set, only override the > pointer if the backslash pattern matches. > > Output without this patch: > .../gcc/testsuite/gcc.dg/cpp/pr71681-2.c:5:10: fatal error: a/t2.h: No such file or directory > > With patch applied, no output and the test case succeeds. > > libcpp/ChangeLog > > * files.cc: Ensure pattern matches before use. > > Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com> > --- > libcpp/files.cc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libcpp/files.cc b/libcpp/files.cc > index 24208f7b0f8..a18b1caf48d 100644 > --- a/libcpp/files.cc > +++ b/libcpp/files.cc > @@ -1833,7 +1833,7 @@ remap_filename (cpp_reader *pfile, _cpp_file *file) > #ifdef HAVE_DOS_BASED_FILE_SYSTEM > { > const char *p2 = strchr (fname, '\\'); > - if (!p || (p > p2)) > + if (!p || (p2 && p > p2)) > p = p2; > } > #endif
Hi, Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/604898.html Ok for trunk? Kind regards, Torbjörn On 2022-11-02 19:21, Torbjorn SVENSSON wrote: > Hi, > > Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604062.html > > Ok for trunk? > > Kind regards, > Torbjörn > > On 2022-10-20 22:48, Torbjörn SVENSSON wrote: >> For systems with HAVE_DOS_BASED_FILE_SYSTEM set, only override the >> pointer if the backslash pattern matches. >> >> Output without this patch: >> .../gcc/testsuite/gcc.dg/cpp/pr71681-2.c:5:10: fatal error: a/t2.h: No >> such file or directory >> >> With patch applied, no output and the test case succeeds. >> >> libcpp/ChangeLog >> >> * files.cc: Ensure pattern matches before use. >> >> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com> >> --- >> libcpp/files.cc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libcpp/files.cc b/libcpp/files.cc >> index 24208f7b0f8..a18b1caf48d 100644 >> --- a/libcpp/files.cc >> +++ b/libcpp/files.cc >> @@ -1833,7 +1833,7 @@ remap_filename (cpp_reader *pfile, _cpp_file *file) >> #ifdef HAVE_DOS_BASED_FILE_SYSTEM >> { >> const char *p2 = strchr (fname, '\\'); >> - if (!p || (p > p2)) >> + if (!p || (p2 && p > p2)) >> p = p2; >> } >> #endif
On 11/2/22 12:21, Torbjorn SVENSSON via Gcc-patches wrote: > Hi, > > Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604062.html > > Ok for trunk? OK. Sorry for the delay. jeff
Hi, On 2022-11-20 21:31, Jeff Law wrote: > > On 11/2/22 12:21, Torbjorn SVENSSON via Gcc-patches wrote: >> Hi, >> >> Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604062.html >> >> Ok for trunk? > > OK. Sorry for the delay. Thanks for the review. Pushed. Kind regards, Torbjörn > > jeff > >
diff --git a/libcpp/files.cc b/libcpp/files.cc index 24208f7b0f8..a18b1caf48d 100644 --- a/libcpp/files.cc +++ b/libcpp/files.cc @@ -1833,7 +1833,7 @@ remap_filename (cpp_reader *pfile, _cpp_file *file) #ifdef HAVE_DOS_BASED_FILE_SYSTEM { const char *p2 = strchr (fname, '\\'); - if (!p || (p > p2)) + if (!p || (p2 && p > p2)) p = p2; } #endif
For systems with HAVE_DOS_BASED_FILE_SYSTEM set, only override the pointer if the backslash pattern matches. Output without this patch: .../gcc/testsuite/gcc.dg/cpp/pr71681-2.c:5:10: fatal error: a/t2.h: No such file or directory With patch applied, no output and the test case succeeds. libcpp/ChangeLog * files.cc: Ensure pattern matches before use. Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com> --- libcpp/files.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)