OpenBSD CVS

CVS log for src/usr.sbin/wsfontload/wsfontload.c


[BACK] Up to [local] / src / usr.sbin / wsfontload

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.26 / (download) - annotate - [select for diffs], Sun Dec 4 23:50:51 2022 UTC (18 months ago) by cheloha
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, HEAD
Changes since 1.25: +1 -2 lines
Diff to previous 1.25 (colored)

userspace: remove vestigial '?' cases from top-level getopt(3) loops

getopt(3) returns '?' when it encounters a flag not present in the in
the optstring or if a flag is missing its option argument.  We can
handle this case with the "default" failure case with no loss of
legibility.  Hence, remove all the redundant "case '?':" lines.

Prompted by dlg@.  With help from dlg@ and millert@.

Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2

ok naddy@ millert@ dlg@

Revision 1.25 / (download) - annotate - [select for diffs], Mon Oct 25 19:54:29 2021 UTC (2 years, 7 months ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)

Zap unused variables/functions under /usr/src/*bin/

OK deraadt

Revision 1.24 / (download) - annotate - [select for diffs], Sun Oct 24 21:24:19 2021 UTC (2 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

For open/openat, if the flags parameter does not contain O_CREAT, the
3rd (variadic) mode_t parameter is irrelevant.  Many developers in the past
have passed mode_t (0, 044, 0644, or such), which might lead future people
to copy this broken idiom, and perhaps even believe this parameter has some
meaning or implication or application. Delete them all.
This comes out of a conversation where tb@ noticed that a strange (but
intentional) pledge behaviour is to always knock-out high-bits from
mode_t on a number of system calls as a safety factor, and his bewilderment
that this appeared to be happening against valid modes (at least visually),
but no sorry, they are all irrelevant junk.  They could all be 0xdeafbeef.
ok millert

Revision 1.23 / (download) - annotate - [select for diffs], Wed Aug 5 13:56:06 2020 UTC (3 years, 10 months ago) by fcambus
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.22: +10 -16 lines
Diff to previous 1.22 (colored)

Get the default values for font height and width in wsfontload(8) using
the WSDISPLAYIO_GETSCREENTYPE ioctl. This ensures that they always match
the currently loaded font metrics.

Previously, wsfontload(8) hardcoded the default height and width values
for the font to be loaded as 12x22 when using framebuffer consoles, and
as 8x16 when in text mode. The 12x22 value wasn't correct in case we
felt back to the smaller 8x16 font for screen widths smaller than 960px,
and wasn't valid anymore since we replaced Gallant 12x22 by Spleen 12x24
on all architectures but sparc64.

OK jcs@, mpi@

Revision 1.22 / (download) - annotate - [select for diffs], Mon Jul 20 14:09:24 2020 UTC (3 years, 10 months ago) by fcambus
Branch: MAIN
Changes since 1.21: +6 -4 lines
Diff to previous 1.21 (colored)

Add a new column to wsfontload -l output, to report the number of
characters contained in a loaded font.

It's especially useful with user loaded fonts as they can contain
more than 256 characters.

OK sthen@

Revision 1.21 / (download) - annotate - [select for diffs], Fri Jun 28 13:32:51 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.20 / (download) - annotate - [select for diffs], Wed Aug 23 09:15:33 2017 UTC (6 years, 9 months ago) by fcambus
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.19: +1 -7 lines
Diff to previous 1.19 (colored)

Switch from 4-clause to 2-clause BSD license.

Matthias Drochner rescinded the third and fourth clauses of wsconscfg(8)
and wsfontload(8) licenses in 2008 in NetBSD.

https://mail-index.netbsd.org/source-changes/2008/05/26/msg206199.html

OK deraadt@

Revision 1.19 / (download) - annotate - [select for diffs], Thu Jun 22 20:38:32 2017 UTC (6 years, 11 months ago) by fcambus
Branch: MAIN
Changes since 1.18: +2 -1 lines
Diff to previous 1.18 (colored)

Close file descriptor on an exit path.

OK gsoares@

Revision 1.18 / (download) - annotate - [select for diffs], Sat Jun 17 19:27:54 2017 UTC (6 years, 11 months ago) by fcambus
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

Since WSFONT_NAME_SIZE was switched from 16 to 32, account for the
change in wsfontload as well: tweak spacing and printf format string.

OK deraadt@, mpi@

Revision 1.17 / (download) - annotate - [select for diffs], Thu Jun 15 11:48:49 2017 UTC (6 years, 11 months ago) by fcambus
Branch: MAIN
Changes since 1.16: +1 -5 lines
Diff to previous 1.16 (colored)

We do not support iso7 nor pcvt encoding, so remove macro definitions
and commented entries.

OK mlarkin@

Revision 1.16 / (download) - annotate - [select for diffs], Sun Sep 6 20:07:46 2015 UTC (8 years, 9 months ago) by tobias
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.15: +5 -4 lines
Diff to previous 1.15 (colored)

UINT_MAX would overflow the integer calculation later on, leading to
floating point exception just like -1 would do. Use INT_MAX, which is
already way too high to make sense anyway.

Revision 1.15 / (download) - annotate - [select for diffs], Sun Sep 6 19:56:43 2015 UTC (8 years, 9 months ago) by tobias
Branch: MAIN
Changes since 1.14: +14 -12 lines
Diff to previous 1.14 (colored)

Avoid floating point exception when an invalid font width was specified.
Also print actually helpful error messages when command line arguments
are invalid.

ok miod@

Revision 1.14 / (download) - annotate - [select for diffs], Mon Feb 9 23:00:15 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

clean up flags++ instances around getopt()
ok florian

Revision 1.13 / (download) - annotate - [select for diffs], Sun Oct 20 16:09:25 2013 UTC (10 years, 7 months ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.12: +12 -9 lines
Diff to previous 1.12 (colored)

Report i/o errors on stdin as occuring on "stdin" not "(null)"...

Revision 1.12 / (download) - annotate - [select for diffs], Sun Oct 20 13:22:44 2013 UTC (10 years, 7 months ago) by miod
Branch: MAIN
Changes since 1.11: +55 -17 lines
Diff to previous 1.11 (colored)

If the font to load is not a file, compute the numbers of characters it
contains from its size, instead of assuming 256.

Default to 12x22 glyph instead of 8x16 if the display is a raster framer buffer
(as opposed to a VGA-compatible text mode).

Revision 1.11 / (download) - annotate - [select for diffs], Mon Aug 7 10:43:20 2006 UTC (17 years, 10 months ago) by kettenis
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.10: +1 -2 lines
Diff to previous 1.10 (colored)

Remove the Sony wsfonts from the list of fonts with special encoding.

requested by miod@

Revision 1.10 / (download) - annotate - [select for diffs], Fri May 27 05:03:47 2005 UTC (19 years ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.9: +5 -3 lines
Diff to previous 1.9 (colored)

include sys/time.h to get struct timeval

Revision 1.9 / (download) - annotate - [select for diffs], Tue Aug 3 09:45:29 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.8: +3 -4 lines
Diff to previous 1.8 (colored)

- kill a rake of unnecessary .Bk/.Ek macros
- simplify SYNOPSIS
- sort options
- adjust -width for FILES
- standard EXAMPLES format
- sync usage()

Revision 1.8 / (download) - annotate - [select for diffs], Sun Aug 1 18:32:21 2004 UTC (19 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.7: +3 -6 lines
Diff to previous 1.7 (colored)

ansi cleanup; khalek@linuxgamers.net

Revision 1.7 / (download) - annotate - [select for diffs], Fri Jul 9 16:22:04 2004 UTC (19 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

ansi

Revision 1.6 / (download) - annotate - [select for diffs], Sat Apr 19 23:50:06 2003 UTC (21 years, 1 month ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5, OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.5: +5 -6 lines
Diff to previous 1.5 (colored)

Sync usage() and man page; closes PR 3219

Revision 1.5 / (download) - annotate - [select for diffs], Sat Feb 16 21:28:10 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.4: +4 -4 lines
Diff to previous 1.4 (colored)

Part one of userland __P removal.  Done with a simple regexp with some minor hand editing to make comments line up correctly.  Another pass is forthcoming that handles the cases that could not be done automatically.

Revision 1.4 / (download) - annotate - [select for diffs], Wed Mar 14 02:51:36 2001 UTC (23 years, 3 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.3: +58 -20 lines
Diff to previous 1.3 (colored)

allow listing and soon deleting fonts; aaron@ ok

Revision 1.3 / (download) - annotate - [select for diffs], Tue Mar 13 03:10:21 2001 UTC (23 years, 3 months ago) by mickey
Branch: MAIN
Changes since 1.2: +10 -8 lines
Diff to previous 1.2 (colored)

better error messages, order getopt options

Revision 1.2 / (download) - annotate - [select for diffs], Tue Jan 30 06:50:12 2001 UTC (23 years, 4 months ago) by aaron
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)

Change /dev/ttyE* to /dev/ttyC* to reflect reality in OpenBSD.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Jul 2 01:29:44 2000 UTC (23 years, 11 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8

wscons font loader; initial import from netbsd tree

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.