Mercurial > hg > octave-lojdl > gnulib-hg
changeset 335:49f195cd5b0e
merge with 3.9p
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Thu, 20 Oct 1994 16:16:54 +0000 |
| parents | 0f8efd187be0 |
| children | 6bd3c2692fcb |
| files | lib/Makefile.in lib/dirname.c lib/fnmatch.c lib/rename.c lib/savedir.c |
| diffstat | 5 files changed, 21 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -23,7 +23,7 @@ CC = @CC@ AR = ar RANLIB = @RANLIB@ -DEFS = -Dlint @DEFS@ +DEFS = @DEFS@ CFLAGS = @CFLAGS@ YACC = @YACC@
--- a/lib/dirname.c +++ b/lib/dirname.c @@ -26,11 +26,11 @@ #endif #if defined(STDC_HEADERS) || defined(HAVE_STRING_H) #include <string.h> -#ifndef rindex -#define rindex strrchr -#endif #else #include <strings.h> +#ifndef strrchr +#define strrchr rindex +#endif #endif /* Return the leading directories part of PATH, @@ -46,7 +46,7 @@ char *slash; int length; /* Length of result, not including NUL. */ - slash = rindex (path, '/'); + slash = strrchr (path, '/'); if (slash == 0) { /* File is in the current directory. */ @@ -61,7 +61,7 @@ length = slash - path + 1; } - newpath = malloc (length + 1); + newpath = (char *) malloc (length + 1); if (newpath == 0) return 0; strncpy (newpath, path, length);
--- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,19 +1,21 @@ /* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@prep.ai.mit.edu. -This library is distributed in the hope that it will be useful, +This program 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, or (at your option) any +later version. + +This program 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 -Library General Public License for more details. +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 Library General Public -License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H #include <config.h>