[PATCH 3/3] canonicalize-lgpl: Use rname for file name variable (was rpath).

[Jan Nieuwenhuizen]

From: Jan Nieuwenhuizen <address@hidden>

2011-02-25  Jan Nieuwenhuizen  <address@hidden>

        * lib/canonicalize-lgpl.c (__realpath): Rename rpath to rname, as
        per GNU coding standards for file name variables.
---
 ChangeLog               |    5 +++
 lib/canonicalize-lgpl.c |   70 +++++++++++++++++++++++-----------------------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index beef29d..0079764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-25  Jan Nieuwenhuizen  <address@hidden>
 
+       * lib/canonicalize-lgpl.c (__realpath): Rename rpath to rname, as
+       per GNU coding standards for file name variables.
+
+2011-02-25  Jan Nieuwenhuizen  <address@hidden>
+
        * lib/canonicalize-lgpl.c (__realpath)[WINDOWS]: Add an
        implementation for Mingw to pass newly added tests.
 
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index c523bbe..66630b2 100644
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -144,8 +144,8 @@ strlower (char const *str)
 char *
 __realpath (const char *name, char *resolved)
 {
-  char *fname, *rpath, *dest, *extra_buf = NULL, *sname = NULL;
-  const char *start, *end, *rpath_limit;
+  char *fname, *rname, *dest, *extra_buf = NULL, *sname = NULL;
+  const char *start, *end, *rname_limit;
   long int path_max;
   int num_links = 0;
 
@@ -177,8 +177,8 @@ __realpath (const char *name, char *resolved)
 
   if (resolved == NULL)
     {
-      rpath = malloc (path_max);
-      if (rpath == NULL)
+      rname = malloc (path_max);
+      if (rname == NULL)
         {
           /* It's easier to set errno to ENOMEM than to rely on the
              'malloc-posix' gnulib module.  */
@@ -187,10 +187,10 @@ __realpath (const char *name, char *resolved)
         }
     }
   else
-    rpath = resolved;
-  rpath_limit = rpath + path_max;
+    rname = resolved;
+  rname_limit = rname + path_max;
 
-  fname = rpath;
+  fname = rname;
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   {
@@ -221,31 +221,31 @@ __realpath (const char *name, char *resolved)
       if (!cwd_len)
        goto error;
       strlower (slashify (fname));
-      rpath = fname + cwd_len - 1;
+      rname = fname + cwd_len - 1;
     }
     else
       {
        strncpy (fname, name, 3);
        name += 2;
-       rpath = fname + 3;
+       rname = fname + 3;
       }
   if (1)
-    dest = rpath + 1;
+    dest = rname + 1;
   else
 #endif /* (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ */
   if (name[0] != '/')
     {
-      if (!__getcwd (rpath, path_max))
+      if (!__getcwd (rname, path_max))
         {
-          rpath[0] = '\0';
+          rname[0] = '\0';
           goto error;
         }
-      dest = strchr (rpath, '\0');
+      dest = strchr (rname, '\0');
     }
   else
     {
-      rpath[0] = '/';
-      dest = rpath + 1;
+      rname[0] = '/';
+      dest = rname + 1;
       if (DOUBLE_SLASH_IS_DISTINCT_ROOT && name[1] == '/')
         *dest++ = '/';
     }
@@ -274,9 +274,9 @@ __realpath (const char *name, char *resolved)
       else if (end - start == 2 && start[0] == '.' && start[1] == '.')
         {
           /* Back up to previous component, ignore if at root already.  */
-          if (dest > rpath + 1)
+          if (dest > rname + 1)
             while ((--dest)[-1] != '/');
-          if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
+          if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1
               && *dest == '/')
             dest++;
         }
@@ -287,36 +287,36 @@ __realpath (const char *name, char *resolved)
           if (dest[-1] != '/')
             *dest++ = '/';
 
-          if (dest + (end - start) >= rpath_limit)
+          if (dest + (end - start) >= rname_limit)
             {
-              ptrdiff_t dest_offset = dest - rpath;
-              char *new_rpath;
+              ptrdiff_t dest_offset = dest - rname;
+              char *new_rname;
 
               if (resolved)
                 {
                   __set_errno (ENAMETOOLONG);
-                  if (dest > rpath + 1)
+                  if (dest > rname + 1)
                     dest--;
                   *dest = '\0';
                   goto error;
                 }
-              new_size = rpath_limit - rpath;
+              new_size = rname_limit - rname;
               if (end - start + 1 > path_max)
                 new_size += end - start + 1;
               else
                 new_size += path_max;
-              new_rpath = (char *) realloc (rpath, new_size);
-              if (new_rpath == NULL)
+              new_rname = (char *) realloc (rname, new_size);
+              if (new_rname == NULL)
                 {
                   /* It's easier to set errno to ENOMEM than to rely on the
                      'realloc-posix' gnulib module.  */
                   errno = ENOMEM;
                   goto error;
                 }
-              rpath = new_rpath;
-              rpath_limit = rpath + new_size;
+              rname = new_rname;
+              rname_limit = rname + new_size;
 
-              dest = rpath + dest_offset;
+              dest = rname + dest_offset;
             }
 
 #ifdef _LIBC
@@ -328,7 +328,7 @@ __realpath (const char *name, char *resolved)
           *dest = '\0';
 
 #ifdef _LIBC
-          if (__lxstat64 (_STAT_VER, rpath, &st) < 0)
+          if (__lxstat64 (_STAT_VER, rname, &st) < 0)
 #else
           if (lstat (fname, &st) < 0)
 #endif
@@ -352,7 +352,7 @@ __realpath (const char *name, char *resolved)
                   goto error;
                 }
 
-              n = __readlink (rpath, buf, path_max - 1);
+              n = __readlink (rname, buf, path_max - 1);
               if (n < 0)
                 {
                   int saved_errno = errno;
@@ -387,7 +387,7 @@ __realpath (const char *name, char *resolved)
 
               if (buf[0] == '/')
                 {
-                  dest = rpath + 1;     /* It's an absolute symlink */
+                  dest = rname + 1;     /* It's an absolute symlink */
                   if (DOUBLE_SLASH_IS_DISTINCT_ROOT && buf[1] == '/')
                     *dest++ = '/';
                 }
@@ -395,9 +395,9 @@ __realpath (const char *name, char *resolved)
                 {
                   /* Back up to previous component, ignore if at root
                      already: */
-                  if (dest > rpath + 1)
+                  if (dest > rname + 1)
                     while ((--dest)[-1] != '/');
-                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
+                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1
                       && *dest == '/')
                     dest++;
                 }
@@ -409,9 +409,9 @@ __realpath (const char *name, char *resolved)
             }
         }
     }
-  if (dest > rpath + 1 && dest[-1] == '/')
+  if (dest > rname + 1 && dest[-1] == '/')
     --dest;
-  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && *dest == '/')
+  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 && *dest == '/')
     dest++;
   *dest = '\0';
 
@@ -431,7 +431,7 @@ error:
     if (extra_buf)
       freea (extra_buf);
     if (resolved == NULL)
-      free (rpath);
+      free (rname);
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
     if (sname != NULL)
       free (sname);
-- 
1.7.1

-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl