Differences From Artifact [3759ba0aca]:
- File src/file.c — part of check-in [ebe97b79f2] at 2014-04-01 18:43:05 on branch trunk — Get the "fossil cat" command working outside of a check-out using the -R option. This is an alternative implementation to the fix-cat-dash-R branch that avoids adding a new global variable. (user: drh size: 33042)
To Artifact [1b9b85a464]:
- File src/file.c — part of check-in [565ba734d2] at 2014-04-09 20:35:04 on branch trunk — Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff) (user: jan.nijtmans size: 33126) [more...]
| ︙ | ︙ | |||
975 976 977 978 979 980 981 982 983 984 985 986 987 988 |
}else{
blob_set(pOut, "..");
for(j=i+1; zPwd[j]; j++){
if( zPwd[j]=='/' ){
blob_append(pOut, "/..", 3);
}
}
}
if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
blob_append(pOut, "/", 1);
}
blob_reset(&tmp);
return;
}
| > > | 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 |
}else{
blob_set(pOut, "..");
for(j=i+1; zPwd[j]; j++){
if( zPwd[j]=='/' ){
blob_append(pOut, "/..", 3);
}
}
while( i>0 && (zPwd[i]!='/')) --i;
blob_append(pOut, zPath+i, j-i);
}
if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
blob_append(pOut, "/", 1);
}
blob_reset(&tmp);
return;
}
|
| ︙ | ︙ |