[BACK]Return to parse.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/parse.c between version 1.3 and 1.4

version 1.3, 1995/12/17 13:42:02 version 1.4, 1996/02/22 22:24:51
Line 1 
Line 1 
 /*      $NetBSD: parse.c,v 1.18 1995/12/16 05:03:13 christos Exp $      */  /*      $NetBSD: parse.c,v 1.19 1996/02/07 23:04:04 thorpej Exp $       */
   
 /*  /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.   * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
Line 42 
Line 42 
 #if 0  #if 0
 static char sccsid[] = "@(#)parse.c     5.18 (Berkeley) 2/19/91";  static char sccsid[] = "@(#)parse.c     5.18 (Berkeley) 2/19/91";
 #else  #else
 static char rcsid[] = "$NetBSD: parse.c,v 1.18 1995/12/16 05:03:13 christos Exp $";  static char rcsid[] = "$NetBSD: parse.c,v 1.19 1996/02/07 23:04:04 thorpej Exp $";
 #endif  #endif
 #endif /* not lint */  #endif /* not lint */
   
Line 1728 
Line 1728 
          * leading path components and call Dir_FindFile to see if           * leading path components and call Dir_FindFile to see if
          * we can locate the beast.           * we can locate the beast.
          */           */
         char      *prefEnd;          char      *prefEnd, *Fname;
   
         prefEnd = strrchr (fname, '/');          /* Make a temporary copy of this, to be safe. */
           Fname = strdup(fname);
   
           prefEnd = strrchr (Fname, '/');
         if (prefEnd != (char *)NULL) {          if (prefEnd != (char *)NULL) {
             char        *newName;              char        *newName;
   
Line 1738 
Line 1741 
             if (file[0] == '/')              if (file[0] == '/')
                 newName = strdup(file);                  newName = strdup(file);
             else              else
                 newName = str_concat (fname, file, STR_ADDSLASH);                  newName = str_concat (Fname, file, STR_ADDSLASH);
             fullname = Dir_FindFile (newName, parseIncPath);              fullname = Dir_FindFile (newName, parseIncPath);
             if (fullname == (char *)NULL) {              if (fullname == (char *)NULL) {
                 fullname = Dir_FindFile(newName, dirSearchPath);                  fullname = Dir_FindFile(newName, dirSearchPath);
Line 1748 
Line 1751 
         } else {          } else {
             fullname = (char *)NULL;              fullname = (char *)NULL;
         }          }
           free (Fname);
     } else {      } else {
         fullname = (char *)NULL;          fullname = (char *)NULL;
     }      }
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4