X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=483c33867258303cf196dd2f789e9bc09b0a5ca1;hb=0d2b1a83b47982e7b32e0c0e2f16ce1125372892;hp=3481131b0d85428daa64407bc15959532a0e14cf;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git diff --git a/lib/dirname.c b/lib/dirname.c index 3481131b0..483c33867 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,5 +1,5 @@ /* dirname.c -- return all but the last element in a path - Copyright (C) 1990 Free Software Foundation, Inc. + Copyright (C) 1990, 1998 Free Software Foundation, Inc. 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 @@ -15,32 +15,33 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include +#if HAVE_CONFIG_H +# include #endif #ifdef STDC_HEADERS -#include +# include #else char *malloc (); #endif -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -#include +#if defined STDC_HEADERS || defined HAVE_STRING_H +# include #else -#include -#ifndef strrchr -#define strrchr rindex -#endif +# include +# ifndef strrchr +# define strrchr rindex +# endif #endif +#include "dirname.h" + /* Return the leading directories part of PATH, allocated with malloc. If out of memory, return 0. Assumes that trailing slashes have already been removed. */ char * -dirname (path) - char *path; +dir_name (const char *path) { char *newpath; char *slash;