From e5573b1bad88bfabcda181b9e0125fb0c52b7d3b Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 20 Dec 2007 13:15:27 -0700 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ lib/progname.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 280c7ca09..7aacc8e41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-20 Eric Blake + + 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 Fix memmem to avoid O(n^2) worst-case complexity. diff --git a/lib/progname.c b/lib/progname.c index fa5aa8bec..47d08c65d 100644 --- 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 , 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; -- 2.11.0