commit a8938c43582703be3f5912d0147fc275d314204a
from: Omar Polo <op@omarpolo.com>
via: Thomas Adam <thomas@xteddy.org>
date: Tue Mar 19 13:37:06 2024 UTC

use a define for vi(1) path

This is intended to aid -portable, since other systems may have vi
installed in a different place, or maybe prefer to ship with a
different default editor.

ok stsp@

commit - fd77650a2d2970938d0c48d320258aa8e497e024
commit + a8938c43582703be3f5912d0147fc275d314204a
blob - 713ac6213adf64d341195a912b6044a3298a0c80
blob + dcc18548536ddae27b9d4ec7e2783af9a8735119
--- cvg/cvg.c
+++ cvg/cvg.c
@@ -65,6 +65,10 @@
 
 #ifndef nitems
 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
+#endif
+
+#ifndef GOT_DEFAULT_EDITOR
+#define GOT_DEFAULT_EDITOR "/usr/bin/vi"
 #endif
 
 static volatile sig_atomic_t sigint_received;
@@ -279,7 +283,7 @@ get_editor(char **abspath)
 	}
 
 	if (*abspath == NULL) {
-		*abspath = strdup("/usr/bin/vi");
+		*abspath = strdup(GOT_DEFAULT_EDITOR);
 		if (*abspath == NULL)
 			return got_error_from_errno("strdup");
 	}
blob - 6cca04c7b61becb9df4fb50674ec1414ee0cdbe0
blob + b2207ea62be2ceedcd79728f10ffabc58ab19898
--- got/got.c
+++ got/got.c
@@ -65,6 +65,10 @@
 
 #ifndef nitems
 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
+#endif
+
+#ifndef GOT_DEFAULT_EDITOR
+#define GOT_DEFAULT_EDITOR "/usr/bin/vi"
 #endif
 
 static volatile sig_atomic_t sigint_received;
@@ -309,7 +313,7 @@ get_editor(char **abspath)
 	}
 
 	if (*abspath == NULL) {
-		*abspath = strdup("/usr/bin/vi");
+		*abspath = strdup(GOT_DEFAULT_EDITOR);
 		if (*abspath == NULL)
 			return got_error_from_errno("strdup");
 	}