projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
1b0ac64
..
7794259
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-2,7
+2,7
@@
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
- 2000-200
6
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-200
9
Guus Sliepen <guus@tinc-vpn.org>
2000 Cris van Pelt
This program is free software; you can redistribute it and/or modify
2000 Cris van Pelt
This program is free software; you can redistribute it and/or modify
@@
-287,6
+287,8
@@
static char *readline(FILE * fp, char **buf, size_t *buflen) {
size = newsize;
} else {
*newline = '\0'; /* kill newline */
size = newsize;
} else {
*newline = '\0'; /* kill newline */
+ if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */
+ newline[-1] = '\0';
break; /* yay */
}
}
break; /* yay */
}
}