Deleted Added
full compact
tftp-utils.c (215034) tftp-utils.c (241720)
1/*
2 * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 10 unchanged lines hidden (view full) ---

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
1/*
2 * Copyright (C) 2008 Edwin Groothuis. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 10 unchanged lines hidden (view full) ---

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/libexec/tftpd/tftp-utils.c 215034 2010-11-09 10:59:09Z brucec $");
27__FBSDID("$FreeBSD: head/libexec/tftpd/tftp-utils.c 241720 2012-10-19 05:43:38Z ed $");
28
29#include <sys/socket.h>
30#include <sys/stat.h>
31
32#include <netinet/in.h>
33#include <arpa/tftp.h>
34
35#include <stdarg.h>

--- 80 unchanged lines hidden (view full) ---

116 exit(1);
117 }
118 return (cp - buffer + 1);
119}
120
121/*
122 * Logging functions
123 */
28
29#include <sys/socket.h>
30#include <sys/stat.h>
31
32#include <netinet/in.h>
33#include <arpa/tftp.h>
34
35#include <stdarg.h>

--- 80 unchanged lines hidden (view full) ---

116 exit(1);
117 }
118 return (cp - buffer + 1);
119}
120
121/*
122 * Logging functions
123 */
124int _tftp_logtostdout = 1;
124static int _tftp_logtostdout = 1;
125
126void
127tftp_openlog(const char *ident, int logopt, int facility)
128{
129
130 _tftp_logtostdout = (ident == NULL);
131 if (_tftp_logtostdout == 0)
132 openlog(ident, logopt, facility);

--- 187 unchanged lines hidden ---
125
126void
127tftp_openlog(const char *ident, int logopt, int facility)
128{
129
130 _tftp_logtostdout = (ident == NULL);
131 if (_tftp_logtostdout == 0)
132 openlog(ident, logopt, facility);

--- 187 unchanged lines hidden ---