summaryrefslogtreecommitdiffabout
path: root/ui-ssdiff.c
Unidiff
Diffstat (limited to 'ui-ssdiff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-ssdiff.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 3591ab4..8215051 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -11,148 +11,148 @@ struct deferred_lines {
11 char *line; 11 char *line;
12 struct deferred_lines *next; 12 struct deferred_lines *next;
13}; 13};
14 14
15static struct deferred_lines *deferred_old, *deferred_old_last; 15static struct deferred_lines *deferred_old, *deferred_old_last;
16static struct deferred_lines *deferred_new, *deferred_new_last; 16static struct deferred_lines *deferred_new, *deferred_new_last;
17 17
18static int line_from_hunk(char *line, char type) 18static int line_from_hunk(char *line, char type)
19{ 19{
20 char *buf1, *buf2; 20 char *buf1, *buf2;
21 int len; 21 int len;
22 22
23 buf1 = strchr(line, type); 23 buf1 = strchr(line, type);
24 if (buf1 == NULL) 24 if (buf1 == NULL)
25 return 0; 25 return 0;
26 buf1 += 1; 26 buf1 += 1;
27 buf2 = strchr(buf1, ','); 27 buf2 = strchr(buf1, ',');
28 if (buf2 == NULL) 28 if (buf2 == NULL)
29 return 0; 29 return 0;
30 len = buf2 - buf1; 30 len = buf2 - buf1;
31 buf2 = xmalloc(len + 1); 31 buf2 = xmalloc(len + 1);
32 strncpy(buf2, buf1, len); 32 strncpy(buf2, buf1, len);
33 buf2[len] = '\0'; 33 buf2[len] = '\0';
34 int res = atoi(buf2); 34 int res = atoi(buf2);
35 free(buf2); 35 free(buf2);
36 return res; 36 return res;
37} 37}
38 38
39static char *replace_tabs(char *line) 39static char *replace_tabs(char *line)
40{ 40{
41 char *prev_buf = line; 41 char *prev_buf = line;
42 char *cur_buf; 42 char *cur_buf;
43 int linelen = strlen(line); 43 int linelen = strlen(line);
44 int n_tabs = 0; 44 int n_tabs = 0;
45 int i; 45 int i;
46 char *result; 46 char *result;
47 char *spaces = " "; 47 char *spaces = " ";
48 48
49 if (linelen == 0) { 49 if (linelen == 0) {
50 result = xmalloc(1); 50 result = xmalloc(1);
51 result[0] = '\0'; 51 result[0] = '\0';
52 return result; 52 return result;
53 } 53 }
54 54
55 for (i = 0; i < linelen; i++) 55 for (i = 0; i < linelen; i++)
56 if (line[i] == '\t') 56 if (line[i] == '\t')
57 n_tabs += 1; 57 n_tabs += 1;
58 result = xmalloc(linelen + n_tabs * 8 + 1); 58 result = xmalloc(linelen + n_tabs * 8 + 1);
59 result[0] = '\0'; 59 result[0] = '\0';
60 60
61 while (1) { 61 while (1) {
62 cur_buf = strchr(prev_buf, '\t'); 62 cur_buf = strchr(prev_buf, '\t');
63 if (!cur_buf) { 63 if (!cur_buf) {
64 strcat(result, prev_buf); 64 strcat(result, prev_buf);
65 break; 65 break;
66 } else { 66 } else {
67 strcat(result, " "); 67 strcat(result, " ");
68 strncat(result, spaces, 8 - (strlen(result) % 8)); 68 strncat(result, spaces, 8 - (strlen(result) % 8));
69 strncat(result, prev_buf, cur_buf - prev_buf); 69 strncat(result, prev_buf, cur_buf - prev_buf);
70 } 70 }
71 prev_buf = cur_buf + 1; 71 prev_buf = cur_buf + 1;
72 } 72 }
73 return result; 73 return result;
74} 74}
75 75
76static void deferred_old_add(char *line, int line_no) 76static void deferred_old_add(char *line, int line_no)
77{ 77{
78 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); 78 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
79 item->line = xstrdup(line); 79 item->line = xstrdup(line);
80 item->line_no = line_no; 80 item->line_no = line_no;
81 item->next = NULL; 81 item->next = NULL;
82 if (deferred_old) { 82 if (deferred_old) {
83 deferred_old_last->next = item; 83 deferred_old_last->next = item;
84 deferred_old_last = item; 84 deferred_old_last = item;
85 } else { 85 } else {
86 deferred_old = deferred_old_last = item; 86 deferred_old = deferred_old_last = item;
87 } 87 }
88} 88}
89 89
90static void deferred_new_add(char *line, int line_no) 90static void deferred_new_add(char *line, int line_no)
91{ 91{
92 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); 92 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
93 item->line = xstrdup(line); 93 item->line = xstrdup(line);
94 item->line_no = line_no; 94 item->line_no = line_no;
95 item->next = NULL; 95 item->next = NULL;
96 if (deferred_new) { 96 if (deferred_new) {
97 deferred_new_last->next = item; 97 deferred_new_last->next = item;
98 deferred_new_last = item; 98 deferred_new_last = item;
99 } else { 99 } else {
100 deferred_new = deferred_new_last = item; 100 deferred_new = deferred_new_last = item;
101 } 101 }
102} 102}
103 103
104static void print_ssdiff_line(char *class, int old_line_no, char *old_line, 104static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
105 int new_line_no, char *new_line) 105 int new_line_no, char *new_line)
106{ 106{
107 html("<tr>"); 107 html("<tr>");
108 if (old_line_no > 0) 108 if (old_line_no > 0)
109 htmlf("<td class='%s'>%d </td><td class='%s'>", class, 109 htmlf("<td class='lineno'>%d</td><td class='%s'>",
110 old_line_no, class); 110 old_line_no, class);
111 else 111 else
112 htmlf("<td class='%s_dark'> </td><td class='%s_dark'>", class, class); 112 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
113 113
114 if (old_line) { 114 if (old_line) {
115 old_line = replace_tabs(old_line + 1); 115 old_line = replace_tabs(old_line + 1);
116 html_txt(old_line); 116 html_txt(old_line);
117 free(old_line); 117 free(old_line);
118 } 118 }
119 119
120 html(" </td>"); 120 html("</td>");
121 121
122 if (new_line_no > 0) 122 if (new_line_no > 0)
123 htmlf("<td class='%s'> %d </td><td class='%s'>", class, 123 htmlf("<td class='lineno'>%d</td><td class='%s'>",
124 new_line_no, class); 124 new_line_no, class);
125 else 125 else
126 htmlf("<td class='%s_dark'> </td><td class='%s_dark'>", class, class); 126 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
127 127
128 if (new_line) { 128 if (new_line) {
129 new_line = replace_tabs(new_line + 1); 129 new_line = replace_tabs(new_line + 1);
130 html_txt(new_line); 130 html_txt(new_line);
131 free(new_line); 131 free(new_line);
132 } 132 }
133 133
134 html("</td></tr>"); 134 html("</td></tr>");
135} 135}
136 136
137static void print_deferred_old_lines() 137static void print_deferred_old_lines()
138{ 138{
139 struct deferred_lines *iter_old, *tmp; 139 struct deferred_lines *iter_old, *tmp;
140 140
141 iter_old = deferred_old; 141 iter_old = deferred_old;
142 while (iter_old) { 142 while (iter_old) {
143 print_ssdiff_line("del", iter_old->line_no, 143 print_ssdiff_line("del", iter_old->line_no,
144 iter_old->line, -1, NULL); 144 iter_old->line, -1, NULL);
145 tmp = iter_old->next; 145 tmp = iter_old->next;
146 free(iter_old); 146 free(iter_old);
147 iter_old = tmp; 147 iter_old = tmp;
148 } 148 }
149} 149}
150 150
151static void print_deferred_new_lines() 151static void print_deferred_new_lines()
152{ 152{
153 struct deferred_lines *iter_new, *tmp; 153 struct deferred_lines *iter_new, *tmp;
154 154
155 iter_new = deferred_new; 155 iter_new = deferred_new;
156 while (iter_new) { 156 while (iter_new) {
157 print_ssdiff_line("add", -1, NULL, iter_new->line_no, 157 print_ssdiff_line("add", -1, NULL, iter_new->line_no,
158 iter_new->line); 158 iter_new->line);
@@ -220,45 +220,51 @@ void cgit_ssdiff_line_cb(char *line, int len)
220 line[len - 1] = '\0'; 220 line[len - 1] = '\0';
221 221
222 if (line[0] == '@') { 222 if (line[0] == '@') {
223 current_old_line = line_from_hunk(line, '-'); 223 current_old_line = line_from_hunk(line, '-');
224 current_new_line = line_from_hunk(line, '+'); 224 current_new_line = line_from_hunk(line, '+');
225 } 225 }
226 226
227 if (line[0] == ' ') { 227 if (line[0] == ' ') {
228 if (deferred_old || deferred_new) 228 if (deferred_old || deferred_new)
229 cgit_ssdiff_print_deferred_lines(); 229 cgit_ssdiff_print_deferred_lines();
230 print_ssdiff_line("ctx", current_old_line, line, 230 print_ssdiff_line("ctx", current_old_line, line,
231 current_new_line, line); 231 current_new_line, line);
232 current_old_line += 1; 232 current_old_line += 1;
233 current_new_line += 1; 233 current_new_line += 1;
234 } else if (line[0] == '+') { 234 } else if (line[0] == '+') {
235 deferred_new_add(line, current_new_line); 235 deferred_new_add(line, current_new_line);
236 current_new_line += 1; 236 current_new_line += 1;
237 } else if (line[0] == '-') { 237 } else if (line[0] == '-') {
238 deferred_old_add(line, current_old_line); 238 deferred_old_add(line, current_old_line);
239 current_old_line += 1; 239 current_old_line += 1;
240 } else if (line[0] == '@') { 240 } else if (line[0] == '@') {
241 html("<tr><td colspan='4' class='hunk'>"); 241 html("<tr><td colspan='4' class='hunk'>");
242 html_txt(line); 242 html_txt(line);
243 html("</td></tr>"); 243 html("</td></tr>");
244 } else { 244 } else {
245 html("<tr><td colspan='4' class='ctx'>"); 245 html("<tr><td colspan='4' class='ctx'>");
246 html_txt(line); 246 html_txt(line);
247 html("</td></tr>"); 247 html("</td></tr>");
248 } 248 }
249 line[len - 1] = c; 249 line[len - 1] = c;
250} 250}
251 251
252void cgit_ssdiff_header() 252void cgit_ssdiff_header_begin()
253{ 253{
254 current_old_line = 0; 254 current_old_line = 0;
255 current_new_line = 0; 255 current_new_line = 0;
256 html("<table class='ssdiff'>"); 256 html("<tr><td class='space' colspan='4'><div></div></td></tr>");
257 html("<tr><td class='head' colspan='4'>");
258}
259
260void cgit_ssdiff_header_end()
261{
262 html("</td><tr>");
257} 263}
258 264
259void cgit_ssdiff_footer() 265void cgit_ssdiff_footer()
260{ 266{
261 if (deferred_old || deferred_new) 267 if (deferred_old || deferred_new)
262 cgit_ssdiff_print_deferred_lines(); 268 cgit_ssdiff_print_deferred_lines();
263 html("</table>"); 269 html("<tr><td class='foot' colspan='4'></td></tr>");
264} 270}