From 7528986d00940c3295a42a9ad8782fe34d1a8268 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 6 Apr 2016 19:05:10 -0500 Subject: [PATCH] test --- crypto777/iguana_OS.c | 2 +- iguana/iguana_ramchain.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/crypto777/iguana_OS.c b/crypto777/iguana_OS.c index 1d452778d..4e8e70a4c 100755 --- a/crypto777/iguana_OS.c +++ b/crypto777/iguana_OS.c @@ -502,7 +502,7 @@ int32_t OS_removefile(char *fname,int32_t scrubflag) OS_compatible_path(tmp); if ( (fp= fopen(tmp,"rb+")) != 0 ) { - printf("delete(%s)\n",fname); + //printf("delete(%s)\n",fname); if ( scrubflag != 0 ) { fseek(fp,0,SEEK_END); diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index d9931eb1b..909d47758 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -2010,17 +2010,24 @@ int32_t iguana_oldbundlefiles(struct iguana_info *coin,uint32_t *ipbits,void **p void *iguana_bundlefile(struct iguana_info *coin,char *fname,long *filesizep,struct iguana_bundle *bp,int32_t bundlei) { - int32_t checki,hdrsi; void *ptr = 0; static const bits256 zero; + int32_t checki,hdrsi; void *ptr = 0; FILE *fp; static const bits256 zero; *filesizep = 0; + fname[0] = 0; if ( (checki= iguana_peerfname(coin,&hdrsi,GLOBALTMPDIR,fname,0,bp->hashes[bundlei],zero,1,1)) != bundlei || bundlei < 0 || bundlei >= coin->chain->bundlesize ) { printf("B iguana_ramchain_map.(%s) illegal hdrsi.%d bundlei.%d checki.%d\n",fname,hdrsi,bundlei,checki); return(0); } - if ( (ptr= OS_mapfile(fname,filesizep,0)) == 0 ) - { - printf("error mapping.(%s) bundlei.%d\n",fname,bundlei); + if ( (fp= fopen(fname,"rb")) == 0 ) return(0); + else + { + fclose(fp); + if ( (ptr= OS_mapfile(fname,filesizep,0)) == 0 ) + { + printf("error mapping.(%s) bundlei.%d\n",fname,bundlei); + return(0); + } } printf("mapped.(%s) bundlei.[%d:%d] %p[%ld]\n",fname,hdrsi,bundlei,ptr,*filesizep); return(ptr);