Fossil

Check-in [7885b601]
Login

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

Overview
Comment: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

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ticket-d17d6e5b17
Files: files | file ages | folders
SHA1:7885b60187266b40a05fd92d8fa623cf179d35b1
User & Date: jan.nijtmans 2012-11-30 13:05:41
Original Comment: fix merge problem, which cause an OSX broken build
Context
2012-11-30
16:09
merge trunk check-in: 380ad531 user: jan.nijtmans tags: ticket-d17d6e5b17
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: 7885b601 user: jan.nijtmans tags: ticket-d17d6e5b17

12:36
merge trunk. appears to work well again. check-in: 0c659161 user: jan.nijtmans tags: ticket-d17d6e5b17
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/utf8.c.

110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
...
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
...
196
197
198
199
200
201
202


203
204
205
206
207
208
209
/*
** Translate text from the filename character set into
** to precomposed UTF8.  Return a pointer to the translated text.
** Call fossil_filename_free() to deallocate any memory used to store the
** returned pointer when done.
*/
char *fossil_filename_to_utf8(void *zFilename){
#ifdef _WIN32
  int nByte;
  char *zUtf;
  WCHAR *wUnicode = zFilename;
  while( *wUnicode != 0 ){
    if ( (*wUnicode & 0xFF80) == 0xF000 ){
      WCHAR converted = (*wUnicode & 0x7F);
      /* Only really convert it when the resulting char is in the given range*/
................................................................................
      fossil_free(zOut);
      zOut = fossil_strdup(zOrig);
    }else{
      zOut[n+100-nOutx] = 0;
    }
    iconv_close(cd);
  }else{
    zOut = fossil_strdup(zUtf);
  }
  return zOut;
#elif defined(__APPLE__)
  return fossil_strdup(zFilename);
#else
  return (char *)zFilename;  /* No-op on non-mac unix */
#endif
}

/*
** Translate UTF8 to unicode for use in filename translations.
................................................................................
    if ( (*wUnicode < 32) || wcschr(L"\"*<>?|:", *wUnicode) ){
      *wUnicode |= 0xF000;
    }
    ++wUnicode;
  }

  return zUnicode;


#else
  return (void *)zUtf8;  /* No-op on unix */
#endif
}

/*
** Deallocate any memory that was previously allocated by







|







 







|


<
<







 







>
>







110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
...
153
154
155
156
157
158
159
160
161
162


163
164
165
166
167
168
169
...
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
/*
** Translate text from the filename character set into
** to precomposed UTF8.  Return a pointer to the translated text.
** Call fossil_filename_free() to deallocate any memory used to store the
** returned pointer when done.
*/
char *fossil_filename_to_utf8(void *zFilename){
#if defined(_WIN32)
  int nByte;
  char *zUtf;
  WCHAR *wUnicode = zFilename;
  while( *wUnicode != 0 ){
    if ( (*wUnicode & 0xFF80) == 0xF000 ){
      WCHAR converted = (*wUnicode & 0x7F);
      /* Only really convert it when the resulting char is in the given range*/
................................................................................
      fossil_free(zOut);
      zOut = fossil_strdup(zOrig);
    }else{
      zOut[n+100-nOutx] = 0;
    }
    iconv_close(cd);
  }else{
    zOut = fossil_strdup(zFilename);
  }
  return zOut;


#else
  return (char *)zFilename;  /* No-op on non-mac unix */
#endif
}

/*
** Translate UTF8 to unicode for use in filename translations.
................................................................................
    if ( (*wUnicode < 32) || wcschr(L"\"*<>?|:", *wUnicode) ){
      *wUnicode |= 0xF000;
    }
    ++wUnicode;
  }

  return zUnicode;
#elif defined(__APPLE__)
  return fossil_strdup(zUtf8);
#else
  return (void *)zUtf8;  /* No-op on unix */
#endif
}

/*
** Deallocate any memory that was previously allocated by