about summary refs log tree commit diff homepage
path: root/merge.c
blob: 66a7a5e1036f82f9ec03798b5ce7dd66729fefec (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
/* Copyright (C) 2017  June McEnroe <june@causal.agency>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

#define _XOPEN_SOURCE_EXTENDED

#include <curses.h>
#include <err.h>
#include <fcntl.h>
#include <locale.h>
#include <stdio.h>
#include <sysexits.h>
#include <wchar.h>

#include "torus.h"

static void curse(void) {
	setlocale(LC_CTYPE, "");

	initscr();
	start_color();

	assume_default_colors(0, 0);
	if (COLORS >= 16) {
		for (short pair = 1; pair < 0x80; ++pair) {
			init_pair(pair, pair & 0x0F, (pair & 0xF0) >> 4);
		}
	} else {
		for (short pair = 1; pair < 0100; ++pair) {
			init_pair(pair, pair & 007, (pair & 070) >> 3);
		}
	}

	color_set(ColorWhite, NULL);
	mvhline(CellRows, 0, 0, CellCols);
	mvhline(CellRows * 2 + 1, 0, 0, CellCols);
	mvvline(0, CellCols, 0, CellRows * 2 + 1);
	mvaddch(CellRows, CellCols, ACS_RTEE);
	mvaddch(CellRows * 2 + 1, CellCols, ACS_LRCORNER);
	color_set(0, NULL);

	cbreak();
	noecho();
	keypad(stdscr, true);
	set_escdelay(100);
}

static attr_t colorAttr(uint8_t color) {
	if (COLORS >= 16) return A_NORMAL;
	return (color & ColorBright) ? A_BOLD : A_NORMAL;
}
static short colorPair(uint8_t color) {
	if (COLORS >= 16) return color;
	return (color & 0x70) >> 1 | (color & 0x07);
}

static void drawTile(int offsetY, const struct Tile *tile) {
	for (uint8_t cellY = 0; cellY < CellRows; ++cellY) {
		for (uint8_t cellX = 0; cellX < CellCols; ++cellX) {
			uint8_t color = tile->colors[cellY][cellX];
			uint8_t cell = tile->cells[cellY][cellX];

			cchar_t cch;
			wchar_t wch[] = { CP437[cell], L'\0' };
			setcchar(&cch, wch, colorAttr(color), colorPair(color), NULL);
			mvadd_wch(offsetY + cellY, cellX, &cch);
		}
	}
}

int main(int argc, char *argv[]) {
	if (argc != 4) return EX_USAGE;

	FILE *fileA = fopen(argv[1], "r");
	if (!fileA) err(EX_NOINPUT, "%s", argv[1]);

	FILE *fileB = fopen(argv[2], "r");
	if (!fileB) err(EX_NOINPUT, "%s", argv[2]);

	FILE *fileC = fopen(argv[3], "w");
	if (!fileC) err(EX_CANTCREAT, "%s", argv[3]);

	curse();

	struct Tile tileA, tileB;
	for (;;) {
		size_t countA = fread(&tileA, sizeof(tileA), 1, fileA);
		if (ferror(fileA)) err(EX_IOERR, "%s", argv[1]);

		size_t countB = fread(&tileB, sizeof(tileB), 1, fileB);
		if (ferror(fileB)) err(EX_IOERR, "%s", argv[2]);

		if (!countA && !countB) break;
		if (!countA || !countB) errx(EX_DATAERR, "different size inputs");

		struct Meta metaA = tileMeta(&tileA);
		struct Meta metaB = tileMeta(&tileB);

		const struct Tile *tileC = (metaA.accessTime > metaB.accessTime)
			? &tileA
			: &tileB;

		if (metaA.modifyTime != metaB.modifyTime) {
			drawTile(0, &tileA);
			drawTile(CellRows + 1, &tileB);
			move(CellRows * 2 + 2, 0);
			refresh();

			int c;
			do { c = getch(); } while (c != 'a' && c != 'b');
			tileC = (c == 'a') ? &tileA : &tileB;
		}

		fwrite(tileC, sizeof(*tileC), 1, fileC);
		if (ferror(fileC)) err(EX_IOERR, "%s", argv[3]);
	}

	endwin();
	return EX_OK;
}
Keeping If you search for a bogus range string here: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/ Using something like "range" and "qwerty123456", it returns an "Internal Server Error" and the following in the logs: > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] fatal: > ambiguous argument 'qwerty123456': unknown revision or path not in the > working tree., referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Use '--' to > separate paths from revisions, like this:, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] 'git <command> > [<revision>...] -- [<file>...]', referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Premature end > of script headers: cgit, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ The cache will kick in, so if you search for the same string again, it'll show an empty range, so you have to change the bogus strings each time. This is because we just pass the arguments straight to Git's revision parsing machinery which die()s if it cannot parse an argument, printing the above to stderr and exiting. The patch below makes it a bit friendlier by just ignoring unhandled arguments, but I can't see an easy way to report errors when we can't parse revision arguments without losing the flexibility of supporting all of the revision specifiers supported by Git. Reported-by: Konstantin Ryabitsev <mricon@kernel.org> 2014-06-28git: update for git 2.0Christian Hesse prefixcmp() and suffixcmp() have been remove, functionality is now provided by starts_with() and ends_with(). Retrurn values have been changed, so instead of just renaming we have to fix logic. Everything else looks just fine. 2014-04-17remove trailing whitespaces from source filesChristian Hesse 2014-04-12git: update to 1.9.2Christian Hesse Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required. 2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice For example, if I have two repos (remove-suffix is enabled): /foo /foo/bar http://cgit/foo/bar/ is interpreted as "repository 'foo', command 'bar'" instead of "repository 'foo/bar'" 2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld 2014-03-20git: update to 1.9.1Christian Hesse