Differences From Artifact [fddc77945e]:

• File src/main.c — part of check-in [4e368da19c] at 2012-11-14 17:39:51 on branch trunk — Allow the "fossil ui" command to specify a directory as long as the "--notfound" option is also used. Give a better error message if these conditions are not met. (user: drh size: 63104) [more...]

To Artifact [fa01d59883]:

• File src/main.c — part of check-in [d29dd5449c] at 2012-11-19 04:39:51 on branch convert_before_commit_v2 — Modularize byte-order-mark and blob UTF-8 conversion handling. (user: mistachkin size: 63109)

514
515
516
517
518
519
520
521
522
523
524
525
526
527
528

  }else{
    blob_read_from_channel(&file, zInFile, -1);
    if(stdin != zInFile){
      fclose(zInFile);
    }
    zInFile = NULL;
  }
  blob_strip_bom(&file, 1);
  z = blob_str(&file);
  for(k=0, nLine=1; z[k]; k++) if( z[k]=='\n' ) nLine++;
  newArgv = fossil_malloc( sizeof(char*)*(g.argc + nLine*2) );
  for(j=0; j<i; j++) newArgv[j] = g.argv[j];

  blob_rewind(&file);
  while( (n = blob_line(&file, &line))>0 ){

|

514
515
516
517
518
519
520
521
522
523
524
525
526
527
528

  }else{
    blob_read_from_channel(&file, zInFile, -1);
    if(stdin != zInFile){
      fclose(zInFile);
    }
    zInFile = NULL;
  }
  blob_to_utf8_no_bom(&file, 1);
  z = blob_str(&file);
  for(k=0, nLine=1; z[k]; k++) if( z[k]=='\n' ) nLine++;
  newArgv = fossil_malloc( sizeof(char*)*(g.argc + nLine*2) );
  for(j=0; j<i; j++) newArgv[j] = g.argv[j];

  blob_rewind(&file);
  while( (n = blob_line(&file, &line))>0 ){