Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 783edb6
HBSD: Resolve merge conflict
Shawn Webb committed 22 days ago
commit 783edb60c3fa83f9eb122bdf1d04df6013103a5b
parent abccdd3
1 file changed +2 -19
modified libpkg/pkg_add.c
@@ -27,12 +27,10 @@
#include <time.h>

#include <xstring.h>
- 
<<<<<<< HEAD
+ 
#include <dirent.h>
+ 


#include <sys/types.h>

#include <sys/extattr.h>
- 
=======
- 
#include <dirent.h>
- 
>>>>>>> upstream/main



#include "pkg.h"

#include "private/event.h"
@@ -63,16 +61,7 @@ merge_with_external_tool(const char *merge_tool, struct pkg_config_file *lcf,
	int status;

	FILE *inout[2];
- 
<<<<<<< HEAD
- 
	if (strlen(merge_tool) >= MAXPATHLEN) {
- 
		pkg_emit_error("External merge path %s is invalid", merge_tool);
- 
		return MERGE_FAILED;
- 
	}
-
- 
	char *tmpdir = getenv("TMPDIR");
- 
=======

	char const *tmpdir = getenv("TMPDIR");
- 
>>>>>>> upstream/main

	if (tmpdir == NULL)

		tmpdir = "/tmp";
@@ -132,14 +121,8 @@ merge_with_external_tool(const char *merge_tool, struct pkg_config_file *lcf,
	}



	char command[MAXPATHLEN];
- 
<<<<<<< HEAD
- 
	for (size_t i = 0; i < sizeof(command) - 1 && *merge_tool != '\0'; i++, merge_tool++) {
- 
		size_t j;
-
- 
=======

	int i = 0;

	for (; *merge_tool != '\0' && i < (int)sizeof(command) - 1; i++, merge_tool++) {
- 
>>>>>>> upstream/main

		if (*merge_tool != '%') {

			command[i] = *merge_tool;

			continue;