projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
names.c
diff --git
a/src/names.c
b/src/names.c
index
a640fe4
..
95aad2b
100644
(file)
--- a/
src/names.c
+++ b/
src/names.c
@@
-1,7
+1,7
@@
/*
names.c -- generate commonly used (file)names
Copyright (C) 1998-2005 Ivo Timmermans
/*
names.c -- generate commonly used (file)names
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-201
5
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
7
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
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
@@
-25,6
+25,7
@@
#include "xalloc.h"
char *netname = NULL;
#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;
char *confdir = NULL; /* base configuration directory */
char *confbase = NULL; /* base configuration directory for this instance of tinc */
bool confbase_given;
@@
-41,7
+42,7
@@
void make_names(bool daemon) {
#ifdef HAVE_MINGW
HKEY key;
char installdir[1024] = "";
#ifdef HAVE_MINGW
HKEY key;
char installdir[1024] = "";
- DWORD len = sizeof
installdir
;
+ DWORD len = sizeof
(installdir)
;
#endif
confbase_given = confbase;
#endif
confbase_given = confbase;
@@
-92,9
+93,9
@@
void make_names(bool daemon) {
fallback = true;
} else {
char fname[PATH_MAX];
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)) {
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(!access(fname, R_OK))
fallback = true;
}
@@
-137,4
+138,14
@@
void free_names(void) {
free(logfilename);
free(confbase);
free(confdir);
free(logfilename);
free(confbase);
free(confdir);
+ free(myname);
+
+ identname = NULL;
+ netname = NULL;
+ unixsocketname = NULL;
+ pidfilename = NULL;
+ logfilename = NULL;
+ confbase = NULL;
+ confdir = NULL;
+ myname = NULL;
}
}