Fossil

Check-in [0c1a116791]
Login

Check-in [0c1a116791]

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

Overview
Comment:styling
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | sqlite-min-to-3.7.17
Files: files | file ages | folders
SHA1: 0c1a1167911131fe0b28de6a7fc318e60dc56a0b
User & Date: jan.nijtmans 2014-01-05 11:03:35.297
Context
2014-01-06
10:36
Merge trunk ... (check-in: 99af4d2a12 user: jan.nijtmans tags: sqlite-min-to-3.7.17)
2014-01-05
11:03
styling ... (check-in: 0c1a116791 user: jan.nijtmans tags: sqlite-min-to-3.7.17)
10:55
fix comment ... (check-in: 1de0faecff user: jan.nijtmans tags: sqlite-min-to-3.7.17)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/cgi.c.
︙︙
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290


/*
** Return true if the response should be sent with Content-Encoding: gzip.
*/
static int is_gzippable(void){
  if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
  return strncmp(zContentType, "text/", 5)==0
    || !sqlite3_strglob("application/*xml", zContentType)
    || !sqlite3_strglob("application/*javascript", zContentType);
}

/*
** Do a normal HTTP reply
*/
void cgi_reply(void){
  int total_size;








|
|








275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290


/*
** Return true if the response should be sent with Content-Encoding: gzip.
*/
static int is_gzippable(void){
  if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
  return strncmp(zContentType, "text/", 5)==0
    || sqlite3_strglob("application/*xml", zContentType)==0
    || sqlite3_strglob("application/*javascript", zContentType)==0;
}

/*
** Do a normal HTTP reply
*/
void cgi_reply(void){
  int total_size;
︙︙
Changes to src/diffcmd.c.
︙︙
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941

  char *zCmd;
  blob_zero(&script);
  blob_appendf(&script, "set fossilcmd {| \"%/\" %s --html -y -i -v",
               g.nameOfExe, zSubCmd);
  for(i=firstArg; i<g.argc; i++){
    const char *z = g.argv[i];
    if( z[0]=='-' ){
      if( !sqlite3_strglob("*-html",z) ) continue;
      if( !sqlite3_strglob("*-y",z) ) continue;
      if( !sqlite3_strglob("*-i",z) ) continue;
      /* The undocumented --script FILENAME option causes the Tk script to
      ** be written into the FILENAME instead of being run.  This is used
      ** for testing and debugging. */
      if( !sqlite3_strglob("*-script",z) && i<g.argc-1 ){
        i++;
        zTempFile = g.argv[i];
        continue;
      }
    }
    blob_append(&script, " ", 1);
    shell_escape(&script, z);








|
|
|



|








921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941

  char *zCmd;
  blob_zero(&script);
  blob_appendf(&script, "set fossilcmd {| \"%/\" %s --html -y -i -v",
               g.nameOfExe, zSubCmd);
  for(i=firstArg; i<g.argc; i++){
    const char *z = g.argv[i];
    if( z[0]=='-' ){
      if( sqlite3_strglob("*-html",z)==0 ) continue;
      if( sqlite3_strglob("*-y",z)==0 ) continue;
      if( sqlite3_strglob("*-i",z)==0 ) continue;
      /* The undocumented --script FILENAME option causes the Tk script to
      ** be written into the FILENAME instead of being run.  This is used
      ** for testing and debugging. */
      if( sqlite3_strglob("*-script",z)==0 && i<g.argc-1 ){
        i++;
        zTempFile = g.argv[i];
        continue;
      }
    }
    blob_append(&script, " ", 1);
    shell_escape(&script, z);
︙︙
Changes to src/glob.c.
︙︙
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161

**
** A NULL glob matches nothing.
*/
int glob_match(Glob *pGlob, const char *zString){
  int i;
  if( pGlob==0 ) return 0;
  for(i=0; i<pGlob->nPattern; i++){
    if( !sqlite3_strglob(pGlob->azPattern[i], zString) ) return i+1;
  }
  return 0;
}

/*
** Free all memory associated with the given Glob object
*/








|








147
148
149
150
151
152
153
154
155
156
157
158
159
160
161

**
** A NULL glob matches nothing.
*/
int glob_match(Glob *pGlob, const char *zString){
  int i;
  if( pGlob==0 ) return 0;
  for(i=0; i<pGlob->nPattern; i++){
    if( sqlite3_strglob(pGlob->azPattern[i], zString)==0 ) return i+1;
  }
  return 0;
}

/*
** Free all memory associated with the given Glob object
*/
︙︙