git: lpr.1: Tweak a bit about '-i' option

2022-02-19 Thread Aaron LI


commit 6dcbde115ef3af3193b5d80b0f87f916d9d21b65
Author: Aaron LI 
Date:   Sat Feb 19 17:53:05 2022 +0800

lpr.1: Tweak a bit about '-i' option

I made a mistake so that I lost this change in a rebase...

Reviewed-by: swildner

Summary of changes:
 usr.sbin/lpr/lpr/lpr.1 | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6dcbde115ef3af3193b5d80b0f87f916d9d21b65


-- 
DragonFly BSD source repository


git: getopt.3: Clarify option string syntax

2022-02-19 Thread Aaron LI


commit cd85487ee5969aac1c1a34258daf05c3e598d591
Author: Aaron LI 
Date:   Sat Feb 19 17:36:13 2022 +0800

getopt.3: Clarify option string syntax

The recently added 'option::' syntax requires the following argument
(if present) *must* be in the same word as the option name itself
(e.g., "-x").  This is different than the normal 'option:' syntax,
for which the argument may have a leading white space (e.g., "-x ").
Update the man page to explicitly describe the syntax.

Update to use a list to describe the 3 types of option string syntaxes
with examples.

Summary of changes:
 lib/libc/stdlib/getopt.3 | 53 
 1 file changed, 36 insertions(+), 17 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/cd85487ee5969aac1c1a34258daf05c3e598d591


-- 
DragonFly BSD source repository


git: lpr(1): Fix '-i' option with optional argument

2022-02-19 Thread Aaron LI


commit 7a1c99d311f1595cdc33d2ea3804d7fe580e1d87
Author: Aaron LI 
Date:   Sat Feb 19 17:53:05 2022 +0800

lpr(1): Fix '-i' option with optional argument

lpr(1)'s '-i' option accepts an optional argument, but the
implementation was incomplete.  For example, 'lpr -i -#3' errors with:
'Bad argument to -i, number expected'.

However, because the argument to '-i' option can have a leading white
space (i.e., '-i 4'), we can't use getopt(3)'s new 'option::' feature
here.  Fix the code in another way inspired by dma(8) (see
'libexec/dma/dma.c').

In addition, update the usage text as well as the man page.

Summary of changes:
 usr.sbin/lpr/lpr/lpr.1 | 12 
 usr.sbin/lpr/lpr/lpr.c | 16 
 2 files changed, 20 insertions(+), 8 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/7a1c99d311f1595cdc33d2ea3804d7fe580e1d87


-- 
DragonFly BSD source repository


git: sys/vfs/msdosfs: Fix mounting when the device sector size is >512B

2022-02-19 Thread Tomohiro Kusumi


commit 08e120530f425098d15b0861e92d67afcb80d220
Author: Tomohiro Kusumi 
Date:   Sat Feb 19 02:10:06 2022 +0900

sys/vfs/msdosfs: Fix mounting when the device sector size is >512B

HugeSectors * BytesPerSec should be computed before converting
HugeSectors to a DEV_BSIZE-based count.

taken-from FreeBSD c7cd607a4e28233ab6679ee330c0a4836414bb0a

Summary of changes:
 sys/vfs/msdosfs/msdosfs_vfsops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/08e120530f425098d15b0861e92d67afcb80d220


-- 
DragonFly BSD source repository


git: sys/vfs/hammer2: Fix hammer2_chain_allocs calculation

2022-02-19 Thread Tomohiro Kusumi


commit 263688eb126867928a2c8f7672a81c5bb53f63f6
Author: Tomohiro Kusumi 
Date:   Sat Feb 19 02:12:38 2022 +0900

sys/vfs/hammer2: Fix hammer2_chain_allocs calculation

This counter should be decremented on freeing chains.
Currently it gets incremented on chain allocation,
but only decremented via bulkfree path.

Summary of changes:
 sys/vfs/hammer2/hammer2_chain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/263688eb126867928a2c8f7672a81c5bb53f63f6


-- 
DragonFly BSD source repository