Differences From Artifact [6a1aea546e]:

• File src/blob.c — part of check-in [f2fc37c063] at 2014-11-26 10:13:24 on branch trunk — Fix "Corrupt line endings in cat/finfo on Windows with CR+LF files", reported on ML. (user: jan.nijtmans size: 31414) [more...]

To Artifact [d5931816af]:

• File src/blob.c — part of check-in [bfd413bf1e] at 2015-02-16 13:41:27 on branch trunk — Enhance the --skin option so that it can be a directory holding the three skin files. (user: drh size: 31417) [more...]

751
752
753
754
755
756
757
758
759
760
761
762
763
764
765

/*
** Initialize a blob to be the content of a file.  If the filename
** is blank or "-" then read from standard input.
**
** Any prior content of the blob is discarded, not freed.
**
** Return the number of bytes read. Calls fossil_fatal() error (i.e.
** it exit()s and does not return).
*/
int blob_read_from_file(Blob *pBlob, const char *zFilename){
  int size, got;
  FILE *in;
  if( zFilename==0 || zFilename[0]==0
        || (zFilename[0]=='-' && zFilename[1]==0) ){

|

751
752
753
754
755
756
757
758
759
760
761
762
763
764
765

/*
** Initialize a blob to be the content of a file.  If the filename
** is blank or "-" then read from standard input.
**
** Any prior content of the blob is discarded, not freed.
**
** Return the number of bytes read. Calls fossil_fatal() on error (i.e.
** it exit()s and does not return).
*/
int blob_read_from_file(Blob *pBlob, const char *zFilename){
  int size, got;
  FILE *in;
  if( zFilename==0 || zFilename[0]==0
        || (zFilename[0]=='-' && zFilename[1]==0) ){