add a kludge for systems like MacOS or OpenBSD

where self_exe() does not work reliably

Author: turistu

src/main.c

@@ -49,8 +49,12 @@ static void run(const char *name, int ac, char **av){
 }
 int main(int ac, char **av){
 	struct prog *p;
-	run(av[0], ac, av);
-	if(ac > 1) run(av[1], ac - 1, av + 1);
+	if(ac > 1 && av[1][0] == '/'){
+		run(av[1], ac - 1, av + 1);
+	}else{
+		run(av[0], ac, av);
+		if(ac > 1) run(av[1], ac - 1, av + 1);
+	}
 	fprintf(stderr, "Dropbear SSH multi-purpose v%s\n"
 		"Make a symlink pointing at this binary with one of the\n",
 		DROPBEAR_VERSION);

src/svr-chansession.c

@@ -700,7 +700,7 @@ static int sessioncommand(struct Channel *channel, struct ChanSess *chansess,
 	if (chansess->cmd && strncmp(chansess->cmd, "scp ", 4) == 0 &&
 			find_multi("scp") && (self = self_exe(NULL))) {
 		char *ocmd = chansess->cmd;
-		chansess->cmd = m_asprintf("%s %s", self, ocmd);
+		chansess->cmd = m_asprintf("%s /%s", self, ocmd);
 		m_free(ocmd);
 	}
 

util/simple-test

@@ -44,7 +44,10 @@ if ! [ "$recursive" ]; then
 		trap 'set +e; rm -fr "$tmpdir"' EXIT INT TERM
 	fi
 
-	this=$(realpath "$0")
+	case $0 in
+	/*)	this=$0;;
+	*)	this=$(pwd)/$0;;
+	esac
 	cd "$tmpdir"
 	init_keys
 	"$D/dbclient" -t -i key -o UserKnownHostsFile=known_hosts \