Fossil

Check-in [565ba734d2]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 565ba734d2a6c1d6c0772e3a6e4411fc1c2c4471
User & Date: jan.nijtmans 2014-04-09 20:35:04.910
References
2014-04-10
08:36
Add test-cases for function file_relative_name(), three of them failing without [565ba734d2] ... (check-in: 1762a72f0e user: jan.nijtmans tags: trunk)
2014-04-09
21:55
Cherry-pick [c5b86115de]: Update version of OpenSSL that is referred to in the makefiles. Cherry-pick [565ba734d2]: Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff). ... (check-in: c779b68904 user: jan.nijtmans tags: branch-1.28)
Context
2014-04-10
08:36
Add test-cases for function file_relative_name(), three of them failing without [565ba734d2] ... (check-in: 1762a72f0e user: jan.nijtmans tags: trunk)
2014-04-09
21:55
Cherry-pick [c5b86115de]: Update version of OpenSSL that is referred to in the makefiles. Cherry-pick [565ba734d2]: Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff). ... (check-in: c779b68904 user: jan.nijtmans tags: branch-1.28)
20:35
Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff) ... (check-in: 565ba734d2 user: jan.nijtmans tags: trunk)
2014-04-08
14:10
Fix handling of directory link in /dir page, which was broken by [b34fda9692] ... (check-in: 4cb4fd1a8d user: jan.nijtmans tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/file.c.
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;
    }