projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct error message when remote host closed connection.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
e57eb8b
..
c95664f
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.7
0 2003/08/02 15:27:24
guus Exp $
+ $Id: conf.c,v 1.9.4.7
3 2003/08/08 12:24:52
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-363,7
+363,7
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
continue;
if(ignore) {
continue;
if(ignore) {
- if(!strncmp(
variabl
e, "-----END", 8))
+ if(!strncmp(
lin
e, "-----END", 8))
ignore = false;
continue;
}
ignore = false;
continue;
}
@@
-390,7
+390,6
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
break;
}
break;
}
- logger(LOG_DEBUG, "%s=%s", variable, value);
cfg = new_config();
cfg->variable = xstrdup(variable);
cfg->value = xstrdup(value);
cfg = new_config();
cfg->variable = xstrdup(variable);
cfg->value = xstrdup(value);
@@
-546,7
+545,11
@@
FILE *ask_and_safe_open(const char *filename, const char *what, bool safe, const
fn = xstrdup(filename);
}
fn = xstrdup(filename);
}
- if(!strchr(fn, '/') || fn[0] != '/') {
+#ifdef HAVE_MINGW
+ if(fn[0] != '\\' && fn[0] != '/' && !strchr(fn, ':')) {
+#else
+ if(fn[0] != '/') {
+#endif
/* The directory is a relative path or a filename. */
char *p;
/* The directory is a relative path or a filename. */
char *p;