CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:    src
Committed By:   sjg
Date:           Sun Mar  6 17:41:11 UTC 2011

Modified Files:
        src/usr.bin/make: meta.c

Log Message:
Only need to getcwd() once


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/meta.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.10 src/usr.bin/make/meta.c:1.11
--- src/usr.bin/make/meta.c:1.10	Sun Mar  6 04:34:25 2011
+++ src/usr.bin/make/meta.c	Sun Mar  6 17:41:11 2011
@@ -763,15 +763,15 @@
 meta_oodate(GNode *gn, Boolean oodate)
 {
     static char *tmpdir = NULL;
+    static char cwd[MAXPATHLEN];
     char ldir_vname[64];
-    char cwd[MAXPATHLEN];
     char latestdir[MAXPATHLEN];
     char fname[MAXPATHLEN];
     char fname1[MAXPATHLEN];
     char fname2[MAXPATHLEN];
     char *p;
     char *cp;
-    size_t cwdlen;
+    static size_t cwdlen = 0;
     static size_t tmplen = 0;
     FILE *fp;
     Boolean ignoreOODATE = FALSE;
@@ -787,9 +787,6 @@
      */
     Make_DoAllVar(gn);
 
-    if (getcwd(cwd, sizeof(cwd)) == NULL)
-	err(1, "Could not get current working directory");
-
     meta_name(gn, fname, sizeof(fname), NULL, NULL);
 
 #ifdef DEBUG_META_MODE
@@ -813,6 +810,12 @@
 	    buf = bmake_malloc(bufsz);
 	}
 
+	if (!cwdlen) {
+	    if (getcwd(cwd, sizeof(cwd)) == NULL)
+		err(1, "Could not get current working directory");
+	    cwdlen = strlen(cwd);
+	}
+
 	if (!tmpdir) {
 	    tmpdir = getTmpdir();
 	    tmplen = strlen(tmpdir);
@@ -821,8 +824,6 @@
 	/* we want to track all the .meta we read */
 	Var_Append(".MAKE.META.FILES", fname, VAR_GLOBAL);
 
-	cwdlen = strlen(cwd);
-
 	ln = Lst_First(gn->commands);
 	while (!oodate && (x = fgetLine(&buf, &bufsz, 0, fp)) > 0) {
 	    lineno++;
@@ -1091,7 +1092,7 @@
 		    ln = Lst_Succ(ln);
 		}
 	    } else if (strcmp(buf, "CWD") == 0) {
-		    if (strcmp(p, cwd) != 0) {
+		if (strcmp(p, cwd) != 0) {
 		    if (DEBUG(META))
 			fprintf(debug_file, "%s: %d: the current working directory has changed from '%s' to '%s'\n", fname, lineno, p, curdir);
 		    oodate = TRUE;