From: Peter Johnson Date: Thu, 28 Jun 2001 22:21:17 +0000 (-0000) Subject: Change copyright and code to match original UCB source. X-Git-Tag: v0.1.0~446 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5faba8f40f7b77f96d85d22f60e80804c3cc52b7;p=yasm Change copyright and code to match original UCB source. svn path=/trunk/yasm/; revision=65 --- diff --git a/libyasm/xstrdup.c b/libyasm/xstrdup.c index 3390367c..4c17de1e 100644 --- a/libyasm/xstrdup.c +++ b/libyasm/xstrdup.c @@ -1,29 +1,44 @@ -/* $Id: xstrdup.c,v 1.1 2001/06/28 08:50:09 peter Exp $ +/* $Id: xstrdup.c,v 1.2 2001/06/28 22:21:17 peter Exp $ * strdup() implementation for systems that don't have it. * - * Copyright (C) 2001 Peter Johnson + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. * - * This file is part of YASM. + * 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. 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. * - * YASM is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * YASM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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. */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif #ifdef STDC_HEADERS +# include # include # include #else @@ -39,14 +54,15 @@ void memcpy(void *, const void *, size_t); #include "util.h" -char *strdup(const char *str) +char * +strdup(const char *str) { - size_t len; - char *copy; + size_t len; + char *copy; - len = strlen(str) + 1; - if((copy = malloc(len)) == NULL) - return (char *)NULL; - memcpy(copy, str, len); - return copy; + len = strlen(str) + 1; + if ((copy = malloc(len)) == NULL) + return (NULL); + memcpy(copy, str, len); + return (copy); } diff --git a/src/strdup.c b/src/strdup.c index 7b5051bf..161d1f3c 100644 --- a/src/strdup.c +++ b/src/strdup.c @@ -1,29 +1,44 @@ -/* $Id: strdup.c,v 1.1 2001/06/28 08:50:09 peter Exp $ +/* $Id: strdup.c,v 1.2 2001/06/28 22:21:17 peter Exp $ * strdup() implementation for systems that don't have it. * - * Copyright (C) 2001 Peter Johnson + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. * - * This file is part of YASM. + * 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. 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. * - * YASM is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * YASM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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. */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif #ifdef STDC_HEADERS +# include # include # include #else @@ -39,14 +54,15 @@ void memcpy(void *, const void *, size_t); #include "util.h" -char *strdup(const char *str) +char * +strdup(const char *str) { - size_t len; - char *copy; + size_t len; + char *copy; - len = strlen(str) + 1; - if((copy = malloc(len)) == NULL) - return (char *)NULL; - memcpy(copy, str, len); - return copy; + len = strlen(str) + 1; + if ((copy = malloc(len)) == NULL) + return (NULL); + memcpy(copy, str, len); + return (copy); } diff --git a/src/xstrdup.c b/src/xstrdup.c index 3390367c..4c17de1e 100644 --- a/src/xstrdup.c +++ b/src/xstrdup.c @@ -1,29 +1,44 @@ -/* $Id: xstrdup.c,v 1.1 2001/06/28 08:50:09 peter Exp $ +/* $Id: xstrdup.c,v 1.2 2001/06/28 22:21:17 peter Exp $ * strdup() implementation for systems that don't have it. * - * Copyright (C) 2001 Peter Johnson + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. * - * This file is part of YASM. + * 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. 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. * - * YASM is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * YASM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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. */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif #ifdef STDC_HEADERS +# include # include # include #else @@ -39,14 +54,15 @@ void memcpy(void *, const void *, size_t); #include "util.h" -char *strdup(const char *str) +char * +strdup(const char *str) { - size_t len; - char *copy; + size_t len; + char *copy; - len = strlen(str) + 1; - if((copy = malloc(len)) == NULL) - return (char *)NULL; - memcpy(copy, str, len); - return copy; + len = strlen(str) + 1; + if ((copy = malloc(len)) == NULL) + return (NULL); + memcpy(copy, str, len); + return (copy); }