JWS-112 Bumping version of Mafft to version 7.310.

[jabaws.git] / binaries / src / mafft / core / countlen.c

diff --git a/binaries/src/mafft/core/countlen.c b/binaries/src/mafft/core/countlen.c
index 3cb7030..fd52686 100644 (file)
--- a/binaries/src/mafft/core/countlen.c
+++ b/binaries/src/mafft/core/countlen.c
@@ -14,7 +14,7 @@ void arguments( int argc, char *argv[] )
             {
                                case 'i':
                                        inputfile = *++argv;
-                                       fprintf( stderr, "inputfile = %s\n", inputfile );
+//                                     fprintf( stderr, "inputfile = %s\n", inputfile );
                                        --argc;
                                        goto nextoption;
                 default:
@@ -38,6 +38,7 @@ int main( int argc, char *argv[] )
 {
        FILE *infp;
        int nlenmin;
+       double nfreq;
 
        arguments( argc, argv );
 
@@ -54,8 +55,10 @@ int main( int argc, char *argv[] )
                infp = stdin;
 
        dorp = NOTSPECIFIED;
-       getnumlen_nogap( infp, &nlenmin );
+       getnumlen_nogap_countn( infp, &nlenmin, &nfreq );
 
-       fprintf( stdout, "%d x %d - %d %c\n", njob, nlenmax, nlenmin, dorp );
+       fprintf( stdout, "%d x %d - %d %c nfreq=%f\n", njob, nlenmax, nlenmin, dorp, nfreq );
+
+       fclose( infp );
        return( 0 );
 }