octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-10 06:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36 from s3fs-fuse/gc#417

Browse Source 
Changed codes for CR code in passwd file(googlecode issue#417).
This commit is contained in:
Takeshi Nakatani 2014-06-03 01:16:03 +09:00
commit f141bbd4b4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/s3fs.cpp
View File

@ -2976,10 +2976,18 @@ static int check_for_aws_format(void)
ifstream PF(passwd_file.c_str());
if(PF.good()){
while (getline(PF, line)){
if(line[0]=='#')
if(line[0]=='#'){
continue;
if(line.size() == 0)
}
if(line.size() == 0){
continue;
}
if('\r' == line[line.size() - 1]){
line = line.substr(0, line.size() - 1);
if(line.size() == 0){
continue;
}
}
first_pos = line.find_first_of(" \t");
if(first_pos != string::npos){
@ -3129,6 +3137,12 @@ static int read_passwd_file(void)
if(line.size() == 0){
continue;
}
if('\r' == line[line.size() - 1]){
line = line.substr(0, line.size() - 1);
if(line.size() == 0){
continue;
}
}
first_pos = line.find_first_of(" \t");
if(first_pos != string::npos){