head 1.3; access; symbols 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.74 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.72 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.70 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.68 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.66 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.64 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.62 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.60 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.58 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.56 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.54 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.52 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.3 date 2023.04.13.14.23.21; author wiz; state dead; branches; next 1.2; commitid FbpHANxLGSqggXkE; 1.2 date 2011.08.02.17.05.48; author joerg; state Exp; branches; next 1.1; 1.1 date 98.11.11.11.42.57; author agc; state Exp; branches; next ; desc @@ 1.3 log @psutils: remove obsolete patches @ text @$NetBSD: patch-ac,v 1.2 2011/08/02 17:05:48 joerg Exp $ Read papersize from a config file, rather than using a compiled-in default. --- psresize.c.orig 1997-03-11 22:53:03.000000000 +0000 +++ psresize.c @@@@ -14,6 +14,9 @@@@ * -H sets the input paper height * -Ppaper sets the input paper size (width and height) by name */ +#include +#include +#include #include "psutil.h" #include "psspec.h" @@@@ -46,7 +49,7 @@@@ static void argerror(void) #define MIN(x,y) ((x) > (y) ? (y) : (x)) #define MAX(x,y) ((x) > (y) ? (x) : (y)) -void main(int argc, char *argv[]) +int main(int argc, char *argv[]) { double scale, rscale; /* page scale */ double waste, rwaste; /* amount wasted */ @@@@ -56,13 +59,21 @@@@ void main(int argc, char *argv[]) double inheight = -1; Paper *paper; PageSpec *specs; + char papersize[BUFSIZ]; #ifdef PAPER - if ( (paper = findpaper(PAPER)) != (Paper *)0 ) { +#if (defined(BSD) && BSD >= 199306) + if (!readconfig(papersize, sizeof(papersize))) { + (void) strnncpy(papersize, sizeof(papersize), PAPER, strlen(PAPER)); + } +#else + (void) strnncpy(papersize, sizeof(papersize), PAPER, strlen(PAPER)); +#endif /* BSD */ + if ( (paper = findpaper(papersize)) != (Paper *)0 ) { inwidth = width = (double)PaperWidth(paper); inheight = height = (double)PaperHeight(paper); } -#endif +#endif /* PAPER */ vshift = hshift = 0; rotate = 0; @ 1.2 log @Fix main() definition. Fix prototype usage. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Read the config file only where necessary. Cross-reference setpapersize(1) from the relevant man pages. @ text @d5 3 a7 3 --- psresize.c 1998/11/11 09:37:52 1.1 +++ psresize.c 1998/11/11 10:31:11 @@@@ -14,6 +14,8 @@@@ d13 1 d17 10 a26 1 @@@@ -56,13 +58,21 @@@@ @