Work around circular library issue when cross-compiling.

* lib/progname.c (set_program_name): Use strncmp, not memcmp, so
that progname.o does not need to pull in rpl_memcmp.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 280c7ca098bc83fbfaf8512c59ed285d2bdc1f72..7aacc8e41e5d69767bbdfce202e08d57e65817ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-20  Eric Blake  <ebb9@byu.net>
+
+       Work around circular library issue when cross-compiling.
+       * lib/progname.c (set_program_name): Use strncmp, not memcmp, so
+       that progname.o does not need to pull in rpl_memcmp.
+
 2007-12-19  Eric Blake  <ebb9@byu.net>
 
        Fix memmem to avoid O(n^2) worst-case complexity.

diff --git a/lib/progname.c b/lib/progname.c
index fa5aa8bec7f1abdf6fdec262c8c5065154c32aa8..47d08c65d5732517db1bf4315125d1a13d44b178 100644 (file)
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@ set_program_name (const char *argv0)
 
   slash = strrchr (argv0, '/');
   base = (slash != NULL ? slash + 1 : argv0);
-  if (base - argv0 >= 7 && memcmp (base - 7, "/.libs/", 7) == 0)
+  if (base - argv0 >= 7 && strncmp (base - 7, "/.libs/", 7) == 0)
     argv0 = base;
   if (strncmp (base, "lt-", 3) == 0)
     argv0 = base + 3;