projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show next- and lastbutonehop when dumping connectionlist to syslog.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
0eaf0ca
..
cf999cb
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,7
+19,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.4
1 2001/06/05 19:39:54
guus Exp $
+ $Id: conf.c,v 1.9.4.4
3 2001/09/01 12:46:49
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-35,6
+35,7
@@
#include <sys/types.h>
#include <unistd.h>
#include <syslog.h>
#include <sys/types.h>
#include <unistd.h>
#include <syslog.h>
+#include <string.h>
#include <xalloc.h>
#include <utils.h> /* for cp */
#include <xalloc.h>
#include <utils.h> /* for cp */
@@
-332,7
+333,7
@@
cp
/*
Look up the value of the config option type
*/
/*
Look up the value of the config option type
*/
-const config_t *get_config_val(config_t *p, which_t type)
+const config_t *get_config_val(config_t
const
*p, which_t type)
{
cp
for(; p != NULL; p = p->next)
{
cp
for(; p != NULL; p = p->next)
@@
-495,7
+496,7
@@
FILE *ask_and_safe_open(const char* filename, const char* what, const char* mode
if((fn = readline(stdin, NULL, NULL)) == NULL)
{
if((fn = readline(stdin, NULL, NULL)) == NULL)
{
- fprintf(stderr, _("Error while reading stdin: %
m\n"
));
+ fprintf(stderr, _("Error while reading stdin: %
s\n"), strerror(errno
));
return NULL;
}
return NULL;
}
@@
-521,8
+522,8
@@
FILE *ask_and_safe_open(const char* filename, const char* what, const char* mode
/* Open it first to keep the inode busy */
if((r = fopen(fn, mode)) == NULL)
{
/* Open it first to keep the inode busy */
if((r = fopen(fn, mode)) == NULL)
{
- fprintf(stderr, _("Error opening file `%s': %
m
\n"),
- fn);
+ fprintf(stderr, _("Error opening file `%s': %
s
\n"),
+ fn
, strerror(errno)
);
free(fn);
return NULL;
}
free(fn);
return NULL;
}