aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/dllwrap.c14
2 files changed, 12 insertions, 7 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e3bea6d..500124d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-02 Jakub Bogusz <qboosh@pld-linux.org>
+
+ * dllwrap.c (deduce_name): Fix typos introduced when program_name
+ was renamed to prog_name.
+
2004-07-29 Alexandre Oliva <aoliva@redhat.com>
* readelf.c (get_machine_flags <EM_SH>): Handle EF_SH2A and
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index 4b53511..577772f 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -253,7 +253,7 @@ deduce_name (const char * name)
dash = NULL;
slash = NULL;
- for (cp = name; *cp != '\0'; ++cp)
+ for (cp = prog_name; *cp != '\0'; ++cp)
{
if (*cp == '-')
dash = cp;
@@ -272,17 +272,17 @@ deduce_name (const char * name)
cmd = NULL;
if (dash != NULL)
- /* First, try looking for a prefixed PROG_NAME in the
- PROGRAM_NAME directory, with the same prefix as PROGRAM_NAME. */
- cmd = look_for_prog (name, name, dash - name + 1);
+ /* First, try looking for a prefixed NAME in the
+ PROG_NAME directory, with the same prefix as PROG_NAME. */
+ cmd = look_for_prog (name, prog_name, dash - prog_name + 1);
if (slash != NULL && cmd == NULL)
- /* Next, try looking for a PROG_NAME in the same directory as
+ /* Next, try looking for a NAME in the same directory as
that of this program. */
- cmd = look_for_prog (name, name, slash - name + 1);
+ cmd = look_for_prog (name, prog_name, slash - prog_name + 1);
if (cmd == NULL)
- /* Just return PROG_NAME as is. */
+ /* Just return NAME as is. */
cmd = xstrdup (name);
return cmd;