summaryrefslogtreecommitdiffstats
path: root/gl/dirname.h
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2013-08-19 21:27:12 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2013-08-19 21:27:12 (GMT)
commit26fbe7f1e68bb0c96da32491efcf3696fe6c299b (patch)
treec4d95289187a64e9c7517bf73d8208026c3d2fb3 /gl/dirname.h
parent5f79e3e9f62ca5487d9881973149136ba1d19d3e (diff)
downloadmonitoring-plugins-26fbe7f1e68bb0c96da32491efcf3696fe6c299b.tar.gz
Sync with the latest Gnulib code (6f2d632)
Diffstat (limited to 'gl/dirname.h')
-rw-r--r--gl/dirname.h38
1 files changed, 5 insertions, 33 deletions
diff --git a/gl/dirname.h b/gl/dirname.h
index fb19508..4ad0312 100644
--- a/gl/dirname.h
+++ b/gl/dirname.h
@@ -1,6 +1,6 @@
1/* Take file names apart into directory and base names. 1/* Take file names apart into directory and base names.
2 2
3 Copyright (C) 1998, 2001, 2003-2006, 2009-2010 Free Software Foundation, 3 Copyright (C) 1998, 2001, 2003-2006, 2009-2013 Free Software Foundation,
4 Inc. 4 Inc.
5 5
6 This program is free software: you can redistribute it and/or modify 6 This program is free software: you can redistribute it and/or modify
@@ -21,53 +21,25 @@
21 21
22# include <stdbool.h> 22# include <stdbool.h>
23# include <stddef.h> 23# include <stddef.h>
24# include "dosname.h"
24 25
25# ifndef DIRECTORY_SEPARATOR 26# ifndef DIRECTORY_SEPARATOR
26# define DIRECTORY_SEPARATOR '/' 27# define DIRECTORY_SEPARATOR '/'
27# endif 28# endif
28 29
29# ifndef ISSLASH
30# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
31# endif
32
33# ifndef FILE_SYSTEM_PREFIX_LEN
34# if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
35 /* This internal macro assumes ASCII, but all hosts that support drive
36 letters use ASCII. */
37# define _IS_DRIVE_LETTER(c) (((unsigned int) (c) | ('a' - 'A')) - 'a' \
38 <= 'z' - 'a')
39# define FILE_SYSTEM_PREFIX_LEN(Filename) \
40 (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
41# else
42# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
43# endif
44# endif
45
46# ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
47# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
48# endif
49
50# ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT 30# ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
51# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 31# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
52# endif 32# endif
53 33
54# if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
55# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
56# else
57# define IS_ABSOLUTE_FILE_NAME(F) \
58 (ISSLASH ((F)[0]) || 0 < FILE_SYSTEM_PREFIX_LEN (F))
59# endif
60# define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
61
62# if GNULIB_DIRNAME 34# if GNULIB_DIRNAME
63char *base_name (char const *file); 35char *base_name (char const *file);
64char *dir_name (char const *file); 36char *dir_name (char const *file);
65# endif 37# endif
66 38
67char *mdir_name (char const *file); 39char *mdir_name (char const *file);
68size_t base_len (char const *file); 40size_t base_len (char const *file) _GL_ATTRIBUTE_PURE;
69size_t dir_len (char const *file); 41size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE;
70char *last_component (char const *file); 42char *last_component (char const *file) _GL_ATTRIBUTE_PURE;
71 43
72bool strip_trailing_slashes (char *file); 44bool strip_trailing_slashes (char *file);
73 45