Get rid of the dependency to GNU diff in the tests

diff --git a/diff-lib.c b/diff-lib.c
index 75ff0dd93d79ea77877151c50ae30580f1f00342..5e6bca5906f0fefbe54e0f91c2869c623019e7a7 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -30,22 +30,28 @@ static int read_directory(const char *path, struct path_list *list)
        return 0;
 }
 
+static int get_mode(const char *path, int *mode)
+{
+       struct stat st;
+
+       if (!path || !strcmp(path, "/dev/null"))
+               *mode = 0;
+       else if (!strcmp(path, "-"))
+               *mode = ntohl(create_ce_mode(0666));
+       else if (stat(path, &st))
+               return error("Could not access '%s'", path);
+       else
+               *mode = st.st_mode;
+       return 0;
+}
+
 static int queue_diff(struct diff_options *o,
                const char *name1, const char *name2)
 {
-       struct stat st;
        int mode1 = 0, mode2 = 0;
 
-       if (name1) {
-               if (stat(name1, &st))
-                       return error("Could not access '%s'", name1);
-               mode1 = st.st_mode;
-       }
-       if (name2) {
-               if (stat(name2, &st))
-                       return error("Could not access '%s'", name2);
-               mode2 = st.st_mode;
-       }
+       if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
+               return -1;
 
        if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
                return error("file/directory conflict: %s, %s", name1, name2);
@@ -224,7 +230,7 @@ int setup_diff_no_index(struct rev_info *revs,
 {
        int i;
        for (i = 1; i < argc; i++)
-               if (argv[i][0] != '-')
+               if (argv[i][0] != '-' || argv[i][1] == '\0')
                        break;
                else if (!strcmp(argv[i], "--")) {
                        i++;
@@ -248,7 +254,25 @@ int setup_diff_no_index(struct rev_info *revs,
                                die("invalid diff option/value: %s", argv[i]);
                        i += j;
                }
-       revs->diffopt.paths = argv + argc - 2;
+
+       if (prefix) {
+               int len = strlen(prefix);
+
+               revs->diffopt.paths = xcalloc(2, sizeof(char*));
+               for (i = 0; i < 2; i++) {
+                       const char *p = argv[argc - 2 + i];
+                       /*
+                        * stdin should be spelled as '-'; if you have
+                        * path that is '-', spell it as ./-.
+                        */
+                       p = (strcmp(p, "-")
+                            ? xstrdup(prefix_filename(prefix, len, p))
+                            : p);
+                       revs->diffopt.paths[i] = p;
+               }
+       }
+       else
+               revs->diffopt.paths = argv + argc - 2;
        revs->diffopt.nr_paths = 2;
        revs->max_count = -2;
        return 0;