/*
names.c -- generate commonly used (file)names
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "xalloc.h"
char *netname = NULL;
+char *myname = NULL;
char *confdir = NULL; /* base configuration directory */
char *confbase = NULL; /* base configuration directory for this instance of tinc */
bool confbase_given;
#ifdef HAVE_MINGW
HKEY key;
char installdir[1024] = "";
- DWORD len = sizeof installdir;
+ DWORD len = sizeof(installdir);
#endif
confbase_given = confbase;
fallback = true;
} else {
char fname[PATH_MAX];
- snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+ snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
if(access(fname, R_OK)) {
- snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase);
+ snprintf(fname, sizeof(fname), "%s" SLASH "pid", confbase);
if(!access(fname, R_OK))
fallback = true;
}
if(!unixsocketname) {
int len = strlen(pidfilename);
unixsocketname = xmalloc(len + 8);
- strcpy(unixsocketname, pidfilename);
+ memcpy(unixsocketname, pidfilename, len);
if(len > 4 && !strcmp(pidfilename + len - 4, ".pid"))
- strcpy(unixsocketname + len - 4, ".socket");
+ strncpy(unixsocketname + len - 4, ".socket", 8);
else
- strcpy(unixsocketname + len, ".socket");
+ strncpy(unixsocketname + len, ".socket", 8);
}
}
free(logfilename);
free(confbase);
free(confdir);
+ free(myname);
+
+ identname = NULL;
+ netname = NULL;
+ unixsocketname = NULL;
+ pidfilename = NULL;
+ logfilename = NULL;
+ confbase = NULL;
+ confdir = NULL;
+ myname = NULL;
}