bitcollider-commits

[Robert K. <may...@us...>]

Update of /cvsroot/bitcollider/bitcollider/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21184/lib

Modified Files:
	main.c 
Log Message:
Made the -f function windows friendly and changed the name from bc_dll.dll to
bitcoll.dll



Index: main.c
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/lib/main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** main.c	2001/07/23 22:32:11	1.25
--- main.c	2001/07/23 23:13:33	1.26
***************
*** 460,466 ****
  }
  
! static void convert_to_hex(const unsigned char *buffer, 
!                            int size, 
!                            char *hexBuffer)
  {
      int i;
--- 460,466 ----
  }
  
! void convert_to_hex(const unsigned char *buffer, 
!                     int size, 
!                     char *hexBuffer)
  {
      int i;
***************
*** 787,804 ****
  }
  
! BitcolliderSubmission *read_submission_from_file(Bitcollider *bc, FILE *infile)
  {
      BitcolliderSubmission *submission;
!     char                   buf[BUFFER_LEN], last[BUFFER_LEN], temp[BUFFER_LEN];
      char                  *c, *t;
      int                    line, empty = 1;
  
      submission = (BitcolliderSubmission *)malloc(sizeof(BitcolliderSubmission));
      if (submission == NULL)
         return NULL;
! 
      memset(submission, 0, sizeof(BitcolliderSubmission));
      submission->bc = bc;
  
      last[0] = 0;
  
--- 787,819 ----
  }
  
! BitcolliderSubmission *read_submission_from_file(Bitcollider *bc, char *fileName)
  {
      BitcolliderSubmission *submission;
!     char                   buf[BUFFER_LEN], last[BUFFER_LEN], temp[BUFFER_LEN], err[255];
      char                  *c, *t;
      int                    line, empty = 1;
+ 	FILE                  *infile;
  
+ 	if (strcmp(fileName, "-"))
+ 	   infile = stdin;
+ 	else
+        infile = fopen(fileName, "rb");
+ 
      submission = (BitcolliderSubmission *)malloc(sizeof(BitcolliderSubmission));
      if (submission == NULL)
+ 	{
+ 	   fclose(infile);
         return NULL;
! 	}
      memset(submission, 0, sizeof(BitcolliderSubmission));
      submission->bc = bc;
  
+ 	if (infile == NULL)
+ 	{
+        sprintf(err, "Can't open tag file: %s", strerror(errno));
+        set_error(submission, err);
+ 	   return submission;
+ 	}
+ 
      last[0] = 0;
  
***************
*** 809,819 ****
             if( strlen( buf ) == BUFFER_LEN - 1 )
             {
!               fprintf( stderr, "Line %d exceeds length limit\n", line );
!               exit(1);
             }
             else
             {
!               fprintf( stderr, "Line %d is truncated\n", line );
!               exit(1);
             }
         }
--- 824,840 ----
             if( strlen( buf ) == BUFFER_LEN - 1 )
             {
!               sprintf(err, "Line %d exceeds length limit", line );
!               set_error(submission, err);
! 	          fclose(infile);
!               submission->numBitprints = 0;
!               return submission;
             }
             else
             {
!               sprintf(err, "Line %d is truncated", line );
!               set_error(submission, err);
! 	          fclose(infile);
!               submission->numBitprints = 0;
!               return submission;
             }
         }
***************
*** 828,834 ****
         if( ! ( t = strchr( c, '=' ) ) )
         {
!            fprintf( stderr, "Line %d does not appear to contain a tag\n", 
!                             line );
!            exit(1);
         }
         *t = 0;
--- 849,857 ----
         if( ! ( t = strchr( c, '=' ) ) )
         {
!            sprintf(err, "Line %d does not appear to contain a tag", line );
!            set_error(submission, err);
!            fclose(infile);
!            submission->numBitprints = 0;
!            return submission;
         }
         *t = 0;
***************
*** 839,845 ****
             if( ! ( t = strchr( c, '.' ) ) )
             {
!               fprintf(stderr, "Line %d does not appear to contain a tag\n", 
!                       line );
!               exit(1);
             }
             *t = 0;
--- 862,870 ----
             if( ! ( t = strchr( c, '.' ) ) )
             {
!               sprintf(err, "Line %d does not appear to contain a tag", line);
!               set_error(submission, err);
! 	          fclose(infile);
! 			  submission->numBitprints = 0;
!               return submission;
             }
             *t = 0;
***************
*** 869,872 ****
--- 894,899 ----
         submission->numBitprints++;
      }
+ 
+ 	fclose(infile);
  
      return submission;