fix random whitespace damage

git-svn-id: file:///tmp/cracklib-svn/trunk@219 4175fe1e-86d5-4fdc-8e6a-506fab9d8533

diff --git a/cracklib/lib/fascist.c b/cracklib/lib/fascist.c
index 2d53a9a7af8229ecbded6a9cdb46182ca2ca9cc6..578ea84bfcbd10e1221735572e885038b10eb560 100644 (file)
--- a/cracklib/lib/fascist.c
+++ b/cracklib/lib/fascist.c
@@ -756,7 +756,7 @@ FascistLookUser(PWDICT *pwp, char *instring,
        ptr++;
     }
 
-    /*  Change by Ben Karsin from ITS at University of Hawaii at Manoa.  Static MAXSTEP 
+    /*  Change by Ben Karsin from ITS at University of Hawaii at Manoa.  Static MAXSTEP
         would generate many false positives for long passwords. */
     maxrepeat = 3+(0.09*strlen(password));
     if (i > maxrepeat)

diff --git a/cracklib/lib/packlib.c b/cracklib/lib/packlib.c
index a6aab54f10be1e540e6dcbda5cc1247a79af59f4..5ec5351bdeba3d2d37f7eb30871d2119f6f3c964 100644 (file)
--- a/cracklib/lib/packlib.c
+++ b/cracklib/lib/packlib.c
@@ -124,7 +124,7 @@ PWOpen(prefix, mode)
     if (!(pdesc.ifp = fopen(iname, mode)))
     {
 #ifdef HAVE_ZLIB_H
-               if(pdesc.flags & PFOR_USEZLIB)
+               if (pdesc.flags & PFOR_USEZLIB)
                        gzclose(pdesc.dfp);
                else
 #endif
@@ -161,12 +161,12 @@ PWOpen(prefix, mode)
            pdesc.header.pih_magic = 0;
            fclose(ifp);
 #ifdef HAVE_ZLIB_H
-               if(pdesc.flags & PFOR_USEZLIB)
+               if (pdesc.flags & PFOR_USEZLIB)
                        gzclose(dfp);
                else
 #endif
                        fclose(dfp);
-           if(wfp)
+           if (wfp)
            {
                fclose(wfp);
            }
@@ -180,16 +180,16 @@ PWOpen(prefix, mode)
             if (!fread((char *) &pdesc64.header, sizeof(pdesc64.header), 1, ifp))
             {
                 fprintf(stderr, "%s: error reading header\n", prefix);
- 
+
                 pdesc.header.pih_magic = 0;
                 fclose(ifp);
 #ifdef HAVE_ZLIB_H
-                               if(pdesc.flags & PFOR_USEZLIB)
+                               if (pdesc.flags & PFOR_USEZLIB)
                                        gzclose(dfp);
                                else
 #endif
                                        fclose(dfp);
-               if(wfp)
+               if (wfp)
                {
                        fclose(wfp);
                }
@@ -199,17 +199,17 @@ PWOpen(prefix, mode)
             {
                 /* nope, not "64-bit" after all */
                 fprintf(stderr, "%s: error reading header\n", prefix);
- 
+
                 pdesc.header.pih_magic = 0;
                 fclose(ifp);
 #ifdef HAVE_ZLIB_H
-                               if(pdesc.flags & PFOR_USEZLIB)
+                               if (pdesc.flags & PFOR_USEZLIB)
                                        gzclose(dfp);
                                else
 #endif
                                        fclose(dfp);
 
-               if(wfp)
+               if (wfp)
                {
                        fclose(wfp);
                }
@@ -229,13 +229,13 @@ PWOpen(prefix, mode)
            pdesc.header.pih_magic = 0;
            fclose(ifp);
 #ifdef HAVE_ZLIB_H
-               if(pdesc.flags & PFOR_USEZLIB)
+               if (pdesc.flags & PFOR_USEZLIB)
                        gzclose(dfp);
                else
 #endif
                        fclose(dfp);
 
-           if(wfp)
+           if (wfp)
            {
                fclose(wfp);
            }
@@ -245,16 +245,16 @@ PWOpen(prefix, mode)
         if (pdesc.header.pih_numwords < 1)
         {
             fprintf(stderr, "%s: invalid word count\n", prefix);
- 
+
             pdesc.header.pih_magic = 0;
             fclose(ifp);
 #ifdef HAVE_ZLIB_H
-                       if(pdesc.flags & PFOR_USEZLIB)
+                       if (pdesc.flags & PFOR_USEZLIB)
                                gzclose(dfp);
                        else
 #endif
                                fclose(dfp);
-           if(wfp)
+           if (wfp)
            {
                fclose(wfp);
            }
@@ -268,12 +268,12 @@ PWOpen(prefix, mode)
            pdesc.header.pih_magic = 0;
            fclose(ifp);
 #ifdef HAVE_ZLIB_H
-               if(pdesc.flags & PFOR_USEZLIB)
+               if (pdesc.flags & PFOR_USEZLIB)
                        gzclose(dfp);
                else
 #endif
                        fclose(dfp);
-               if(wfp)
+               if (wfp)
            {
                fclose(wfp);
            }
@@ -294,7 +294,7 @@ PWOpen(prefix, mode)
                 {
                     pdesc.hwms[i] = pdesc64.hwms[i];
                 }
-            } 
+            }
             else if (fread(pdesc.hwms, 1, sizeof(pdesc.hwms), wfp) != sizeof(pdesc.hwms))
            {
                pdesc.flags &= ~PFOR_USEHWMS;
@@ -357,12 +357,12 @@ PWClose(pwp)
 
     fclose(pwp->ifp);
 #ifdef HAVE_ZLIB_H
-       if(pwp->flags & PFOR_USEZLIB)
+       if (pwp->flags & PFOR_USEZLIB)
                gzclose(pwp->dfp);
        else
 #endif
                fclose(pwp->dfp);
-    if(pwp->wfp)
+    if (pwp->wfp)
     {
         fclose(pwp->wfp);
     }
@@ -493,14 +493,14 @@ GetPW(pwp, number)
        if (pwp->flags & PFOR_USEZLIB)
        {
                r = gzseek(pwp->dfp, datum, 0);
-               if(r >= 0)
+               if (r >= 0)
                        r = 0;
        }
        else
 #endif
                r = fseek(pwp->dfp, datum, 0);
 
-       
+
     if (r)
     {
        perror("(data fseek failed)");
@@ -513,15 +513,13 @@ GetPW(pwp, number)
        if (pwp->flags & PFOR_USEZLIB)
        {
                r = gzread(pwp->dfp, buffer, sizeof(buffer));
-               if(r < 0)
+               if (r < 0)
                        r = 0;
        }
        else
 #endif
                r = fread(buffer, 1, sizeof(buffer), pwp->dfp);
-               
-       
-       
+
     if (!r)
     {
        perror("(data fread failed)");
@@ -625,7 +623,7 @@ fprintf(stderr, "look for (%s)\n", string);
 
         if (middle == hwm)
         {
-#if DEBUG 
+#if DEBUG
                fprintf(stderr, "at terminal subdivision, stopping search\n");
 #endif
                break;
@@ -634,11 +632,11 @@ fprintf(stderr, "look for (%s)\n", string);
        if (cmp < 0)
        {
            hwm = middle;
-       } 
+       }
        else if (cmp > 0)
        {
            lwm = middle;
-       } 
+       }
     }
 
     return (PW_WORDS(pwp));

diff --git a/cracklib/util/packer.c b/cracklib/util/packer.c
index cfb57a297a4f00be5cdc2f3ae7f2836ebc64f057..70075ebb7fd45a3c30331de52903238740b8d00e 100644 (file)
--- a/cracklib/util/packer.c
+++ b/cracklib/util/packer.c
@@ -1,7 +1,7 @@
 /*
- * This program is copyright Alec Muffett 1993, portions copyright other authors. 
+ * This program is copyright Alec Muffett 1993, portions copyright other authors.
  * The authors disclaim all responsibility or liability with respect to it's usage
- * or its effect upon hardware or computer systems. 
+ * or its effect upon hardware or computer systems.
  */
 
 #include <stdio.h>
@@ -27,7 +27,7 @@ main(argc, argv)
     {
        file = DEFAULT_CRACKLIB_DICT;
     }
-    else 
+    else
     {
         file = argv[1];
     }

diff --git a/cracklib/util/testlib.c b/cracklib/util/testlib.c
index 4a2465db9454b8bd4d11d26ab82d89b4a5a083ae..0a57783c815319074a5b730432c3a3f6682a821e 100644 (file)
--- a/cracklib/util/testlib.c
+++ b/cracklib/util/testlib.c
@@ -22,7 +22,7 @@ main ()
     while (fgets (buffer, 1000, stdin))
     {
        const char *val;
- 
+
        Chop(buffer);
 
        val = FascistCheck(buffer, NULL);
@@ -30,7 +30,7 @@ main ()
        if (!val)
        {
                val = "ok";
-       }       
+       }
        printf ("%s: %s\n", buffer, val);
     }