projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated
[gnulib.git]
/
lib
/
dirname.c
diff --git
a/lib/dirname.c
b/lib/dirname.c
index
131af8b
..
7671a0d
100644
(file)
--- a/
lib/dirname.c
+++ b/
lib/dirname.c
@@
-1,5
+1,7
@@
/* dirname.c -- return all but the last element in a path
/* dirname.c -- return all but the last element in a path
- Copyright 1990, 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1998, 2000, 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
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,11
+21,9
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#endif
-
#include "dirname.h"
#include "dirname.h"
+
+#include <string.h>
#include "xalloc.h"
/* Return the length of `dirname (PATH)', or zero if PATH is
#include "xalloc.h"
/* Return the length of `dirname (PATH)', or zero if PATH is
@@
-32,7
+32,7
@@
size_t
dir_len (char const *path)
{
size_t
dir_len (char const *path)
{
- size_t prefix_length = FILESYSTEM_PREFIX_LEN (path);
+ size_t prefix_length = FILE
_
SYSTEM_PREFIX_LEN (path);
size_t length;
/* Strip the basename and any redundant slashes before it. */
size_t length;
/* Strip the basename and any redundant slashes before it. */
@@
-53,7
+53,7
@@
char *
dir_name (char const *path)
{
size_t length = dir_len (path);
dir_name (char const *path)
{
size_t length = dir_len (path);
-
int append_dot = (length == FILE
SYSTEM_PREFIX_LEN (path));
+
bool append_dot = (length == FILE_
SYSTEM_PREFIX_LEN (path));
char *newpath = xmalloc (length + append_dot + 1);
memcpy (newpath, path, length);
if (append_dot)
char *newpath = xmalloc (length + append_dot + 1);
memcpy (newpath, path, length);
if (append_dot)