head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.134 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.132 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.130 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.128 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.126 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.124 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.122 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.120 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.118 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.116 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.114 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.112 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.110 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.108 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.106 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.104 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.102 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.100 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.98 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.96 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.94 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.92 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.90 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.86 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.66 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.88 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.84 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.82 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.80 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.78 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.76 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.74 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.72 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.70 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.68 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.64 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.62 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.60 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.58 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.56 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.54 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.52 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.50 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.48 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.46 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.44 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.42 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.40 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.38 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.36 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.34 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.32 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.30 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.28 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.26 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.24 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.22 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.20 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.18 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.16 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.14 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.12 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.10 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.8 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.6 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.4 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.2 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.1.0.36 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.34 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.32 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.30 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.28 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.26 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.24 pkgsrc-2008Q1:1.1.0.22 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.20 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.18 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.16 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.14 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.12 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.10 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.8 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.6 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2009.08.30.17.16.54; author schmonz; state Exp; branches; next 1.1; 1.1 date 2005.07.15.22.25.58; author kristerw; state Exp; branches; next ; desc @@ 1.2 log @Pull in patches from Debian 2.1-5, mainly for the 64-bit fix. Bump PKGREVISION. @ text @$NetBSD: patch-ab,v 1.1 2005/07/15 22:25:58 kristerw Exp $ --- cvsps.c.orig 2009-08-30 13:07:32.000000000 -0400 +++ cvsps.c @@@@ -265,7 +265,8 @@@@ static void load_from_cvs() PatchSetMember * psm = NULL; char datebuff[20]; char authbuff[AUTH_STR_MAX]; - char logbuff[LOG_STR_MAX + 1]; + int logbufflen = LOG_STR_MAX + 1; + char * logbuff = malloc(logbufflen); int loglen = 0; int have_log = 0; char cmd[BUFSIZ]; @@@@ -273,6 +274,12 @@@@ static void load_from_cvs() char use_rep_buff[PATH_MAX]; char * ltype; + if (logbuff == NULL) + { + debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen); + exit(1); + } + if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG)) { ltype = "rlog"; @@@@ -480,24 +487,22 @@@@ static void load_from_cvs() */ if (have_log || !is_revision_metadata(buff)) { - /* if the log buffer is full, that's it. - * - * Also, read lines (fgets) always have \n in them - * which we count on. So if truncation happens, - * be careful to put a \n on. - * - * Buffer has LOG_STR_MAX + 1 for room for \0 if - * necessary - */ - if (loglen < LOG_STR_MAX) + /* If the log buffer is full, try to reallocate more. */ + if (loglen < logbufflen) { int len = strlen(buff); - if (len >= LOG_STR_MAX - loglen) + if (len >= logbufflen - loglen) { - debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log"); - len = LOG_STR_MAX - loglen; - buff[len - 1] = '\n'; + debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename); + logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); + char * newlogbuff = realloc(logbuff, logbufflen); + if (newlogbuff == NULL) + { + debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen); + exit(1); + } + logbuff = newlogbuff; } debug(DEBUG_STATUS, "appending %s to log", buff); @ 1.1 log @Fix C99 variable declarations to make this pkg build with gcc 2.95. @ text @d1 1 a1 1 $NetBSD$ d3 15 a17 3 --- cvsps.c.orig Sat Jul 16 00:22:10 2005 +++ cvsps.c Sat Jul 16 00:22:40 2005 @@@@ -2550,9 +2550,9 @@@@ d19 7 a25 1 for (next = ps->members.next; next != &ps->members; next = next->next) d27 36 a62 4 + int d1, d2; PatchSetMember * psm = list_entry(next, PatchSetMember, link); rev = psm->pre_rev; - int d1, d2; d64 1 a64 2 /* the reason this is at all complicated has to do with a * branch off of a branch. it is possible (and indeed @