[PATCH] getdomainname should be usable on SunOS with -lnsl

diff --git a/diff-tree.c b/diff-tree.c
index 60ad2b5b6cd94b9026882ff6e353a846f02c7851..e8f5d1b126179c705f6463c25216d90e3e376848 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -9,7 +9,8 @@ static int ignore_merges = 1;
 static int recursive = 0;
 static int show_tree_entry_in_recursive = 0;
 static int read_stdin = 0;
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 static int detect_rename = 0;
 static int find_copies_harder = 0;
 static int diff_setup_opt = 0;
@@ -276,14 +277,14 @@ static int call_diff_flush(void)
                     orderfile,
                     diff_filter);
        if (diff_queue_is_empty()) {
-               diff_flush(DIFF_FORMAT_NO_OUTPUT);
+               diff_flush(DIFF_FORMAT_NO_OUTPUT, diff_line_termination);
                return 0;
        }
        if (header) {
-               printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n');
+               printf("%s%c", header, diff_line_termination);
                header = NULL;
        }
-       diff_flush(diff_output_format);
+       diff_flush(diff_output_format, diff_line_termination);
        return 1;
 }
 
@@ -369,6 +370,7 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
                }
                offset += 48;
        }
+       free(buf);
        return 0;
 }
 
@@ -394,14 +396,25 @@ static int diff_tree_stdin(char *line)
        return diff_tree_commit(commit, line);
 }
 
-static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-R] [-B] [-M] [-C] [--find-copies-header] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> <tree-ish>";
+static int count_paths(const char **paths)
+{
+       int i = 0;
+       while (*paths++)
+               i++;
+       return i;
+}
+
+static const char diff_tree_usage[] =
+"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
+"[<common diff options>] <tree-ish> <tree-ish>"
+COMMON_DIFF_OPTIONS_HELP;
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        int nr_sha1;
        char line[1000];
        unsigned char sha1[2][20];
+       const char *prefix = setup_git_directory();
 
        nr_sha1 = 0;
        for (;;) {
@@ -438,7 +451,7 @@ int main(int argc, const char **argv)
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
                }
-               if (!strcmp(arg, "-p")) {
+               if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
                        diff_output_format = DIFF_FORMAT_PATCH;
                        recursive = 1;
                        continue;
@@ -480,8 +493,12 @@ int main(int argc, const char **argv)
                        find_copies_harder = 1;
                        continue;
                }
+               if (!strcmp(arg, "--name-only")) {
+                       diff_output_format = DIFF_FORMAT_NAME;
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
-                       diff_output_format = DIFF_FORMAT_MACHINE;
+                       diff_line_termination = 0;
                        continue;
                }
                if (!strcmp(arg, "-m")) {
@@ -516,11 +533,11 @@ int main(int argc, const char **argv)
        if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
                usage(diff_tree_usage);
 
-       if (argc > 0) {
+       paths = get_pathspec(prefix, argv);
+       if (paths) {
                int i;
 
-               paths = argv;
-               nr_paths = argc;
+               nr_paths = count_paths(paths);
                pathlens = xmalloc(nr_paths * sizeof(int));
                for (i=0; i<nr_paths; i++)
                        pathlens[i] = strlen(paths[i]);