Fossil

Check-in [25950f8b67]
Login

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

Overview
Comment:Change C++ comments to C commenting style
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 25950f8b6708ebd96ae5ad7ec084750ad0dece86
User & Date: jan.nijtmans 2014-01-09 11:57:44.248
Context
2014-01-09
13:14
Missing "unhide" option in link to timeline. check-in: 32bb2a31f4 user: jan.nijtmans tags: trunk
11:57
Change C++ comments to C commenting style check-in: 25950f8b67 user: jan.nijtmans tags: trunk
11:24
Merge again checkout_on_root_fix. Fix more cases when working from '/', should not affect when working normally. check-in: af194dbb16 user: mgagnon tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/file.c.
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
  blob_zero(pOut);
  if( file_is_absolute_path(zOrigName) ){
    blob_appendf(pOut, "%/", zOrigName);
  }else{
    char zPwd[2000];
    file_getcwd(zPwd, sizeof(zPwd)-strlen(zOrigName));
    if( zPwd[0]=='/' && strlen(zPwd)==1 ){
      // when on '/', don't add an extra '/'
      if( zOrigName[0]=='.' && strlen(zOrigName)==1 ){
        // '.' when on '/' mean '/'
        blob_appendf(pOut, "%/", zPwd);
      }else{
        blob_appendf(pOut, "%/%/", zPwd, zOrigName);
      }
    }else{
      blob_appendf(pOut, "%//%/", zPwd, zOrigName);
    }







|

|







782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
  blob_zero(pOut);
  if( file_is_absolute_path(zOrigName) ){
    blob_appendf(pOut, "%/", zOrigName);
  }else{
    char zPwd[2000];
    file_getcwd(zPwd, sizeof(zPwd)-strlen(zOrigName));
    if( zPwd[0]=='/' && strlen(zPwd)==1 ){
      /* when on '/', don't add an extra '/' */
      if( zOrigName[0]=='.' && strlen(zOrigName)==1 ){
        /* '.' when on '/' mean '/' */
        blob_appendf(pOut, "%/", zPwd);
      }else{
        blob_appendf(pOut, "%/%/", zPwd, zOrigName);
      }
    }else{
      blob_appendf(pOut, "%//%/", zPwd, zOrigName);
    }
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
      blob_set(pOut, "./");
      blob_append(pOut, &zPath[i+1], -1);
      blob_reset(&tmp);
      return;
    }
    while( zPath[i-1]!='/' ){ i--; }
    if( zPwd[0]=='/' && strlen(zPwd)==1 ){
      // If on '/', don't go to higher level
      blob_zero(&tmp);
    }else{
      blob_set(&tmp, "../");
    }
    for(j=i; zPwd[j]; j++){
      if( zPwd[j]=='/' ){
        blob_append(&tmp, "../", 3);







|







928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
      blob_set(pOut, "./");
      blob_append(pOut, &zPath[i+1], -1);
      blob_reset(&tmp);
      return;
    }
    while( zPath[i-1]!='/' ){ i--; }
    if( zPwd[0]=='/' && strlen(zPwd)==1 ){
      /* If on '/', don't go to higher level */
      blob_zero(&tmp);
    }else{
      blob_set(&tmp, "../");
    }
    for(j=i; zPwd[j]; j++){
      if( zPwd[j]=='/' ){
        blob_append(&tmp, "../", 3);