(deduce_name): Fix typos introduced when program_name was renamed to prog_name.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e3bea6d848d6a771570868c9459b737e23ef93f3..500124d7799ccadb73b2832d0bfcf91f4f440bf8 100644 (file)
--- 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
 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 4b53511e66e47ba9d16489a87d8fc66ca181ae57..577772f1cdfbeffa05c919b613e361d9e32dee75 100644 (file)
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -253,7 +253,7 @@ deduce_name (const char * name)
 
   dash = NULL;
   slash = NULL;
 
   dash = NULL;
   slash = NULL;

-  for (cp = name; *cp != '\0'; ++cp)
+  for (cp = prog_name; *cp != '\0'; ++cp)

     {
       if (*cp == '-')
        dash = cp;
     {
       if (*cp == '-')
        dash = cp;


@@ -272,17 +272,17 @@ deduce_name (const char * name)
   cmd = NULL;
 
   if (dash != NULL)
   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)
 
   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.  */
        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)
 
   if (cmd == NULL)

-    /* Just return PROG_NAME as is.  */
+    /* Just return NAME as is.  */

     cmd = xstrdup (name);
 
   return cmd;
     cmd = xstrdup (name);
 
   return cmd;