BSD 4_4_Lite2 release

[unix-history] / usr / src / usr.bin / locate / bigram / locate.bigram.c

diff --git a/usr/src/usr.bin/locate/bigram/locate.bigram.c b/usr/src/usr.bin/locate/bigram/locate.bigram.c
index 5e49474..fc0cbb7 100644 (file)
--- a/usr/src/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr/src/usr.bin/locate/bigram/locate.bigram.c
@@ -5,7 +5,33 @@
  * This code is derived from software contributed to Berkeley by
  * James A. Woods.
  *
  * This code is derived from software contributed to Berkeley by
  * James A. Woods.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -15,7 +41,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)locate.bigram.c    8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)locate.bigram.c    8.2 (Berkeley) 4/28/95";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -40,12 +66,12 @@ main ( )
 
                /* skip longest common prefix */
                for ( cp = path; *cp == *oldpath; cp++, oldpath++ )
 
                /* skip longest common prefix */
                for ( cp = path; *cp == *oldpath; cp++, oldpath++ )

-                       if ( *oldpath == NULL )
+                       if ( *oldpath == '\0' )

                                break;
                /*
                 * output post-residue bigrams only
                 */
                                break;
                /*
                 * output post-residue bigrams only
                 */

-               while ( *cp != NULL && *(cp + 1) != NULL ) {
+               while ( *cp != '\0' && *(cp + 1) != '\0' ) {

                        putchar ( *cp++ );
                        putchar ( *cp++ );
                        putchar ( '\n' );
                        putchar ( *cp++ );
                        putchar ( *cp++ );
                        putchar ( '\n' );


@@ -55,4 +81,5 @@ main ( )
                else
                        path = buf1, oldpath = buf2;
        }
                else
                        path = buf1, oldpath = buf2;
        }

+       return (0);

 }
 }