j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

FreeBSD compile fixes (thanks to XeF4)

Browse source
This commit is contained in:
Guus Sliepen 2001-02-06 10:12:51 +00:00
parent bb4457d6ca
commit f777c1807d
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dropin.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: dropin.c,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $ $Id: dropin.c,v 1.1.2.4 2001/02/06 10:12:51 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -31,6 +31,7 @@
#include <xalloc.h> #include <xalloc.h>
#include <system.h> #include <system.h>
#include <errno.h>
#ifndef HAVE_DAEMON #ifndef HAVE_DAEMON
/* /*
@ -113,6 +114,7 @@ char *get_current_dir_name(void)
{ {
size_t size; size_t size;
char *buf; char *buf;
char *r;
/* Start with 100 bytes. If this turns out to be insufficient to /* Start with 100 bytes. If this turns out to be insufficient to
contain the working directory, double the size. */ contain the working directory, double the size. */
@ -123,7 +125,7 @@ char *get_current_dir_name(void)
r = getcwd(buf, size); r = getcwd(buf, size);
/* getcwd returns NULL and sets errno to ERANGE if the bufferspace /* getcwd returns NULL and sets errno to ERANGE if the bufferspace
is insufficient to contain the entire working directory. */ is insufficient to contain the entire working directory. */
while(r == NULL && errno = ERANGE) while(r == NULL && errno == ERANGE)
{ {
free(buf); free(buf);
size <<= 1; /* double the size */ size <<= 1; /* double the size */

8
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.c,v 1.28.4.76 2001/01/08 20:35:30 guus Exp $ $Id: protocol.c,v 1.28.4.77 2001/02/06 10:12:51 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -1043,12 +1043,12 @@ cp
return 0; return 0;
} }
int send_error(connection_t *cl, int errno, char *errstring) int send_error(connection_t *cl, int err, char *errstring)
{ {
cp cp
if(!errstring) if(!errstring)
errstring = strerror(errno); errstring = strerror(err);
return send_request(cl, "%d %d %s", ERROR, errno, errstring); return send_request(cl, "%d %d %s", ERROR, err, errstring);
} }
int error_h(connection_t *cl) int error_h(connection_t *cl)