Fossil

Check-in [a7eb7147]
Login

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

Overview
Comment:cherry-picked [4295728159451e0d].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a7eb71475810af4edb06ddf5b21fef2300e8c4ad
User & Date: stephan 2012-07-16 14:37:28
Context
2012-07-17
16:55
Separate the download links on the "info" and "ci" pages onto a separate line with a separate label. check-in: 7ee938f4 user: drh tags: trunk
2012-07-16
14:37
cherry-picked [4295728159451e0d]. check-in: a7eb7147 user: stephan tags: trunk
2012-07-14
16:51
Merge the root-tag branch into trunk. check-in: 9f83e033 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/blob.c.

699
700
701
702
703
704
705
706

707
708
709
710
711
712
713

/*
** 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.  Return -1 for an error.

*/
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) ){
    return blob_read_from_channel(pBlob, stdin, -1);







|
>







699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714

/*
** 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_panic() 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) ){
    return blob_read_from_channel(pBlob, stdin, -1);