|
diff --git a/html.c b/html.c index 33a956f..76fa6c4 100644 --- a/ html.c+++ b/ html.c |
|
@@ -155,13 +155,13 @@ void html_fileperm(unsigned short mode) |
155 | void html_filemode(unsigned short mode) |
155 | void html_filemode(unsigned short mode) |
156 | { |
156 | { |
157 | if (S_ISDIR(mode)) |
157 | if (S_ISDIR(mode)) |
158 | html("d"); |
158 | html("d"); |
159 | else if (S_ISLNK(mode)) |
159 | else if (S_ISLNK(mode)) |
160 | html("l"); |
160 | html("l"); |
161 | else if (S_ISDIRLNK(mode)) |
161 | else if (S_ISGITLINK(mode)) |
162 | html("m"); |
162 | html("m"); |
163 | else |
163 | else |
164 | html("-"); |
164 | html("-"); |
165 | html_fileperm(mode >> 6); |
165 | html_fileperm(mode >> 6); |
166 | html_fileperm(mode >> 3); |
166 | html_fileperm(mode >> 3); |
167 | html_fileperm(mode); |
167 | html_fileperm(mode); |
|
|
diff --git a/ui-diff.c b/ui-diff.c index a76a234..0be845f 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -34,13 +34,13 @@ static void print_line(char *line, int len) |
34 | static void header(unsigned char *sha1, char *path1, int mode1, |
34 | static void header(unsigned char *sha1, char *path1, int mode1, |
35 | unsigned char *sha2, char *path2, int mode2) |
35 | unsigned char *sha2, char *path2, int mode2) |
36 | { |
36 | { |
37 | char *abbrev1, *abbrev2; |
37 | char *abbrev1, *abbrev2; |
38 | int subproject; |
38 | int subproject; |
39 | |
39 | |
40 | subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); |
40 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
41 | html("<div class='head'>"); |
41 | html("<div class='head'>"); |
42 | html("diff --git a/"); |
42 | html("diff --git a/"); |
43 | html_txt(path1); |
43 | html_txt(path1); |
44 | html(" b/"); |
44 | html(" b/"); |
45 | html_txt(path2); |
45 | html_txt(path2); |
46 | |
46 | |
@@ -75,16 +75,16 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
75 | } |
75 | } |
76 | |
76 | |
77 | static void filepair_cb(struct diff_filepair *pair) |
77 | static void filepair_cb(struct diff_filepair *pair) |
78 | { |
78 | { |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
80 | pair->two->sha1, pair->two->path, pair->two->mode); |
80 | pair->two->sha1, pair->two->path, pair->two->mode); |
81 | if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) { |
81 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
82 | if (S_ISDIRLNK(pair->one->mode)) |
82 | if (S_ISGITLINK(pair->one->mode)) |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
84 | if (S_ISDIRLNK(pair->two->mode)) |
84 | if (S_ISGITLINK(pair->two->mode)) |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
86 | return; |
86 | return; |
87 | } |
87 | } |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); |
89 | cgit_print_error("Error running diff"); |
90 | } |
90 | } |
|
|
diff --git a/ui-tree.c b/ui-tree.c index 634132f..1cb09f7 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -65,23 +65,23 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
65 | |
65 | |
66 | name = xstrdup(pathname); |
66 | name = xstrdup(pathname); |
67 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
67 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
68 | cgit_query_path ? "/" : "", name); |
68 | cgit_query_path ? "/" : "", name); |
69 | |
69 | |
70 | type = sha1_object_info(sha1, &size); |
70 | type = sha1_object_info(sha1, &size); |
71 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
71 | if (type == OBJ_BAD && !S_ISGITLINK(mode)) { |
72 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
72 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
73 | name, |
73 | name, |
74 | sha1_to_hex(sha1)); |
74 | sha1_to_hex(sha1)); |
75 | return 0; |
75 | return 0; |
76 | } |
76 | } |
77 | |
77 | |
78 | html("<tr><td class='ls-mode'>"); |
78 | html("<tr><td class='ls-mode'>"); |
79 | html_filemode(mode); |
79 | html_filemode(mode); |
80 | html("</td><td>"); |
80 | html("</td><td>"); |
81 | if (S_ISDIRLNK(mode)) { |
81 | if (S_ISGITLINK(mode)) { |
82 | htmlf("<a class='ls-mod' href='"); |
82 | htmlf("<a class='ls-mod' href='"); |
83 | html_attr(fmt(cgit_repo->module_link, |
83 | html_attr(fmt(cgit_repo->module_link, |
84 | name, |
84 | name, |
85 | sha1_to_hex(sha1))); |
85 | sha1_to_hex(sha1))); |
86 | html("'>"); |
86 | html("'>"); |
87 | html_txt(name); |
87 | html_txt(name); |
|