head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.118 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.116 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.114 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.112 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.110 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.108 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.106 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.104 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.102 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.100 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.98 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.96 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.94 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.92 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.90 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.88 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.86 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.84 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.82 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.80 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.78 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.76 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.74 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.70 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.50 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.72 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.68 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.66 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.64 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.62 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.60 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.58 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.56 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.54 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.52 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.48 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.46 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.44 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.42 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.40 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.38 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.36 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.34 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.32 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.30 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.28 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.26 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.24 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.22 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.20 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.18 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.16 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.14 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.12 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.10 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.8 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.6 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.2 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.1.0.22 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.20 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.18 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.16 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.14 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.12 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.10 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.8 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.6 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.4 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.2 pkgsrc-2008Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2011.09.12.16.46.45; author taca; state Exp; branches; next 1.1; 1.1 date 2008.10.16.20.28.06; author bouyer; state Exp; branches; next ; desc @@ 1.2 log @* Fix build problem by using own getline(). * Add LICENSE. * Add comments to patch files. @ text @$NetBSD$ * Avoid using function name "getline" which conflict with system defined one. * Fix parameter to setsockopt(2). --- request.c.orig 2004-12-31 17:59:54.000000000 +0900 +++ request.c 2010-01-29 16:46:16.000000000 +0900 @@@@ -49,7 +49,7 @@@@ static int read_header(int, struct req *); static char sgetc(int); -static size_t getline(int, char[], int); +static size_t get_line(int, char[], int); static int do_request(int, struct req *); void @@@@ -63,7 +63,7 @@@@ (void) memset(&r, 0, sizeof(r)); r.cl = clinfo; - if (getline(cl, buf, sizeof(buf)) < 1) + if (get_line(cl, buf, sizeof(buf)) < 1) *buf = '\0'; if ((http_url(&r, buf)) == 0) { @@@@ -189,7 +189,7 @@@@ char *b, *p; i = 0; - while ((len = getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { + while ((len = get_line(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { b = buf; while (isspace((int) *b) && *(b++) != '\0'); if (*b == '\0') @@@@ -228,7 +228,7 @@@@ } static size_t -getline(int s, char buf[], int len) +get_line(int s, char buf[], int len) { int c; size_t i; @@@@ -288,7 +288,7 @@@@ extern struct cfg config; unsigned long ip; int s; - void *foo; + int val = 1; size_t len, i; char buf[4096]; @@@@ -371,7 +371,7 @@@@ if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) { DEBUG(("do_request() => socket() failed for %s port %d", r->host, r->port)); return E_CON; - } else if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &foo, sizeof(foo)) != 0) { + } else if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) != 0) { DEBUG(("do_request() => setsockopt() failed for %s port %d", r->host, r->port)); return E_CON; } else if (connect(s, (struct sockaddr *) & addr, sizeof(addr)) == -1) { @@@@ -493,7 +493,7 @@@@ } if (r->type != CONNECT) { i = 0; - while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { + while ((len = get_line(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { DEBUG(("do_request() => got remote header line: (%s)", buf)); r->header[i] = (char *) my_alloc(len + 1); (void) strcpy(r->header[i++], buf); @ 1.1 log @Fix parameters to setsockop() calls. Bump PKGREVISION. @ text @d1 44 a44 2 --- request.c.orig 2008-10-16 22:22:52.000000000 +0200 +++ request.c 2008-10-16 22:23:27.000000000 +0200 d63 9 @