Thread: [Bitcollider-commits] CVS: bitcollider/src Makefile.am,1.7,1.8 bitcollider.c,1.14,1.15

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bitcollider/bitcollider/src
In directory usw-pr-cvs1:/tmp/cvs-serv23145/src

Modified Files:
	Makefile.am bitcollider.c 
Log Message:
Updated the version number, added a ChangeLog file and applied the -f patch.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.am	2001/03/30 00:58:17	1.7
--- Makefile.am	2001/07/23 21:22:34	1.8
***************
*** 5,12 ****
  # $Id$
  #
! INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
  
  noinst_PROGRAMS = bitcollider
  bitcollider_SOURCES = bitcollider.c 
  bitcollider_LDFLAGS = -export-dynamic 
! bitcollider_LDADD = $(top_builddir)/lib/.libs/libbitcollider.a @LIBS@ -ldl
--- 5,12 ----
  # $Id$
  #
! INCLUDES = $(INCLTDL) -I$(top_srcdir)/lib -I$(top_srcdir)/include
  
  noinst_PROGRAMS = bitcollider
  bitcollider_SOURCES = bitcollider.c 
  bitcollider_LDFLAGS = -export-dynamic 
! bitcollider_LDADD = $(top_builddir)/lib/.libs/libbitcollider.a @LIBS@ $(LIBLTDL)

Index: bitcollider.c
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/src/bitcollider.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** bitcollider.c	2001/04/03 23:53:49	1.14
--- bitcollider.c	2001/07/23 21:22:34	1.15
***************
*** 8,11 ****
--- 8,12 ----
  #include <stdlib.h>
  #include <string.h>
+ #include <errno.h>
  #include "bitcollider.h"
  #include "dirsearch.h"
***************
*** 26,45 ****
     get_agent_string(agentString);
     printf("%s\n\n", agentString);
!    printf("Usage: bitcollider [options] <file|dir> [file|dir] ...\n\n");
     printf("Options:\n");
!    printf(" -p       - print the submission info, without submitting\n");
!    printf(" -n       - show submission in browser, without submitting\n");
!    printf(" -u       - send submission to alternate URL\n");
!    printf(" -3       - force mp3 analysis even if file does not end in .mp3\n");
!    printf(" -e [ext] - treat file as if it had a given extension\n");
!    printf(" -d       - debug print during plugin loading\n");
!    printf(" -r       - recurse into directories.\n");
!    printf(" -a       - analyze all files for a given directory.\n");
!    printf("            (Default is to analyze only known extensions)\n");
  #ifndef _WIN32
!    printf(" -k       - use the Konqueror to submit\n");
!    printf(" -m       - use the Mozilla to submit\n");
!    printf(" -o       - use the Opera to submit\n");
!    printf(" -l       - use the lynx to submit\n");
     printf("\nBy default Netscape will be used. You may also set the\n");
     printf("BROWSER environment variable to specify your browser of choice.\n");
--- 27,48 ----
     get_agent_string(agentString);
     printf("%s\n\n", agentString);
!    printf("Usage: bitcollider [options] <file|dir> [file|dir] ...\n");
!    printf("       bitcollider [options] -f <tag file>\n\n");
     printf("Options:\n");
!    printf(" -p        - print the submission info, without submitting\n");
!    printf(" -n        - show submission in browser, without submitting\n");
!    printf(" -u        - send submission to alternate URL\n");
!    printf(" -3        - force mp3 analysis even if file does not end in .mp3\n");
!    printf(" -e [ext]  - treat file as if it had a given extension\n");
!    printf(" -d        - debug print during plugin loading\n");
!    printf(" -r        - recurse into directories.\n");
!    printf(" -a        - analyze all files for a given directory.\n");
!    printf("             (Default is to analyze only known extensions)\n");
!    printf(" -f <file> - read tags from <file> instead of analyzing\n");
  #ifndef _WIN32
!    printf(" -k        - use the Konqueror to submit\n");
!    printf(" -m        - use the Mozilla to submit\n");
!    printf(" -o        - use the Opera to submit\n");
!    printf(" -l        - use the lynx to submit\n");
     printf("\nBy default Netscape will be used. You may also set the\n");
     printf("BROWSER environment variable to specify your browser of choice.\n");
***************
*** 55,65 ****
     char *error;
  
     error = get_error(bc);
  
!    printf("%s:\n", message);
     if (error)
!       printf("   Error: %s\n\n", error);
     else
!       printf("   Unknown error.\n\n");
  }
  
--- 58,74 ----
     char *error;
  
+    if( ! bc )
+    {
+      fprintf(stderr, "%s\n", message);
+      return;
+    }
+ 
     error = get_error(bc);
  
!    fprintf(stderr, "%s:\n", message);
     if (error)
!       fprintf(stderr, "   Error: %s\n\n", error);
     else
!       fprintf(stderr, "   Unknown error.\n\n");
  }
  
***************
*** 70,74 ****
     warning = get_warning(bc);
     if (warning)
!       printf("Warning: %s\n\n", warning);
  }
  
--- 79,83 ----
     warning = get_warning(bc);
     if (warning)
!       fprintf(stderr, "Warning: %s\n\n", warning);
  }
  
***************
*** 78,91 ****
     if (fileName)
     {
!       printf("  %s: ", fileName);
!       fflush(stdout);
     }
  
     if (message)
!       printf("%s \n", message);      
     else
     {
!       printf("%-3d%%\b\b\b\b", percentComplete);
!       fflush(stdout);
     }
  }
--- 87,100 ----
     if (fileName)
     {
!       fprintf(stderr, "  %s: ", fileName);
! //      fflush(stdout);
     }
  
     if (message)
!       fprintf(stderr, "%s \n", message);      
     else
     {
!       fprintf(stderr, "%-3d%%\b\b\b\b", percentComplete);
! //      fflush(stdout);
     }
  }
***************
*** 95,99 ****
    const char            *submitTarget;
    char                   checkAsExt[MAX_EXT_LEN];
!   Bitcollider           *bc;
    BitcolliderSubmission *submission;
    int                    argIndex = 1, count;
--- 104,109 ----
    const char            *submitTarget;
    char                   checkAsExt[MAX_EXT_LEN];
!   char			 tagFile[MAX_PATH];
!   Bitcollider           *bc = NULL;
    BitcolliderSubmission *submission;
    int                    argIndex = 1, count;
***************
*** 116,119 ****
--- 126,130 ----
    }
    checkAsExt[0] = 0;
+   tagFile[0] = 0;
  
    submitTarget = getenv("BITPRINT_SUBMIT_URL");
***************
*** 175,178 ****
--- 186,194 ----
        }
        else
+       if (strcmp(argv[argIndex], "-f") == 0)
+       {
+           strcpy(tagFile, argv[++argIndex]);
+       }
+       else
        if (strcmp(argv[argIndex], "-n") == 0)
        {
***************
*** 193,198 ****
            if (checkAsExt[0])
            { 
!               printf("You cannot use -3 and -e at the same time.");
!               printf(" -3 ignored.\n");
            }
            else
--- 209,214 ----
            if (checkAsExt[0])
            { 
!               fprintf(stderr, "You cannot use -3 and -e at the same time.");
!               fprintf(stderr, " -3 ignored.\n");
            }
            else
***************
*** 202,208 ****
            break;
    }
!   if (argIndex == argc)
    {
!       printf("You must specify a file to bitcollide.\n");
        exit(-1);
    }
--- 218,224 ----
            break;
    }
!   if (! tagFile[0] && argIndex == argc)
    {
!       fprintf(stderr, "You must specify a file to bitcollide.\n");
        exit(-1);
    }
***************
*** 212,220 ****
        if (strncmp(submitTarget, "http://", 7))
        {
!           printf("'%s' is not a valid URL. Ignoring.\n\n", submitTarget);
            submitTarget = NULL;
        }
        else
!           printf("Submitting to: %s\n\n", submitTarget);
    }
  
--- 228,236 ----
        if (strncmp(submitTarget, "http://", 7))
        {
!           fprintf(stderr, "'%s' is not a valid URL. Ignoring.\n\n", submitTarget);
            submitTarget = NULL;
        }
        else
!           fprintf(stderr, "Submitting to: %s\n\n", submitTarget);
    }
  
***************
*** 222,286 ****
    if (!bc)
    {
!       printf("Cannot create bitcollider.\n");
        exit(-1);
    }
! 
!   submission = create_submission(bc);
!   if (!submission)
    {
!       printf("Cannot create submission.\n");
!       bitcollider_shutdown(bc);
!       exit(-1);
!   }
! 
!   if (autoSubmit)
!      set_auto_submit(submission, true);
! 
!   if (checkAsExt[0])
!      set_check_as(submission, checkAsExt);
! 
!   if (!quiet)
!      set_progress_callback(bc, progress);
  
!   /* Check the file type and existence and then print out error info
!      or analyze the file or dir */
!   for(; argIndex < argc; argIndex++)
    {
!      strcpy(fileName, argv[argIndex]);
  
!      type = check_file_type(fileName);
!      if (type == eOther)
!      {
!          printf("%s is not a regular file. Skipping.\n", fileName);
!          continue;
!      }
!      if (type == eNotFound)
!      {
!          printf("Cannot find file/dir %s. Skipping.\n", fileName);
!          continue;
!      }
! 
!      if (type == eFile)
!      {
!          ret = analyze_file(submission, fileName, false);
!          if (!ret)
           {
!              print_error(bc, "Cannot analyze file");
!              bitcollider_shutdown(bc);
!              exit(-1);
           }
!      }
!      else
!      {
!          if (!quiet)
!              printf("Finding files:\n");
!          count = recurse_dir(submission, fileName, analyzeAll, recurse);
!          if (!quiet)
!              printf("Analyzed %d files.\n\n", count);
!      }
! 
!      print_warning(bc);
    }
! 
    if (!dump)
    {
--- 238,328 ----
    if (!bc)
    {
!       fprintf(stderr, "Cannot create bitcollider.\n");
        exit(-1);
    }
!   
!   if( tagFile[0] )
    {
!       FILE *file;
  
!       if( strcmp( tagFile, "-" ) )
!          file = fopen( tagFile, "r" );
!       else
!          file = stdin;
!   
!       if( ! file )
!       {
!          char error[1024];
!          sprintf( error, "Can't open tag file: %s\n", strerror(errno) );
!          print_error( NULL, error );
!          exit(1);
!       }
!   
!       submission = read_submission_from_file(bc, file);
!       if (autoSubmit)
!          set_auto_submit(submission, true);
!   
!       fclose(file);
!   }
!   else
    {
!       submission = create_submission(bc);
!       if (!submission)
!       {
!           fprintf(stderr, "Cannot create submission.\n");
!           bitcollider_shutdown(bc);
!           exit(-1);
!       }
!   
!       if (checkAsExt[0])
!          set_check_as(submission, checkAsExt);
!   
!       if (autoSubmit)
!          set_auto_submit(submission, true);
!   
!       if (!quiet)
!          set_progress_callback(bc, progress);
!   
!       /* Check the file type and existence and then print out error info
!          or analyze the file or dir */
!       for(; argIndex < argc; argIndex++)
!       {
!          strcpy(fileName, argv[argIndex]);
  
!          type = check_file_type(fileName);
!          if (type == eOther)
           {
!              fprintf(stderr, "%s is not a regular file. Skipping.\n", fileName);
!              continue;
           }
!          if (type == eNotFound)
!          {
!              fprintf(stderr, "Cannot find file/dir %s. Skipping.\n", fileName);
!              continue;
!          }
!   
!          if (type == eFile)
!          {
!              ret = analyze_file(submission, fileName, false);
!              if (!ret)
!              {
!                  print_error(bc, "Cannot analyze file");
!                  bitcollider_shutdown(bc);
!                  exit(-1);
!              }
!          }
!          else
!          {
!              if (!quiet)
!                  fprintf(stderr, "Finding files:\n");
!              count = recurse_dir(submission, fileName, analyzeAll, recurse);
!              if (!quiet)
!                  fprintf(stderr, "Analyzed %d files.\n\n", count);
!          }
!   
!          print_warning(bc);
!       }
    }
!   
    if (!dump)
    {
***************
*** 292,303 ****
        }
        print_warning(bc);
!       printf("Information submitted. Thank you!\n");
    }
    else
    {
        print_submission(submission);
    }
    bitcollider_shutdown(bc);
- 
  
    return 0;
--- 334,345 ----
        }
        print_warning(bc);
!       fprintf(stderr, "Information submitted. Thank you!\n");
    }
    else
    {
+       fprintf(stderr, "\n");
        print_submission(submission);
    }
    bitcollider_shutdown(bc);
  
    return 0;

Thread: [Bitcollider-commits] CVS: bitcollider/src Makefile.am,1.7,1.8 bitcollider.c,1.14,1.15

bitcollider-commits