BSD 4_3_Tahoe release

[unix-history] / usr / src / bin / make / misc.c

diff --git a/usr/src/bin/make/misc.c b/usr/src/bin/make/misc.c
index e13d8f9..0bf0728 100644 (file)
--- a/usr/src/bin/make/misc.c
+++ b/usr/src/bin/make/misc.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)misc.c      4.3 (Berkeley) 85/08/30";
+static char *sccsid = "@(#)misc.c      4.5 (Berkeley) 87/10/22";

 #include "defs"
 
 FSTATIC struct nameblock *hashtab[HASHSIZE];
 #include "defs"
 
 FSTATIC struct nameblock *hashtab[HASHSIZE];


@@ -212,17 +212,19 @@ if(p->noreset == 0)
 eqsign(a)   /*look for arguments with equal signs but not colons */
 char *a;
 {
 eqsign(a)   /*look for arguments with equal signs but not colons */
 char *a;
 {

-register char *s, *t;
+register char *s, *t, c;

 
 while(*a == ' ') ++a;
 for(s=a  ;   *s!='\0' && *s!=':'  ; ++s)
        if(*s == '=')
                {
                for(t = a ; *t!='=' && *t!=' ' && *t!='\t' ;  ++t );
 
 while(*a == ' ') ++a;
 for(s=a  ;   *s!='\0' && *s!=':'  ; ++s)
        if(*s == '=')
                {
                for(t = a ; *t!='=' && *t!=' ' && *t!='\t' ;  ++t );

+               c = *t;

                *t = '\0';
 
                for(++s; *s==' ' || *s=='\t' ; ++s);
                setvar(a, copys(s));
                *t = '\0';
 
                for(++s; *s==' ' || *s=='\t' ; ++s);
                setvar(a, copys(s));

+               *t = c;

                return(YES);
                }
 
                return(YES);
                }
 


@@ -252,7 +254,7 @@ fatal1(s, t)
 char *s, *t;
 {
 char buf[BUFSIZ];
 char *s, *t;
 {
 char buf[BUFSIZ];

-sprintf(buf, s, t);
+(void)sprintf(buf, s, t);

 fatal(buf);
 }
 
 fatal(buf);
 }
 


@@ -279,7 +281,7 @@ char *s;
 char buf[50];
 extern int yylineno;
 
 char buf[50];
 extern int yylineno;
 

-sprintf(buf, "line %d: %s", yylineno, s);
+(void)sprintf(buf, "line %d: %s", yylineno, s);

 fatal(buf);
 }
 
 fatal(buf);
 }