head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.118 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.116 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.114 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.112 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.110 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.108 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.106 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.104 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.102 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.100 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.98 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.96 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.94 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.92 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.90 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.88 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.86 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.84 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.82 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.80 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.78 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.76 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.74 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.70 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.50 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.72 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.68 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.66 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.64 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.62 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.60 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.58 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.56 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.54 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.52 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.48 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.46 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.44 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.42 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.40 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.38 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.36 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.34 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.32 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.30 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.28 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.26 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.24 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.22 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.20 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.18 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.16 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.14 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.12 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.10 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.8 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @# @; 1.1 date 2011.10.01.21.42.16; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Buildlink with curses correctly. Fix build. Add patch comments. PKGREVISION -> 2. @ text @$NetBSD$ - use const for clean build - don't use sprintf (or perror) - fix wrong printf formats --- fed/misc.c.orig 1995-10-07 21:44:49.000000000 +0000 +++ fed/misc.c @@@@ -46,14 +46,15 @@@@ #include "fed.h" -#include -#include #include #include +#include +#include +#include static unsigned char *fonttab; /* ptr to font in core memory */ -static char *bitmask[] = { +static const char *bitmask[] = { "....", /* 0 */ "...*", /* 1 */ "..*.", /* 2 */ @@@@ -83,22 +84,17 @@@@ void readfont(char *filename) FILE *in; struct stat sbuf, *sbp; int ret; - char buffer[1024]; sbp = &sbuf; if((in = fopen(filename, "r")) == NULL) { - sprintf(buffer, "cannot open file %s for reading", filename); - perror(buffer); - exit(1); + err(1, "cannot open file %s for reading", filename); } if((fstat(fileno(in), sbp)) != 0) { - sprintf(buffer, "cannot fstat file %s", filename); - perror(buffer); - exit(1); + err(1, "cannot fstat file %s", filename); } switch(sbp->st_size) @@@@ -129,7 +125,7 @@@@ void readfont(char *filename) break; default: - fprintf(stderr,"error, file %s is no valid font file, size=%d\n",filename,sbp->st_size); + fprintf(stderr,"error, file %s is no valid font file, size=%lld\n",filename,(long long)sbp->st_size); exit(1); } @@@@ -144,9 +140,7 @@@@ void readfont(char *filename) if((ret = fread(fonttab, sizeof(*fonttab), sbp->st_size, in)) != sbp->st_size) { - sprintf(buffer,"error reading file %s, size = %d, ret = %d\n",filename,sbp->st_size, ret); - perror(buffer); - exit(1); + err(1, "error reading file %s, size = %lld, ret = %d\n",filename,(long long)sbp->st_size, ret); } } @@@@ -156,8 +150,7 @@@@ void readfont(char *filename) void writefont() { FILE *in, *out; - int ret; - char buffer[1024]; + size_t ret; if((in = fopen(lfilename, "r")) != NULL) { @@@@ -168,9 +161,7 @@@@ void writefont() strcat(wfn, ".BAK"); if((out = fopen(wfn, "w")) == NULL) { - sprintf(buffer, "cannot open file %s for writing", wfn); - perror(buffer); - exit(1); + err(1, "cannot open file %s for writing", wfn); } while(( c = fgetc(in) ) != EOF ) @@@@ -182,23 +173,19 @@@@ void writefont() if((out = fopen(lfilename, "w")) == NULL) { - sprintf(buffer, "cannot open file %s for writing", lfilename); - perror(buffer); - exit(1); + err(1, "cannot open file %s for writing", lfilename); } if((ret = fwrite(fonttab, sizeof(*fonttab), lfilesize, out)) != lfilesize) { - sprintf(buffer,"error writing file %s, size=%d, ret=%d\n",lfilename,lfilesize, ret); - perror(buffer); - exit(1); + err(1, "error writing file %s, size=%d, ret=%lu\n",lfilename,lfilesize, ret); } } /*---------------------------------------------------------------------------* * display a string *---------------------------------------------------------------------------*/ -void dis_cmd(char *strg) +void dis_cmd(const char *strg) { move(22,0); clrtoeol(); @