neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Possibly working directory auto-detection

This commit is contained in:
Neale Pickett 2012-11-07 19:44:27 -07:00
parent 4c2931aec6
commit 6f3170ebfa
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/00common/src/common.c
View File

@ -363,17 +363,25 @@ my_snprintf(char *buf, size_t buflen, char *fmt, ...)
}
}
void
ctf_chdir()
{
char const *ctf_base = getenv("CTF_BASE");
static int initialized = 0;
int i;
if (initialized) {
return;
}
initialized = 1;
/* chdir to $CTF_BASE */
{
char const *ctf_base = getenv("CTF_BASE");
if (ctf_base) {
/* chdir to CTF_BASE */
chdir(ctf_base);
}
}
/* Keep going up one directory until there's a packages directory */
for (i = 0; i < 5; i += 1) {
@ -395,17 +403,13 @@ mkpath(char const *type, char const *fmt, va_list ap)
{
char relpath[PATH_MAX];
static char path[PATH_MAX];
char const *var = getenv("CTF_BASE");
ctf_chdir();
vsnprintf(relpath, sizeof(relpath) - 1, fmt, ap);
relpath[sizeof(relpath) - 1] = '\0';
if (! var) {
var = "";
}
/* $CTF_BASE/type/relpath */
my_snprintf(path, sizeof(path), "%s/%s/%s", var, type, relpath);
my_snprintf(path, sizeof(path), "%s/%s", type, relpath);
return path;
}

2
packages/tanks/tanks.mk
View File

@ -1,7 +1,7 @@
TANKS_PKGDIR = $(TARGET)/tanks
TANKS_CACHE = $(CACHE)/tanks.git
TANKS_BUILDDIR = $(BUILD)/tanks
TANKS_URL = "http://dirtbags.net/projects/tanks"
TANKS_URL = "http://woozle.org/~neale/g.cgi/tanks"
$(TANKS_CACHE):
git clone --bare $(TANKS_URL) $@