X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.h;h=bc2400a7d0a8a3475e8bc079fdfde7b5a1164c73;hb=5bc7f527b9e5cd3789419d04e14fd8534ef396d4;hp=4f794ee4840aff2ee4d577fa06e05dcb7b097b30;hpb=92295bc4b2a378893386efd3cf8cf9bc31024b59;p=gnulib.git

diff --git a/lib/dirname.h b/lib/dirname.h
index 4f794ee48..bc2400a7d 100644
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,4 +1,6 @@
-/*  Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+/*  Take file names apart into directory and base names.
+
+    Copyright (C) 1998, 2001, 2003, 2004 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
@@ -17,16 +19,9 @@
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
 
+# include <stdbool.h>
 # include <stddef.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 # ifndef DIRECTORY_SEPARATOR
 #  define DIRECTORY_SEPARATOR '/'
 # endif
@@ -35,15 +30,18 @@
 #  define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
 # endif
 
-# ifndef FILESYSTEM_PREFIX_LEN
-#  define FILESYSTEM_PREFIX_LEN(Filename) 0
+# ifndef FILE_SYSTEM_PREFIX_LEN
+#  define FILE_SYSTEM_PREFIX_LEN(Filename) 0
 # endif
 
-char *base_name PARAMS ((char const *path));
-char *dir_name PARAMS ((char const *path));
-size_t base_len PARAMS ((char const *path));
-size_t dir_len PARAMS ((char const *path));
+# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
+# define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
+
+char *base_name (char const *path);
+char *dir_name (char const *path);
+size_t base_len (char const *path);
+size_t dir_len (char const *path);
 
-int strip_trailing_slashes PARAMS ((char *path));
+bool strip_trailing_slashes (char *path);
 
 #endif /* not DIRNAME_H_ */