GopherProxy

	tex: write should fail if the file is changed - neatvi - [fork] simple vi-type …
	git clone git://src.adamsgaard.dk/neatvi
	Log
	Files
	Refs
	README
	---
	commit bb6ac7ee69d65189666e9d9e64af2068607b35f2
	parent d550e4e2117866d1f2d99bc5279d545d1c10a30d
	Author: Ali Gholami Rudi <[email protected]>
	Date: Mon, 28 Dec 2015 07:43:07 +0330

	ex: write should fail if the file is changed

	Diffstat:
	M ex.c \| 24 +++++++++++++++++++++++-

	1 file changed, 23 insertions(+), 1 deletion(-)
	---
	diff --git a/ex.c b/ex.c
	t@@ -29,6 +29,7 @@ static struct buf {
	char *path;
	struct lbuf *lb;
	int row, off;
	+ long mtime; /* modification time */
	} bufs[8];

	static int bufs_find(char *path)
	t@@ -49,6 +50,14 @@ static void bufs_free(int idx)
	}
	}

	+static long mtime(char *path)
	+{
	+ struct stat st;
	+ if (!stat(path, &st))
	+ return st.st_mtime;
	+ return -1;
	+}
	+
	static int bufs_open(char *path)
	{
	int i;
	t@@ -60,6 +69,7 @@ static int bufs_open(char *path)
	bufs[i].lb = lbuf_make();
	bufs[i].row = 0;
	bufs[i].off = 0;
	+ bufs[i].mtime = -1;
	strcpy(bufs[i].ft, syn_filetype(path));
	return i;
	}
	t@@ -359,6 +369,7 @@ static int ec_edit(char *ec)
	}
	xrow = xvis ? 0 : MAX(0, MIN(xrow, lbuf_len(xb) - 1));
	lbuf_saved(xb, path[0] != '\0');
	+ bufs[0].mtime = mtime(ex_path());
	return 0;
	}

	t@@ -427,7 +438,14 @@ static int ec_write(char *ec)
	cmd_pipe(arg + 1, ibuf, 1, 0);
	free(ibuf);
	} else {
	- int fd = open(path, O_WRONLY \| O_CREAT \| O_TRUNC, 0600);
	+ int fd;
	+ if (!strchr(cmd, '!') && bufs[0].path &&
	+ !strcmp(bufs[0].path, path) &&
	+ mtime(bufs[0].path) > bufs[0].mtime) {
	+ ex_show("write failed\n");
	+ return 1;
	+ }
	+ fd = open(path, O_WRONLY \| O_CREAT \| O_TRUNC, 0600);
	if (fd < 0) {
	ex_show("write failed\n");
	return 1;
	t@@ -444,6 +462,8 @@ static int ec_write(char *ec)
	}
	if (!strcmp(ex_path(), path))
	lbuf_saved(xb, 0);
	+ if (!strcmp(ex_path(), path))
	+ bufs[0].mtime = mtime(path);
	if (cmd[0] == 'x' \|\| (cmd[0] == 'w' && cmd[1] == 'q'))
	ec_quit(cmd);
	return 0;
	t@@ -848,7 +868,9 @@ static struct excmd {
	{"r", "read", ec_read},
	{"v", "vglobal", ec_glob},
	{"w", "write", ec_write},
	+ {"w!", "write!", ec_write},
	{"wq", "wq", ec_write},
	+ {"wq!", "wq!", ec_write},
	{"u", "undo", ec_undo},
	{"r", "redo", ec_redo},
	{"se", "set", ec_set},