On 04/28/2012 12:46 AM, Emmanuel Dreyfus wrote:
Hi
I still have two unintegrated patches required to build glusterfs on
NetBSD. Those were rejected some time ago to licensing concerns.
2) There are basename_r() and dirname_r(), stolen from GNU libc, which
are licensed GPL v2.1 or later
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/filesystems/glusterfs/patches
/patch-be?rev=1.8
I understand that license mixing is undesirable, as it taints files and
can cause problems later. On the other hand, having a glusterfs able to
build out of the git on NetBSD would be nice. Would that code be
accepted in tree if it was in a dedicated file? That way other glusterfs
code would not be tainted, and the file can just be removed by anyone
having a licensing issue.
If the proposal is accepted, I propose adding a
libglusterfs/src/compat_netbsd.c, which would be #include'ed with #ifdef
__NetBSD__
Since we want to eventually change the license of libglusterfs to LGPL
(LGPLv3+ to be specific) to make it easier for partners and other third
parties to write for GlusterFS, it isn't (just) that adding GPL code
taints it—— It's just easier if we eliminate all GPL licenses from the
parts that we want to eventually be LGPL, and then nobody has to do
anything, including think very hard about it. ;-)
I've attached MT-SAFE versions of dirname() and basename() derived from
FreeBSD-8.2's implementations. (They compile on FreeBSD and Fedora, but
I haven't tested glusterfs with them.) Note that I'm rather dismayed
that dirname() and basename() in FreeBSD's libc aren't weak symbols. I
presume that NetBSD's libc has the same misfeature. (And yes, gnu libc
has the misfeature too.) As a result, obviously, it means that every use
in gluster has to be changed to dirname_r() or basename_r(), e.g. with
something like #define dirname dirname_r, instead of changing the 40-odd
places where dirname() and basename() are called.
I would suggest that any files associated with this change be added to
.../contrib/<something-or-other>.
I would also suggest that the feature test be #ifndef GF_LINUX_HOST_OS.
But note that Solaris' basename() and dirname() are MT-SAFE too, so
maybe #if !defined(GF_LINUX_HOST_OS) && !defined(GF_SOLARIS_HOST_OS)
instead?
Finally, I don't feel that the changes I made the FreeBSD
implementations to make them MT-SAFE are substantial enough to warrant
claiming a Red Hat copyright on them; I did add a comment though, but
feel free to tell me that I ought to claim copyright.
--
Kaleb
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
* All rights reserved.
*
* 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. 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 ``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 AUTHOR 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.
*/
/*
* MT-SAFE by Kaleb S. KEITHLEY, Red Hat Inc., kkeithle@xxxxxxxxxx
*/
#if 0
#ifndef lint
static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
#endif /* not lint */
#endif
#if 0
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7.34.3.2.1 2010/12/21 17:09:25 kensmith Exp $");
#endif
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
#include <pthread.h>
static pthread_key_t bname_key;
static void
make_bname_key(void)
{
(void) pthread_key_create(&bname_key, free);
}
char *
basename_r(const char *path)
{
static pthread_once_t bname_key_once = PTHREAD_ONCE_INIT;
const char *endp, *startp;
char *bname;
(void) pthread_once(&bname_key_once, make_bname_key);
if ((bname = pthread_getspecific(bname_key)) == NULL) {
bname = (char *)malloc(MAXPATHLEN);
if (bname == NULL)
return(NULL);
(void) pthread_set_specific(bname_key, bname);
}
/* Empty or NULL string gets treated as "." */
if (path == NULL || *path == '\0') {
(void)strcpy(bname, ".");
return(bname);
}
/* Strip trailing slashes */
endp = path + strlen(path) - 1;
while (endp > path && *endp == '/')
endp--;
/* All slashes becomes "/" */
if (endp == path && *endp == '/') {
(void)strcpy(bname, "/");
return(bname);
}
/* Find the start of the base */
startp = endp;
while (startp > path && *(startp - 1) != '/')
startp--;
if (endp - startp + 2 > MAXPATHLEN) {
errno = ENAMETOOLONG;
return(NULL);
}
(void)strncpy(bname, startp, endp - startp + 1);
bname[endp - startp + 1] = '\0';
return(bname);
}
/* $OpenBSD: dirname.c,v 1.13 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* MT-SAFE by Kaleb S. KEITHLEY, Red Hat Inc., kkeithle@xxxxxxxxxx
*/
#if 0
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.8.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $");
#endif
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
#include <pthread.h>
static pthread_key_t dname_key;
static void
make_dname_key(void)
{
(void) pthread_key_create(&dname_key, free);
}
char *
dirname_r(const char *path)
{
static pthread_once_t dname_key_once = PTHREAD_ONCE_INIT;
size_t len;
const char *endp;
char *dname;
(void) pthread_once(&dname_key_once, make_dname_key);
if ((dname = pthread_getspecific(dname_key)) == NULL) {
dname = (char *)malloc(MAXPATHLEN);
if (dname == NULL)
return(NULL);
(void) pthread_set_specific(dname_key, dname);
}
/* Empty or NULL string gets treated as "." */
if (path == NULL || *path == '\0') {
dname[0] = '.';
dname[1] = '\0';
return (dname);
}
/* Strip any trailing slashes */
endp = path + strlen(path) - 1;
while (endp > path && *endp == '/')
endp--;
/* Find the start of the dir */
while (endp > path && *endp != '/')
endp--;
/* Either the dir is "/" or there are no slashes */
if (endp == path) {
dname[0] = *endp == '/' ? '/' : '.';
dname[1] = '\0';
return (dname);
} else {
/* Move forward past the separating slashes */
do {
endp--;
} while (endp > path && *endp == '/');
}
len = endp - path + 1;
if (len >= MAXPATHLEN) {
errno = ENAMETOOLONG;
return (NULL);
}
memcpy(dname, path, len);
dname[len] = '\0';
return (dname);
}
