From 9f4125ec390c87552a29c16706beef452fb7de7e Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Tue, 19 Oct 2010 04:05:15 -0400 Subject: [PATCH] Fix bug in returning to main directory. --- main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index d1bb91f..49e8412 100644 --- a/main.c +++ b/main.c @@ -530,7 +530,7 @@ main(int argc, char *argv[]) { if (chdir(dir) != 0) { - fprintf(stderr, "comparator: cd failed!\n"); + fprintf(stderr, "comparator: single-tree cd %s failed!\n", dir); exit(1); } } @@ -569,15 +569,15 @@ main(int argc, char *argv[]) olddir = getcwd(NULL, PATH_MAX); if (chdir(dir) != 0) { - fprintf(stderr, "comparator: cd failed!\n"); + fprintf(stderr, "comparator: descent cd %s failed!\n", dir); exit(1); } } write_scf(source, ofp); if (dir) { - if (chdir(dir) != 0) + if (chdir(olddir) != 0) { - fprintf(stderr, "comparator: cd failed!\n"); + fprintf(stderr, "comparator: return cd %s failed!\n", dir); exit(1); } } @@ -590,7 +590,7 @@ main(int argc, char *argv[]) olddir = getcwd(NULL, PATH_MAX); if (chdir(dir) != 0) { - fprintf(stderr, "comparator: cd failed!\n"); + fprintf(stderr, "comparator: descent cd %s failed!\n", dir); exit(1); } } @@ -598,9 +598,9 @@ main(int argc, char *argv[]) scf->totallines = merge_tree(source); if (dir) { - if (chdir(dir) != 0) + if (chdir(olddir) != 0) { - fprintf(stderr, "comparator: cd failed!\n"); + fprintf(stderr, "comparator: return cd %s failed!\n", dir); exit(1); } } -- 2.43.0