Fossil

Differences From Artifact [ba3c29ae04]:

• File src/comformat.c — part of check-in [e62161976e] at 2017-06-15 03:37:45 on branch trunk — Fix TTY comment line break logic for UTF8 multi-byte characters. (user: drh size: 17143) [more...]

To Artifact [4d18073b1a]:

• File src/comformat.c — part of check-in [e7767de263] at 2017-11-30 17:58:09 on branch symlink-refactor — Refactor the symlink processing logic so that most of the file access routines take a new parameter indicating the conditions under which symlinks should and should not be followed. This should fix a few bugs related to symlink processing. Lots of testing required before merging to trunk. (user: drh size: 17161) [more...]

482
483
484
485
486
487
488
489

490
491
492
493

494
495
496
497
498
499
500

482
483
484
485
486
487
488

489
490
491
492

493
494
495
496
497
498
499
500

-
+



-
+

  if( g.argc==5 ){
    zOrigText = g.argv[4];
  }else{
    zOrigText = 0;
  }
  if( fromFile ){
    Blob fileData;
    blob_read_from_file(&fileData, zText);
    blob_read_from_file(&fileData, zText, ExtFILE);
    zText = mprintf("%s", blob_str(&fileData));
    blob_reset(&fileData);
    if( zOrigText ){
      blob_read_from_file(&fileData, zOrigText);
      blob_read_from_file(&fileData, zOrigText, ExtFILE);
      zOrigText = mprintf("%s", blob_str(&fileData));
      blob_reset(&fileData);
    }
  }
  if( decode ){
    zText = mprintf(fromFile?"%z":"%s" /*works-like:"%s"*/, zText);
    defossilize(zText);