Include <stdbool.h>.

(FILE_SYSTEM_PREFIX_LEN): Renamed from FILESYSTEM_PREFIX_LEN,
for consistency with POSIX terminology.  All uses changed.
(IS_ABSOLUTE_FILE_NAME, IS_RELATIVE_FILE_NAME): New macros.
(strip_trailing_slashes): Use bool for booleans.

diff --git a/lib/dirname.h b/lib/dirname.h
index 62da37d..bc2400a 100644 (file)
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,6 +1,6 @@
 /*  Take file names apart into directory and base names.
 
-    Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
+    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
@@ -19,6 +19,7 @@
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
 
+# include <stdbool.h>
 # include <stddef.h>
 
 # ifndef DIRECTORY_SEPARATOR
@@ -29,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
 
+# 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 (char *path);
+bool strip_trailing_slashes (char *path);
 
 #endif /* not DIRNAME_H_ */