Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(1): quote closing bracket in error message #1346

Merged
merged 7 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/test/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@
p++;
if (strcmp(p, "[") == 0) {
if (strcmp(argv[--argc], "]") != 0)
error("missing ]");
error("missing ']'");
argv[argc] = NULL;
}

Check warning on line 204 in bin/test/test.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 204 in bin/test/test.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 204 in bin/test/test.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 204 in bin/test/test.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 204 in bin/test/test.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 204 in bin/test/test.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
/* no expression => false */
if (--argc <= 0)
return 1;
Expand Down
4 changes: 2 additions & 2 deletions etc/mtree/BSD.include.dist
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,15 @@
..
netinet6
..
netipsec
..
netlink
route
..
..
netipsec
..
netpfil
pf
..

Check warning on line 321 in etc/mtree/BSD.include.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 321 in etc/mtree/BSD.include.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 321 in etc/mtree/BSD.include.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 321 in etc/mtree/BSD.include.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 321 in etc/mtree/BSD.include.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 321 in etc/mtree/BSD.include.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
..
netsmb
..
Expand Down
12 changes: 6 additions & 6 deletions etc/mtree/BSD.tests.dist
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
..
usr.sbin
dtrace
amd64
arrays
..
..
common
aggs
..
Expand Down Expand Up @@ -269,10 +273,6 @@
ustack
..
..
amd64
arrays
..
..
..
zfsd
..
Expand Down Expand Up @@ -1201,15 +1201,15 @@
..
tsort
..
units
..
unifdef
..
uniq
..
units
..
unzip
..
vmstat

Check warning on line 1212 in etc/mtree/BSD.tests.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 1212 in etc/mtree/BSD.tests.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 1212 in etc/mtree/BSD.tests.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 1212 in etc/mtree/BSD.tests.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 1212 in etc/mtree/BSD.tests.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 1212 in etc/mtree/BSD.tests.dist

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
..
wc
..
Expand Down
72 changes: 38 additions & 34 deletions sbin/adjkerntz/adjkerntz.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.\" Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
.\"-
.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
Expand All @@ -22,12 +25,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd March 8, 2012
.Dd July 29, 2024
.Dt ADJKERNTZ 8
.Os
.Sh NAME
.Nm adjkerntz
.Nd adjust the local time CMOS clock to reflect time zone changes and keep the current timezone offset for the kernel
.Nd adjust real-time clock (rtc) and kernel timezone offset
.Sh SYNOPSIS
.Nm
.Fl i
Expand All @@ -37,7 +40,7 @@
The
.Nm
utility maintains the proper relationship between the kernel clock, which
is always set to UTC and the CMOS clock, which may be set to local time.
is always set to UTC and the real-time clock, which may be set to local time.
The
.Nm
utility also informs the kernel about machine timezone shifts in order to
Expand All @@ -51,21 +54,21 @@
timestamps.
If the file
.Pa /etc/wall_cmos_clock
exists, it means that the CMOS clock keeps local time (MS-DOS and MS-Windows
compatible mode).
If that file does not exist, it means that the CMOS clock keeps UTC time.
exists, it means that the real-time clock keeps local time
.Pq MS-DOS and MS-Windows compatible mode .
If that file does not exist, it means that the real-time clock keeps UTC time.
The
.Nm
utility passes this state to the
.Pa machdep.wall_cmos_clock
.Va machdep.wall_cmos_clock
kernel variable.
.Pp
Adjustments may be needed at system startup and shutdown, and
whenever a time zone change occurs.
To handle these different situations,
.Nm
is invoked in two ways:
.Bl -tag -width 4n
.Bl -tag -width "-a [-s]"
.It Fl i
This form handles system startups and shutdowns.
The
Expand All @@ -76,66 +79,66 @@
The
.Nm
utility puts itself into the background.
Then, for a local time CMOS clock,
Then, for a local time real-time clock,
.Nm
reads the local time from it
and sets the kernel clock to the corresponding UTC time.
The
.Nm
utility also stores the local time zone offset in the
.Pa machdep.adjkerntz
.Va machdep.adjkerntz
kernel variable, for use by subsequent invocations of
.Em "'adjkerntz -a'"
.Ql adjkerntz -a
and by local time file systems.
.Pp
For a local time CMOS clock
.Em "'adjkerntz -i'"
For a local time real-time clock
.Ql adjkerntz -i
pauses and remains inactive as a background daemon until it
receives a SIGTERM.
The SIGTERM will normally be sent by
.Xr init 8
when the system leaves multi-user mode (usually, because the system
is being shut down).
when the system leaves multi-user mode
.Pq usually, because the system is being shut down .
After receiving the SIGTERM,
.Nm
reads the UTC kernel clock and updates the CMOS clock, if necessary,
reads the UTC kernel clock and updates the real-time clock, if necessary,
to ensure that it reflects the current local time zone.
Then
.Nm
exits.
.It Fl a Op Fl s
This form is used to update the local time CMOS clock and kernel
.Pa machdep.adjkerntz
variable when time zone changes occur,
This form is used to update the local time real-time clock and
.Va machdep.adjkerntz
kernel variable when time zone changes occur,
e.g., when entering or leaving daylight savings time.
The
.Nm
utility uses the kernel clock's UTC time,
the previously stored
time zone offset, and the changed time zone rule to
calculate a new time zone offset.
the previously stored time zone offset,
and the changed time zone rule to calculate a new time zone offset.
It stores the new offset into the
.Pa machdep.adjkerntz
kernel variable and updates the wall CMOS clock to the new local time.
.Va machdep.adjkerntz
kernel variable and updates the wall real-time clock to the new local time.
If
.Em "'adjkerntz -a'"
was started at a nonexistent time (during a timezone change), it exits
with a warning diagnostic unless the
.Ql adjkerntz -a
was started at a nonexistent time
.Pq during a timezone change ,
it exits with a warning diagnostic unless the
.Fl s
option was used, in which case
.Nm
sleeps 30 minutes and tries again.
.Pp
This form should be invoked from root's
.Xr crontab 5
every half hour between midnight and 5am, when most modern time
zone changes occur.
every half hour between midnight and 5am,
when most modern time zone changes occur.
Warning: do not use the
.Fl s
option in a
.Xr crontab 5
command line, or multiple
.Em "'adjkerntz -a'"
.Ql adjkerntz -a
instances could conflict with each other.
.El
.Pp
Expand All @@ -145,7 +148,7 @@
in the UTC time zone.
Super-user privileges are required for all operations.
.Sh ENVIRONMENT
.Bl -tag -width Fl
.Bl -tag -width /etc/wall_cmos_clock
.It Ev TZ
Time zone change rule, see
.Xr tzset 3 ;
Expand All @@ -164,8 +167,8 @@
.Xr zic 8 .
.It Pa /etc/wall_cmos_clock
Empty file.
Its presence indicates that the machine's CMOS clock is set to local
time, while its absence indicates a UTC CMOS clock.
Its presence indicates that the machine's real-time clock is set to local
time, while its absence indicates a UTC real-time clock.
.El
.Sh DIAGNOSTICS
No diagnostics.
Expand All @@ -178,9 +181,10 @@
.Xr tzset 3 ,
.Xr crontab 5 ,
.Xr mount_msdosfs 8 ,
.Xr ntpd 8 ,
.Xr rc 8 ,
.Xr sysctl 8 ,
.Xr tzsetup 8 ,

Check warning on line 187 in sbin/adjkerntz/adjkerntz.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 187 in sbin/adjkerntz/adjkerntz.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 187 in sbin/adjkerntz/adjkerntz.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 187 in sbin/adjkerntz/adjkerntz.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 187 in sbin/adjkerntz/adjkerntz.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 187 in sbin/adjkerntz/adjkerntz.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
.Xr zic 8
.Sh HISTORY
The
Expand Down
6 changes: 4 additions & 2 deletions sys/dev/gpio/bytgpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@
GPIO_PIN_MAP(40, 0)
};

static char *bytgpio_gpio_ids[] = { "INT33FC", NULL };

#define SUS_PINS nitems(bytgpio_sus_pins)

#define BYGPIO_PIN_REGISTER(sc, pin, r) ((sc)->sc_pinpad_map[(pin)].reg * 16 + (r))
Expand Down Expand Up @@ -538,12 +540,11 @@
static int
bytgpio_probe(device_t dev)
{
static char *gpio_ids[] = { "INT33FC", NULL };
int rv;

if (acpi_disabled("gpio"))
return (ENXIO);
rv = ACPI_ID_PROBE(device_get_parent(dev), dev, gpio_ids, NULL);
rv = ACPI_ID_PROBE(device_get_parent(dev), dev, bytgpio_gpio_ids, NULL);
if (rv <= 0)
device_set_desc(dev, "Intel Baytrail GPIO Controller");
return (rv);
Expand Down Expand Up @@ -675,3 +676,4 @@
DRIVER_MODULE(bytgpio, acpi, bytgpio_driver, 0, 0);
MODULE_DEPEND(bytgpio, acpi, 1, 1, 1);
MODULE_DEPEND(bytgpio, gpiobus, 1, 1, 1);
ACPI_PNP_INFO(bytgpio_gpio_ids);

Check warning on line 679 in sys/dev/gpio/bytgpio.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 679 in sys/dev/gpio/bytgpio.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 679 in sys/dev/gpio/bytgpio.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 679 in sys/dev/gpio/bytgpio.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 679 in sys/dev/gpio/bytgpio.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 679 in sys/dev/gpio/bytgpio.c

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
6 changes: 3 additions & 3 deletions usr.bin/netstat/netstat.1
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd August 14, 2023
.Dd July 29, 2024
.Dt NETSTAT 1
.Os
.Sh NAME
Expand Down Expand Up @@ -312,7 +312,7 @@
.It Fl b
Show the number of bytes in and out.
.It Fl d
Show the number of dropped packets.
Show the number of dropped output packets.
.It Fl h
Print all counters in human readable form.
.It Fl n
Expand Down Expand Up @@ -381,10 +381,10 @@
See
.Sx GENERAL OPTIONS .
.It Fl d
Show the number of dropped packets.
Show the number of dropped output packets.
.It Fl M
Use an alternative core.
See

Check warning on line 387 in usr.bin/netstat/netstat.1

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 387 in usr.bin/netstat/netstat.1

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 387 in usr.bin/netstat/netstat.1

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 387 in usr.bin/netstat/netstat.1

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 387 in usr.bin/netstat/netstat.1

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 387 in usr.bin/netstat/netstat.1

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
.Sx GENERAL OPTIONS .
.It Fl N
Use an alternative kernel image.
Expand Down
5 changes: 3 additions & 2 deletions usr.sbin/pw/pw.8
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd November 28, 2022
.Dd July 29, 2024
.Dt PW 8
.Os
.Sh NAME
Expand Down Expand Up @@ -837,10 +837,11 @@
or replace an existing membership list
.Pq in Cm groupmod .
.Ar memberlist
is a comma separated list of valid and existing user names or uids.
is a comma, space, or tab-separated list of valid and existing user names or
uids.
.It Fl m Ar newmembers
Similar to
.Fl M ,

Check warning on line 844 in usr.sbin/pw/pw.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 844 in usr.sbin/pw/pw.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 844 in usr.sbin/pw/pw.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 844 in usr.sbin/pw/pw.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 844 in usr.sbin/pw/pw.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

Check warning on line 844 in usr.sbin/pw/pw.8

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line
this option allows the
.Em addition
of existing users to a group without replacing the existing list of
Expand Down
Loading