]> thyrsus.com Git - comparator.git/commitdiff
Fix bug in returning to main directory.
authorEric S. Raymond <esr@thyrsus.com>
Tue, 19 Oct 2010 08:05:15 +0000 (04:05 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Tue, 19 Oct 2010 08:05:15 +0000 (04:05 -0400)
main.c

diff --git a/main.c b/main.c
index d1bb91f8dd863ae10611c4e4d848458cf3648a2b..49e8412abee1b79a51d4675cbb9cd28063f3a006 100644 (file)
--- 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);
                }
            }