Replace stpcpy with grub_stpcpy in tools.

diff --git a/ChangeLog b/ChangeLog
index 70544411f36d389870bea9d4bbe3168a1483e9da..f9d5dca98badd4d5131b6ace7f44e8d901f8fcad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Replace stpcpy with grub_stpcpy in tools.
+
 2013-04-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Handle Japanese special keys.

diff --git a/util/getroot.c b/util/getroot.c
index f65fd1ec5b9126cfedb6eb69c801ffdc65bd5ffb..4ea8e65c9f324feac31c6b900e66a7aaf61532e7 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -667,14 +667,14 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
              char *ptr;
              *relroot = xmalloc (strlen (entries[i].enc_root) +
                                  2 + strlen (dir));
-             ptr = stpcpy (*relroot, entries[i].enc_root);
+             ptr = grub_stpcpy (*relroot, entries[i].enc_root);
              if (strlen (dir) > strlen (entries[i].enc_path))
                {
                  while (ptr > *relroot && *(ptr - 1) == '/')
                    ptr--;
                  if (dir[strlen (entries[i].enc_path)] != '/')
                    *ptr++ = '/';
-                 ptr = stpcpy (ptr, dir + strlen (entries[i].enc_path));
+                 ptr = grub_stpcpy (ptr, dir + strlen (entries[i].enc_path));
                }
              *ptr = 0;
            }

diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 253dee8303eb2b2055e3317f708ebb989be7ad6b..aa2ef7a13d4c84a06d1ed3b60e4f8e58804d9376 100644 (file)
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -289,10 +289,10 @@ cmd_cmp (char *src, char *dest)
                            + strlen (entry->d_name));
          destnew = xmalloc (strlen (dest) + sizeof ("/")
                            + strlen (entry->d_name));
-         ptr = stpcpy (srcnew, src);
+         ptr = grub_stpcpy (srcnew, src);
          *ptr++ = '/';
          strcpy (ptr, entry->d_name);
-         ptr = stpcpy (destnew, dest);
+         ptr = grub_stpcpy (destnew, dest);
          *ptr++ = '/';
          strcpy (ptr, entry->d_name);
 

diff --git a/util/grub-probe.c b/util/grub-probe.c
index b66cbeaa8f0bd251d2e13aa9cd44181c28021ae2..a46f0b18c814b56ab5a31c879dd02e995a2f9e1a 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -499,7 +499,7 @@ probe (const char *path, char **device_names, char delim)
            {
              char *tmp = xmalloc (strlen (ofpath) + sizeof ("ieee1275/"));
              char *p;
-             p = stpcpy (tmp, "ieee1275/");
+             p = grub_stpcpy (tmp, "ieee1275/");
              strcpy (p, ofpath);
              printf ("--hint-ieee1275='");
              print_full_name (tmp, dev);
@@ -616,7 +616,7 @@ probe (const char *path, char **device_names, char delim)
            {
              char *tmp = xmalloc (strlen (ofpath) + sizeof ("ieee1275/"));
              char *p;
-             p = stpcpy (tmp, "ieee1275/");
+             p = grub_stpcpy (tmp, "ieee1275/");
              strcpy (p, ofpath);
              print_full_name (tmp, dev);
              free (tmp);