/*
- * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
+ * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
*
* Created on: 25 juil. 2011
* Author: mickael
- * BASELINE MUST BE GENERATED BY UNIX PLATFORM REGARDING TO THE CRLF PROBLEM
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <assert.h>
-#include "getopt.h"
+#include "opj_getopt.h"
typedef struct test_cmp_parameters
{
/*******************************************************************************
* Command line help function
*******************************************************************************/
-void compare_dump_files_help_display(void) {
+static void compare_dump_files_help_display(void) {
fprintf(stdout,"\nList of parameters for the compare_dump_files function \n");
fprintf(stdout,"\n");
fprintf(stdout," -b \t REQUIRED \t filename to the reference/baseline dump file \n");
/*******************************************************************************
* Parse command line
*******************************************************************************/
-int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
+static int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
{
- int sizemembasefile, sizememtestfile;
+ size_t sizemembasefile, sizememtestfile;
int index;
const char optlist[] = "b:t:";
int c;
- // Init parameters
+ /* Init parameters */
param->base_filename = NULL;
param->test_filename = NULL;
- opterr = 0;
+ opj_opterr = 0;
- while ((c = getopt(argc, argv, optlist)) != -1)
+ while ((c = opj_getopt(argc, argv, optlist)) != -1)
switch (c)
{
- case 'b':
- sizemembasefile = (int)strlen(optarg)+1;
- param->base_filename = (char*) malloc(sizemembasefile);
- param->base_filename[0] = '\0';
- strncpy(param->base_filename, optarg, strlen(optarg));
- param->base_filename[strlen(optarg)] = '\0';
- //printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile );
- break;
- case 't':
- sizememtestfile = (int) strlen(optarg) + 1;
- param->test_filename = (char*) malloc(sizememtestfile);
- param->test_filename[0] = '\0';
- strncpy(param->test_filename, optarg, strlen(optarg));
- param->test_filename[strlen(optarg)] = '\0';
- //printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile);
- break;
- case '?':
- if ( (optopt == 'b') || (optopt == 't') )
- fprintf(stderr, "Option -%c requires an argument.\n", optopt);
- else
- if (isprint(optopt)) fprintf(stderr, "Unknown option `-%c'.\n", optopt);
- else fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
- return 1;
- default:
- fprintf(stderr, "WARNING -> this option is not valid \"-%c %s\"\n", c, optarg);
- break;
+ case 'b':
+ sizemembasefile = strlen(opj_optarg) + 1;
+ param->base_filename = (char*) malloc(sizemembasefile);
+ strcpy(param->base_filename, opj_optarg);
+ /*printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile );*/
+ break;
+ case 't':
+ sizememtestfile = strlen(opj_optarg) + 1;
+ param->test_filename = (char*) malloc(sizememtestfile);
+ strcpy(param->test_filename, opj_optarg);
+ /*printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile);*/
+ break;
+ case '?':
+ if ( (opj_optopt == 'b') || (opj_optopt == 't') )
+ fprintf(stderr, "Option -%c requires an argument.\n", opj_optopt);
+ else
+ if (isprint(opj_optopt)) fprintf(stderr, "Unknown option `-%c'.\n", opj_optopt);
+ else fprintf(stderr, "Unknown option character `\\x%x'.\n", opj_optopt);
+ return 1;
+ default:
+ fprintf(stderr, "WARNING -> this option is not valid \"-%c %s\"\n", c, opj_optarg);
+ break;
}
- if (optind != argc)
+ if (opj_optind != argc)
{
- for (index = optind; index < argc; index++)
+ for (index = opj_optind; index < argc; index++)
fprintf(stderr,"Non-option argument %s\n", argv[index]);
- return EXIT_FAILURE;
+ return 1;
}
- return EXIT_SUCCESS;
+ return 0;
}
+
/*******************************************************************************
* MAIN
*******************************************************************************/
{
test_cmp_parameters inParam;
FILE *fbase=NULL, *ftest=NULL;
- int chbase, chtest;
- int same = 1;
- unsigned long l=1, pos;
+ int same = 0;
+ char lbase[512];
+ char strbase[512];
+ char ltest[512];
+ char strtest[512];
- if( parse_cmdline_cmp(argc, argv, &inParam) == EXIT_FAILURE )
+ if( parse_cmdline_cmp(argc, argv, &inParam) == 1 )
{
compare_dump_files_help_display();
- if (!inParam.base_filename) free(inParam.base_filename);
- if (!inParam.test_filename) free(inParam.test_filename);
- return EXIT_FAILURE;
+ goto cleanup;
}
- // Display Parameters
+ /* Display Parameters*/
printf("******Parameters********* \n");
printf(" base_filename = %s\n"
- " test_filename = %s\n",
- inParam.base_filename, inParam.test_filename);
+ " test_filename = %s\n",
+ inParam.base_filename, inParam.test_filename);
printf("************************* \n");
/* open base file */
printf("Try to open: %s for reading ... ", inParam.base_filename);
if((fbase = fopen(inParam.base_filename, "rb"))==NULL)
{
- printf("Failed.\n");
- free(inParam.base_filename);
- free(inParam.test_filename);
- return EXIT_FAILURE;
+ goto cleanup;
}
printf("Ok.\n");
printf("Try to open: %s for reading ... ", inParam.test_filename);
if((ftest = fopen(inParam.test_filename, "rb"))==NULL)
{
- printf("Failed.\n");
- fclose(fbase);
- free(inParam.base_filename);
- free(inParam.test_filename);
- return EXIT_FAILURE;
+ goto cleanup;
}
printf("Ok.\n");
- pos=ftell(fbase);
-
- while(!feof(fbase))
+ while (fgets(lbase, sizeof(lbase), fbase) && fgets(ltest,sizeof(ltest),ftest))
{
- chbase = fgetc(fbase);
- if(ferror(fbase))
- {
- printf("Error reading base file.\n");
- return EXIT_FAILURE;
- }
-
- chtest = fgetc(ftest);
- if(ferror(ftest))
- {
- printf("Error reading test file.\n");
- return EXIT_FAILURE;
- }
-
- // CRLF problem (Baseline must be always generated by unix platform)
- if (chbase == '\n' && chtest == '\r')
- if (fgetc(ftest) == '\n')
- chtest = '\n';
-
- if(chbase != chtest)
+ int nbase = sscanf(lbase, "%511[^\r\n]", strbase);
+ int ntest = sscanf(ltest, "%511[^\r\n]", strtest);
+ assert( nbase != 511 && ntest != 511 );
+ if( nbase != 1 || ntest != 1 )
{
- size_t nbytes = 2048;
- int CRLF_shift=1;
- char *strbase, *strtest, *strbase_d, *strtest_d;
- char *return_value_fgets;
-
- printf("Files differ at line %lu:\n", l);
- fseek(fbase,pos,SEEK_SET);
-
- // Take into account CRLF characters when we write \n into
- // dump file when we used WIN platform
-#ifdef _WIN32
- CRLF_shift = 2;
- fseek(ftest,pos + l - 1,SEEK_SET);
-#else
- fseek(ftest,pos,SEEK_SET);
-#endif
-
- strbase = (char *) malloc(nbytes + 1);
- strtest = (char *) malloc(nbytes + 1);
-
- return_value_fgets = fgets(strbase, nbytes, fbase);
- if (!strcmp(return_value_fgets,strbase))
- fprintf(stderr,"\nWARNING: fgets return a value different that the first argument");
- free(return_value_fgets);
-
- return_value_fgets = fgets(strtest, nbytes, ftest);
- if (!strcmp(return_value_fgets,strtest))
- fprintf(stderr,"\nWARNING: fgets return a value different that the first argument");
- free(return_value_fgets);
-
- strbase_d = (char *) malloc(strlen(strbase)+1);
- strtest_d = (char *) malloc(strlen(strtest)+1);
- strncpy(strbase_d, strbase, strlen(strbase)-1);
- strncpy(strtest_d, strtest, strlen(strtest)-CRLF_shift);
- strbase_d[strlen(strbase)-1] = '\0';
- strtest_d[strlen(strtest)-CRLF_shift] = '\0';
- printf("<%s> vs. <%s>\n", strbase_d, strtest_d);
-
- free(strbase);free(strtest);
- free(strbase_d);free(strtest_d);
- same = 0;
- break;
+ fprintf(stderr, "could not parse line from files\n" );
+ goto cleanup;
}
- else
+ if( strcmp( strbase, strtest ) != 0 )
{
- if (chbase == '\n')
- {
- l++;
- pos = ftell(fbase);
- }
+ fprintf(stderr,"<%s> vs. <%s>\n", strbase, strtest);
+ goto cleanup;
}
}
- //Close File
- fclose(fbase);
- fclose(ftest);
+ same = 1;
+ printf("\n***** TEST SUCCEED: Files are the same. *****\n");
+cleanup:
+ /*Close File*/
+ if(fbase) fclose(fbase);
+ if(ftest) fclose(ftest);
- // Free memory
+ /* Free memory*/
free(inParam.base_filename);
free(inParam.test_filename);
- if(same)
- {
- printf("\n***** TEST SUCCEED: Files are the same. *****\n");
- return EXIT_SUCCESS;
- }
- else return EXIT_FAILURE;
+ return same ? EXIT_SUCCESS : EXIT_FAILURE;
}
projects / openjpeg.git / blobdiff