mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r8352] Purpose:

Browse Source 
bug fix

Description:
the routine for reading the options from a file had the "old" parse syntax

Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:
This commit is contained in:
Pedro Vicente Nunes 2004-04-14 11:41:43 -05:00
parent 2fac8dfcbc
commit 7d8b8f129d
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/h5repack/h5repack.c
View File

@ -397,14 +397,23 @@ void read_info(const char *filename,
FILE *fp;
char c;
int i, rc=1;
char *srcdir = getenv("srcdir"); /* the source directory */
char data_file[512]=""; /* buffer to hold name of existing file */
/* compose the name of the file to open, using the srcdir, if appropriate */
if (srcdir){
strcpy(data_file,srcdir);
strcat(data_file,"/");
}
strcat(data_file,filename);
if ((fp = fopen(filename, "r")) == (FILE *)NULL) {
if ((fp = fopen(data_file, "r")) == (FILE *)NULL) {
printf( "Cannot open options file %s", filename);
exit(1);
}
/* Cycle until end of file reached */
/* cycle until end of file reached */
while( 1 )
{
rc=fscanf(fp, "%s", stype);
@ -419,17 +428,20 @@ void read_info(const char *filename,
/* find begining of info */
i=0; c='0';
while( c!='"' )
while( c!=' ' )
{
fscanf(fp, "%c", &c);
if (feof(fp)) break;
}
c='0';
/* go until end */
while( c!='"' )
while( c!=' ' )
{
fscanf(fp, "%c", &c);
comp_info[i]=c;
i++;
if (feof(fp)) break;
if (c==10 /*eol*/) break;
}
comp_info[i-1]='\0'; /*cut the last " */
@ -446,17 +458,20 @@ void read_info(const char *filename,
/* find begining of info */
i=0; c='0';
while( c!='"' )
while( c!=' ' )
{
fscanf(fp, "%c", &c);
if (feof(fp)) break;
}
c='0';
/* go until end */
while( c!='"' )
while( c!=' ' )
{
fscanf(fp, "%c", &c);
comp_info[i]=c;
i++;
if (feof(fp)) break;
if (c==10 /*eol*/) break;
}
comp_info[i-1]='\0'; /*cut the last " */

2
tools/h5repack/h5repack.sh
View File

@ -169,7 +169,7 @@ TOOLTEST test4.h5 -f dset_all:GZIP=1
TOOLTEST test4.h5 -f GZIP=1 -m 1024
#file
#TOOLTEST test4.h5 -e h5repack_info.txt
TOOLTEST test4.h5 -e ../testfiles/h5repack_info.txt
if test $nerrors -eq 0 ; then
echo "All $H5REPACK tests passed."