bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MS VS 6.0 build, where string:clear() is not exist. Use one instanse of class string for all temporary strings

Browse Source
This commit is contained in:
Stas Degteff 2011-02-19 20:14:58 +00:00
parent 1f25fbac5f
commit 02a87e8e2e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
goldlib/gall/gfilutl2.cpp
View File

@ -127,7 +127,6 @@ int strschg_environ(std::string& s) {
s.replace(posn, posn1-posn+1, rep); s.replace(posn, posn1-posn+1, rep);
replaced++; replaced++;
} }
fnd.clear();
} }
#ifndef __HAVE_DRIVES__ #ifndef __HAVE_DRIVES__
@ -137,16 +136,16 @@ int strschg_environ(std::string& s) {
if( (s.length() > 1) and not isslash(s[1]) ) { if( (s.length() > 1) and not isslash(s[1]) ) {
slash = s.find_first_of(GOLD_SLASH_STR GOLD_WRONG_SLASH_STR, 1); slash = s.find_first_of(GOLD_SLASH_STR GOLD_WRONG_SLASH_STR, 1);
std::string name(s,1,slash-1); fnd.assign(s,1,slash-1);
pe = getpwnam(name.c_str()); pe = getpwnam(fnd.c_str());
}else { }else {
pe = getpwuid(getuid()); pe = getpwuid(getuid());
} }
if(pe != NULL) { if(pe != NULL) {
std::string dirname = pe->pw_dir; fnd.assign(pe->pw_dir);
if ( slash != std::string::npos ) if ( slash != std::string::npos )
dirname += s.substr(slash); fnd += s.substr(slash);
s=dirname; s=fnd;
replaced++; replaced++;
} }
} }