diff options
| author | Mark Hung <marklh9@gmail.com> | 2017-02-23 07:48:02 +0800 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-24 12:24:46 +0100 |
| commit | 32cf835e95ad4df2d70fcd658f19630972b7f7ad (patch) | |
| tree | f8987409a17351b55f9957c17609abc9718f1c13 | |
| parent | 1d05310eb005e3de976f63588dad73025a3d5274 (diff) | |
solenv(gcc-wrappers): remove trailing space of includepath
Change-Id: Ic14140f197a2c5e1632fd27cfae38ca4eff9bd8c
Reviewed-on: https://gerrit.libreoffice.org/34562
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit baf043318e83e768abe4ed7ae1c45bb75c0197e3)
Reviewed-on: https://gerrit.libreoffice.org/34577
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit a3f963ddbd5f5a4cd2575ec024a19ddea49bb88c)
| -rw-r--r-- | solenv/gcc-wrappers/wrapper.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx index cc312722f201..6e3fe1393fdb 100644 --- a/solenv/gcc-wrappers/wrapper.cxx +++ b/solenv/gcc-wrappers/wrapper.cxx @@ -49,7 +49,7 @@ void setupccenv() { } // Set-up include path - string includepath="INCLUDE=.;"; + string includepath="INCLUDE=."; char* incbuf; size_t inclen; _dupenv_s(&incbuf,&inclen,"SOLARINC"); @@ -61,16 +61,20 @@ void setupccenv() { free(incbuf); // 3 = strlen(" -I") - for(size_t pos=0; pos != string::npos;) { - size_t endpos=inctmp.find(" -I",pos+3); - size_t len=endpos-pos-3; + for(size_t pos=0,len=0;pos<inctmp.length();) { + size_t endpos=inctmp.find(" -I",pos+1); if(endpos==string::npos) - includepath.append(inctmp,pos+3,endpos); - else if(len>0) { - includepath.append(inctmp,pos+3,len); + endpos=inctmp.length(); + len=endpos-pos; + + while(len>0&&inctmp[pos+len-1]==' ') + --len; + + if(len>3) { includepath.append(";"); + includepath.append(inctmp,pos+3,len-3); } - pos=inctmp.find(" -I",pos+len); + pos=endpos; } if(_putenv(includepath.c_str())<0) { cerr << "Error: could not export INCLUDE" << endl; |