X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.h;h=4ad0312008c1ae5d666a814d4b74b32740ab7cae;hb=e7086a9a301ffcfef17edbcba9e7c0312c33f7a8;hp=fc4669960cc57416876108f3c269ecac595f1e1f;hpb=917d21617e2744ca73d91cc48dd0342e9e7d3ef5;p=gnulib.git

diff --git a/lib/dirname.h b/lib/dirname.h
index fc4669960..4ad031200 100644
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,9 +1,12 @@
-/*  Copyright (C) 1998 Free Software Foundation, Inc.
+/*  Take file names apart into directory and base names.
 
-    This program is free software; you can redistribute it and/or modify
+    Copyright (C) 1998, 2001, 2003-2006, 2009-2013 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
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
+    the Free Software Foundation; either version 3 of the License, 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
@@ -11,21 +14,33 @@
     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.  */
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
+# include <stdbool.h>
+# include <stddef.h>
+# include "dosname.h"
+
+# ifndef DIRECTORY_SEPARATOR
+#  define DIRECTORY_SEPARATOR '/'
+# endif
+
+# ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
+#  define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
 # endif
 
-char *
-dir_name PARAMS ((const char *path));
+# if GNULIB_DIRNAME
+char *base_name (char const *file);
+char *dir_name (char const *file);
+# endif
+
+char *mdir_name (char const *file);
+size_t base_len (char const *file) _GL_ATTRIBUTE_PURE;
+size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE;
+char *last_component (char const *file) _GL_ATTRIBUTE_PURE;
+
+bool strip_trailing_slashes (char *file);
 
 #endif /* not DIRNAME_H_ */