X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=064e40d869d6703da46270ce16e67a95488d3895;hb=747a69435d9f83c0968d9689c4951bc0233ffc5e;hp=4590ba8c34de081fdd909d381c4a3d2d0b106548;hpb=655f0a840a92b10960ee942884548a4ef8f397d6;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 4590ba8c..064e40d8 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -241,21 +241,20 @@ int main(int argc, char *argv[])
 {
 	int c;
 	bool summary = false;
-	unsigned int score, total_score;
+	unsigned int score = 0, total_score = 0;
 	struct manifest *m;
 	struct ccanlint *i;
-	const char *prefix = "";
+	const char *prefix = "", *dir = ".";
 
 	/* I'd love to use long options, but that's not standard. */
 	/* FIXME: getopt_long ccan package? */
 	while ((c = getopt(argc, argv, "sd:vn")) != -1) {
 		switch (c) {
 		case 'd':
+			dir = optarg;
 			prefix = talloc_append_string(talloc_basename(NULL,
 								      optarg),
 						      ": ");
-			if (chdir(optarg) != 0)
-				err(1, "Changing into directory '%s'", optarg);
 			break;
 		case 's':
 			summary = true;
@@ -274,7 +273,7 @@ int main(int argc, char *argv[])
 	if (optind < argc)
 		usage(argv[0]);
 
-	m = get_manifest(talloc_autofree_context());
+	m = get_manifest(talloc_autofree_context(), dir);
 
 	init_tests();
 
@@ -290,7 +289,6 @@ int main(int argc, char *argv[])
 
 	if (verbose)
 		printf("\nNormal tests:\n");
-	score = total_score = 0;
 	while ((i = get_next_test(&normal_tests)) != NULL)
 		run_test(i, summary, &score, &total_score, m);