git: fc3907ce001e - main - fparseln: Update license

The branch main has been updated by pfg:

URL: https://cgit.FreeBSD.org/src/commit/?id=fc3907ce001ec95ff4f32861bfa84f81c268d179

commit fc3907ce001ec95ff4f32861bfa84f81c268d179
Author:     Pedro F. Giffuni <pfg@FreeBSD.org>
AuthorDate: 2024-06-15 23:30:27 +0000
Commit:     Pedro F. Giffuni <pfg@FreeBSD.org>
CommitDate: 2024-06-15 23:30:27 +0000

    fparseln: Update license
    
    Remove 3rd and 4th clauses in christos' license. OK christos.
    
    Obtained from:  NetBSD
---
 lib/libutil/fparseln.3 | 10 ++--------
 lib/libutil/fparseln.c |  9 ++-------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index 7ddfaefcc943..2f7ebcbf4d68 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $
+.\"	$NetBSD: fparseln.3,v 1.4 2009/10/21 01:07:45 snj Exp $
 .\"
 .\" Copyright (c) 1997 Christos Zoulas.  All rights reserved.
 .\"
@@ -10,11 +10,6 @@
 .\" 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 Christos Zoulas.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -52,8 +47,7 @@ returns a pointer to the next logical line from the stream referenced by
 This string is
 .Dv NUL
 terminated and it is dynamically allocated on each invocation.
-It is the
-responsibility of the caller to free the pointer.
+It is the responsibility of the caller to free the pointer.
 .Pp
 By default, if a character is escaped, both it and the preceding escape
 character will be present in the returned string.
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index c9290230c126..256ee5b04cea 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $	*/
+/*	$NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
  *
@@ -13,11 +13,6 @@
  * 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 Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES