merge-recursive: don't segfault while handling rename clashes

diff --git a/test-path-utils.c b/test-path-utils.c
index a0bcb0e210523124fa977c8bf46667cf25d0335f..5168a8e3dfd5150de8def87980118e31e81296e7 100644 (file)
--- a/test-path-utils.c
+++ b/test-path-utils.c
@@ -2,11 +2,13 @@
 
 int main(int argc, char **argv)
 {
-       if (argc == 3 && !strcmp(argv[1], "normalize_absolute_path")) {
-               char *buf = xmalloc(strlen(argv[2])+1);
-               int rv = normalize_absolute_path(buf, argv[2]);
-               assert(strlen(buf) == rv);
+       if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
+               char *buf = xmalloc(PATH_MAX + 1);
+               int rv = normalize_path_copy(buf, argv[2]);
+               if (rv)
+                       buf = "++failed++";
                puts(buf);
+               return 0;
        }
 
        if (argc >= 2 && !strcmp(argv[1], "make_absolute_path")) {
@@ -15,12 +17,16 @@ int main(int argc, char **argv)
                        argc--;
                        argv++;
                }
+               return 0;
        }
 
        if (argc == 4 && !strcmp(argv[1], "longest_ancestor_length")) {
                int len = longest_ancestor_length(argv[2], argv[3]);
                printf("%d\n", len);
+               return 0;
        }
 
-       return 0;
+       fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
+               argv[1] ? argv[1] : "(there was none)");
+       return 1;
 }