From: Roland McGrath <roland@redhat.com>
Date: Thu, 9 May 1996 18:28:15 +0000 (+0000)
Subject: Thu May  9 13:54:49 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
X-Git-Tag: amigados-merge~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e38c11f3c34db4b5ab12a1aea6d19c105fb904a;p=thirdparty%2Fmake.git

Thu May  9 13:54:49 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* function.c (expand_function) [_AMIGA]: Fix some typos.
	(patsubst_expand): Make len vars unsigned.
---

diff --git a/function.c b/function.c
index 97948722..616b8f2a 100644
--- a/function.c
+++ b/function.c
@@ -114,9 +114,9 @@ patsubst_expand (o, text, pattern, replace, pattern_percent, replace_percent)
      register char *pattern, *replace;
      register char *pattern_percent, *replace_percent;
 {
-  register int pattern_prepercent_len, pattern_postpercent_len;
-  register int replace_prepercent_len, replace_postpercent_len;
-  register char *t;
+  unsigned int pattern_prepercent_len, pattern_postpercent_len;
+  unsigned int replace_prepercent_len, replace_postpercent_len;
+  char *t;
   unsigned int len;
   int doneany = 0;
 
@@ -579,7 +579,7 @@ expand_function (o, function, text, end)
 	   for (aptr=argv; *aptr; aptr++)
 	     {
 	       strcpy (ptr, *aptr);
-	       len += strlen (ptr) + 1;
+	       ptr += strlen (ptr) + 1;
 	       *ptr ++ = ' ';
 	       *ptr = 0;
 	     }
@@ -603,7 +603,7 @@ expand_function (o, function, text, end)
 		   buffer = (char *) xrealloc (buffer, maxlen + 1);
 		 }
 
-	       cc = read (child_stdout, &buffer[i], maxlen - i);
+	       cc = Read (child_stdout, &buffer[i], maxlen - i);
 	       if (cc > 0)
 		 i += cc;
 	     } while (cc > 0);