From 005e462e01b58015f3e1d841b185186e6b5d4e14 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 10 Nov 2015 22:29:33 +0000
Subject: [PATCH] Handle absolute paths properly, and don't use resolved path
 in realpath() fails.

---
 cmd-load-buffer.c | 12 ++++++++----
 cmd-save-buffer.c | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index c55e6c11..d81288f3 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -77,11 +77,15 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	else
 		cwd = ".";
 
-	xasprintf(&file, "%s/%s", cwd, path);
-	if (realpath(file, resolved) == NULL)
-		f = NULL;
+	if (*path == '/')
+		file = xstrdup(path);
 	else
-		f = fopen(resolved, "rb");
+		xasprintf(&file, "%s/%s", cwd, path);
+	if (realpath(file, resolved) == NULL) {
+		cmdq_error(cmdq, "%s: %s", file, strerror(errno));
+		return (CMD_RETURN_ERROR);
+	}
+	f = fopen(resolved, "rb");
 	free(file);
 	if (f == NULL) {
 		cmdq_error(cmdq, "%s: %s", resolved, strerror(errno));
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index dca2c8ef..8de99075 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -103,11 +103,15 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (args_has(self->args, 'a'))
 		flags = "ab";
 
-	xasprintf(&file, "%s/%s", cwd, path);
-	if (realpath(file, resolved) == NULL)
-		f = NULL;
+	if (*path == '/')
+		file = xstrdup(path);
 	else
-		f = fopen(resolved, flags);
+		xasprintf(&file, "%s/%s", cwd, path);
+	if (realpath(file, resolved) == NULL)  {
+		cmdq_error(cmdq, "%s: %s", file, strerror(errno));
+		return (CMD_RETURN_ERROR);
+	}
+	f = fopen(resolved, flags);
 	free(file);
 	if (f == NULL) {
 		cmdq_error(cmdq, "%s: %s", resolved, strerror(errno));