head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.114 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.112 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.110 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.108 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.106 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.104 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.102 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.100 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.98 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.96 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.94 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.92 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.90 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.88 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.86 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.84 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.82 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.80 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.78 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.76 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.74 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.72 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.70 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.66 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.46 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.68 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.64 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.62 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.60 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.58 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.56 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.54 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.52 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.50 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.48 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.44 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.42 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.40 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.38 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.36 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.34 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.32 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.30 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.28 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.26 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.24 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.22 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.20 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.18 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.16 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.14 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.10 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.6 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.4 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.38 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.34 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.32 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.30 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.28 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.26 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.24 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.22 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.20 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.18 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.16 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.14 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.12 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.10 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.8 pkgsrc-2008Q1:1.2.0.6 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.4 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.1.0.30 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.28 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.26 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.24 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.22 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.20 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.18 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.16 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.14 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.12 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.10 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.8 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.6 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.4 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2012.01.25.09.56.08; author he; state Exp; branches; next 1.2; 1.2 date 2007.10.02.20.23.08; author heinz; state Exp; branches; next 1.1; 1.1 date 2003.09.21.09.15.31; author jmc; state Exp; branches; next ; desc @@ 1.3 log @Update patches for this package so that it builds with -Werror and -Wall with the gcc in NetBSD 5.1, i.e. gcc 4.1.3. Fixes prompted by reports that a build outside of pkgsrc for "64-bit Linux" (amd64) but using this set of patches, gets a segfault, and this fixes that problem. Bump pkgrevision. @ text @$NetBSD$ A number of changes to make this build with no warnings under -Wall. --- tftpsubs.c.orig 1994-10-05 05:20:49.000000000 +0000 +++ tftpsubs.c @@@@ -18,7 +18,7 @@@@ */ #ifndef lint -static char sccsid[] = "@@(#)tftpsubs.c 5.5 (Berkeley) 6/1/90"; +char subs_sccsid[] = "@@(#)tftpsubs.c 5.5 (Berkeley) 6/1/90"; #endif /* not lint */ /* Simple minded read-ahead/write-behind subroutines for tftp user and @@@@ -38,12 +38,16 @@@@ static char sccsid[] = "@@(#)tftpsubs.c 5 #include #include #include +#ifdef __sun +#include +#endif +#include -#define PKTSIZE SEGSIZE+4 /* should be moved to tftp.h */ +#define BUF_PKTSIZE SEGSIZE+4 /* should be moved to tftp.h */ struct bf { int counter; /* size of data in buffer, or flag */ - char buf[PKTSIZE]; /* room for data packet */ + char buf[BUF_PKTSIZE]; /* room for data packet */ } bfs[2]; /* Values for bf.counter */ @@@@ -58,8 +62,12 @@@@ static int current; /* index of buff int newline = 0; /* fillbuf: in middle of newline expansion */ int prevchar = -1; /* putbuf: previous char (cr check) */ +void read_ahead(FILE *, int); +int write_behind(FILE *, int); + struct tftphdr *rw_init(); + struct tftphdr *w_init() { return rw_init(0); } /* write-behind */ struct tftphdr *r_init() { return rw_init(1); } /* read-ahead */ @@@@ -80,6 +88,7 @@@@ int x; /* zero for writ /* Have emptied current buffer by sending to net and getting ack. Free it and return next buffer filled with data. */ +int readit(file, dpp, convert) FILE *file; /* file opened for read */ struct tftphdr **dpp; @@@@ -93,7 +102,7 @@@@ readit(file, dpp, convert) b = &bfs[current]; /* look at new buffer */ if (b->counter == BF_FREE) /* if it's empty */ read_ahead(file, convert); /* fill it */ -/* assert(b->counter != BF_FREE); /* check */ +/* assert(b->counter != BF_FREE); check */ *dpp = (struct tftphdr *)b->buf; /* set caller's ptr */ return b->counter; } @@@@ -102,6 +111,7 @@@@ readit(file, dpp, convert) * fill the input buffer, doing ascii conversions if requested * conversions are lf -> cr,lf and cr -> cr, nul */ +void read_ahead(file, convert) FILE *file; /* file opened for read */ int convert; /* if true, convert to ascii */ @@@@ -150,9 +160,11 @@@@ read_ahead(file, convert) from the queue. Calls write_behind only if next buffer not available. */ +int writeit(file, dpp, ct, convert) FILE *file; struct tftphdr **dpp; + int ct; int convert; { bfs[current].counter = ct; /* set size of data to write */ @@@@ -170,6 +182,7 @@@@ writeit(file, dpp, ct, convert) * Note spec is undefined if we get CR as last byte of file or a * CR followed by anything else. In this case we leave it alone. */ +int write_behind(file, convert) FILE *file; int convert; @@@@ -233,9 +246,9 @@@@ synchnet(f) int f; /* socket to flush */ { int i, j = 0; - char rbuf[PKTSIZE]; + char rbuf[BUF_PKTSIZE]; struct sockaddr_in from; - int fromlen; + socklen_t fromlen; while (1) { (void) ioctl(f, FIONREAD, &i); @ 1.2 log @Added compatibility fixes for NetBSD/FreeBSD/Linux/Solaris provided by Yakovetsky Vladimir in PR pkg/36942. Shut up warning by pkglint (PLIST). Introduced PKGMANDIR in software Makefile. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 2003/09/21 09:15:31 jmc Exp $ d3 3 a5 1 --- tftpsubs.c.orig 1994-10-05 06:20:49.000000000 +0100 d7 10 a16 1 @@@@ -38,12 +38,15 @@@@ static char sccsid[] = "@@(#)tftpsubs.c 5 d23 1 d35 59 a93 1 @@@@ -233,7 +236,7 @@@@ synchnet(f) d100 2 a101 1 int fromlen; d103 2 @ 1.1 log @Rename some #define's so they don't conflict with some definitions from arpa.h @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 3 --- tftpsubs.c.orig 2003-09-21 04:09:09.000000000 +0000 +++ tftpsubs.c 2003-09-21 04:10:08.000000000 +0000 @@@@ -39,11 +39,11 @@@@ d9 3 d23 1 a23 1 @@@@ -233,7 +233,7 @@@@ @