github-actions[bot]
2 years ago
committed by
GitHub
commit
c3c349a83b
@ -1,32 +0,0 @@ |
||||
{ lib |
||||
, buildGoPackage |
||||
, fetchFromGitHub |
||||
}: |
||||
|
||||
buildGoPackage rec { |
||||
pname = "go-mk"; |
||||
version = "0.pre+date=2015-03-24"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "dcjones"; |
||||
repo = "mk"; |
||||
rev = "73d1b31466c16d0a13a220e5fad7cd8ef6d984d1"; |
||||
hash = "sha256-fk2Qd3LDMx+RapKi1M9yCuxpS0IB6xlbEWW+H6t94AI="; |
||||
}; |
||||
|
||||
goPackagePath = "github.com/dcjones/mk"; |
||||
|
||||
meta = with lib; { |
||||
inherit (src.meta) homepage; |
||||
description = "A reboot of Plan9's mk, written in Go"; |
||||
longDescription = '' |
||||
Mk is a reboot of the Plan 9 mk command, which itself is a successor to |
||||
make. This tool is for anyone who loves make, but hates all its stupid |
||||
bullshit. |
||||
''; |
||||
license = licenses.bsd2; |
||||
maintainers = with maintainers; [ AndersonTorres ]; |
||||
mainProgram = "mk"; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -1,23 +0,0 @@ |
||||
diff --git a/src/main/main.c b/src/main/main.c
|
||||
index eec3c3e4..4169112b 100644
|
||||
--- a/src/main/main.c
|
||||
+++ b/src/main/main.c
|
||||
@@ -337,10 +337,14 @@ main(int argc, char **argv)
|
||||
char dirnamebuf[POOLMAXPATHLEN + 1];
|
||||
char *dirp;
|
||||
|
||||
- strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf));
|
||||
- dirp = dirname(dirnamebuf);
|
||||
- snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
|
||||
- dirp, pool_config->pool_passwd);
|
||||
+ if (pool_config->pool_passwd[0] != '/') {
|
||||
+ strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf));
|
||||
+ dirp = dirname(dirnamebuf);
|
||||
+ snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
|
||||
+ dirp, pool_config->pool_passwd);
|
||||
+ } else
|
||||
+ strlcpy(pool_passwd, pool_config->pool_passwd,
|
||||
+ sizeof(pool_passwd));
|
||||
pool_init_pool_passwd(pool_passwd, POOL_PASSWD_R);
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue