(FILE_SYSTEM_PREFIX_LEN): Renamed from

FILESYSTEM_PREFIX_LEN.  All uses changed.

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 7ea76b49e7853516b2938b0fa0170eb4f590f7e1..34d83357f83905e302ca4586e2588b3434d6bd97 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -1,7 +1,7 @@
 /* backupfile.c -- make Emacs style backup file names
 
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 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
@@ -124,7 +124,7 @@ find_backup_file_name (const char *file, enum backup_type backup_type)
          size_t dirlen = dir_len (file);
 
          memcpy (s, file, dirlen);
-         if (dirlen == FILESYSTEM_PREFIX_LEN (file))
+         if (dirlen == FILE_SYSTEM_PREFIX_LEN (file))
            s[dirlen++] = '.';
          s[dirlen] = '\0';
          highest_backup = max_backup_version (base_name (file), s);

diff --git a/lib/basename.c b/lib/basename.c
index 5ff29893305b01f8d59ab2a63c14440c6309a3cc..adb9f02ff00849b1597ca684b2ec97ec3a5cc96a 100644 (file)
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,7 +1,7 @@
 /* basename.c -- return the last element in a path
 
-   Copyright (C) 1990, 1998, 1999, 2000, 2001, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 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
@@ -35,7 +35,7 @@
 char *
 base_name (char const *name)
 {
-  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
+  char const *base = name + FILE_SYSTEM_PREFIX_LEN (name);
   char const *p;
 
   for (p = base; *p; p++)

diff --git a/lib/dirname.c b/lib/dirname.c
index 815192a66f43c7d67b2ffeae93f910141cdd4438..aff6bf05bca44edcabb11f7e2deb7fa0ad9c3986 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
-   Copyright (C) 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
@@ -30,7 +32,7 @@
 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.  */
@@ -51,7 +53,7 @@ char *
 dir_name (char const *path)
 {
   size_t length = dir_len (path);
-  int append_dot = (length == FILESYSTEM_PREFIX_LEN (path));
+  int append_dot = (length == FILE_SYSTEM_PREFIX_LEN (path));
   char *newpath = xmalloc (length + append_dot + 1);
   memcpy (newpath, path, length);
   if (append_dot)