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

Additional checks in strschg_environ

Browse Source
This commit is contained in:
Stas Degteff 2011-02-17 22:05:27 +00:00
parent 0119f9a971
commit d0ea4b0d6c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
goldlib/gall/gfilutl2.cpp
View File

@ -113,21 +113,23 @@ int strschg_environ(std::string& s) {
int replaced = 0; int replaced = 0;
size_t posn, posn1; size_t posn, posn1;
while(((posn=s.find('%')) != s.npos) and ((posn1=s.find('%', posn+1)) != s.npos)) { if (s.length() > 1) {
fnd = s.substr(posn+1, posn1-1-posn); while(((posn=s.find('%')) != s.npos) and ((posn1=s.find('%', posn+1)) != s.npos)) {
const char* rep = getenv(fnd.c_str()); fnd = s.substr(posn+1, posn1-1-posn);
rep = rep ? rep : ""; const char* rep = getenv(fnd.c_str());
s.replace(posn, posn1-posn+1, rep); rep = rep ? rep : "";
replaced++; s.replace(posn, posn1-posn+1, rep);
replaced++;
}
fnd.clear();
} }
fnd.clear();
#ifndef __HAVE_DRIVES__ #ifndef __HAVE_DRIVES__
if( s[0] == '~' ) { if( s[0] == '~' ) {
struct passwd *pe=NULL; struct passwd *pe=NULL;
size_t slash; size_t slash = 1;
if( (s.length() > 2) 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); std::string name(s,1,slash-1);
pe = getpwnam(name.c_str()); pe = getpwnam(name.c_str());
@ -139,6 +141,7 @@ int strschg_environ(std::string& s) {
if ( slash != std::string::npos ) if ( slash != std::string::npos )
dirname += s.substr(slash); dirname += s.substr(slash);
s=dirname; s=dirname;
replaced++;
} }
} }
#endif #endif