Fossil

Check-in [647bb7b79f]
Login

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

Overview
Comment:Allow characters *[]? to appear in filenames. Tickets [46bf4baedce] and [d17d6e5b174bd6] and [10aee063c413c107]
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 647bb7b79f3c2ac8b79519a57b497bea00a35256
User & Date: drh 2012-11-30 15:52:55.051
Original Comment: Allow characters *[]? to appear in filenames. Ticket [46bf4baedce].
References
2012-11-30
13:05
Changes to allow *[]? in check-in comments were added by check-in [647bb7b79f3c2a], which is sufficient to address ticket [46bf4baedcea6c]. The additional logic in this branch that tries to do special encodings for double-quote characters on windows is complication we can do without. Was: fix merge problem, which cause an OSX broken build check-in: 7885b60187 user: jan.nijtmans tags: ticket-d17d6e5b17
Context
2012-11-30
16:09
CSS changes: set the cursor to "pointer" on ticket reports. check-in: d091c609d2 user: drh tags: trunk
16:09
merge trunk check-in: 380ad5312a user: jan.nijtmans tags: ticket-d17d6e5b17
15:52
Allow characters *[]? to appear in filenames. Tickets [46bf4baedce] and [d17d6e5b174bd6] and [10aee063c413c107] check-in: 647bb7b79f user: drh tags: trunk
15:22
Click on the timeline graph once to select a node. Click on a different node to see a diff between the two nodes. Click on the selected node to unselect it. check-in: 5bff5e5cc5 user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/file.c.
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
      }
      if( ((c & 0xff) == 0xed) && ((z[i+1] & 0xe0) == 0xa0) ){
        /* Unicode character in the range U+D800 - U+DFFF are for
         * surrogate pairs, they shouldn't occur in filenames. */
        return 0;
      }
    }
    if( c=='\\' || c=='*' || c=='[' || c==']' || c=='?' ){
      return 0;
    }
    if( c=='/' ){
      if( z[i+1]=='/' ) return 0;
      if( z[i+1]=='.' ){
        if( z[i+2]=='/' || z[i+2]==0 ) return 0;
        if( z[i+2]=='.' && (z[i+3]=='/' || z[i+3]==0) ) return 0;







|







521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
      }
      if( ((c & 0xff) == 0xed) && ((z[i+1] & 0xe0) == 0xa0) ){
        /* Unicode character in the range U+D800 - U+DFFF are for
         * surrogate pairs, they shouldn't occur in filenames. */
        return 0;
      }
    }
    if( c=='\\' ){
      return 0;
    }
    if( c=='/' ){
      if( z[i+1]=='/' ) return 0;
      if( z[i+1]=='.' ){
        if( z[i+2]=='/' || z[i+2]==0 ) return 0;
        if( z[i+2]=='.' && (z[i+3]=='/' || z[i+3]==0) ) return 0;