diff -urP 1.0/ws.sh/bin/mkws 1.0.1/ws.sh/bin/mkws
--- 1.0/ws.sh/bin/mkws Wed Jun 24 11:20:30 2020
+++ 1.0.1/ws.sh/bin/mkws Fri Jul 10 23:15:24 2020
@@ -2,34 +2,34 @@
PATH=./bin:$PATH
usage() {
- >&2 printf "usage: %s url [path]\n" "$(basename "$0")"
- exit 1
+ >&2 printf "usage: %s url [path]\n" "$(basename "$0")"
+ exit 1
}
test $# -lt 1 && usage
srcdir=${2:-.}
-shareddir=${MKWSTHEMEDIR:-"$srcdir"/share}
+sharedir=${MKWSTHEMEDIR:-"$srcdir"/share}
LANG=${LANG:-en_US.UTF-8}
-if ! test -f $srcdir/index.upphtml
+if ! test -f "$srcdir"/index.upphtml
then
- >&2 printf "no index.upphtml file found\n"
- exit 1
+ >&2 printf "no index.upphtml file found\n"
+ exit 1
fi
echo "Making theme.css"
-pp "$shareddir"/theme.uppcss "$1" > theme.css
+pp "$sharedir"/theme.uppcss "$1" > theme.css
-for t in $srcdir/*.upphtml
+for t in "$srcdir"/*.upphtml
do
- echo "Making $(basename ${t%.upphtml}.html)"
- pp "$shareddir"/l.upphtml "$t" "$1" > \
- "$(basename ${t%.upphtml}.html)"
+ echo "Making $(basename "${t%.upphtml}".html)"
+ pp "$sharedir"/l.upphtml "$t" "$1" > \
+ "$(basename "${t%.upphtml}".html)"
done
echo "Making sitemap.xml"
-pp "$shareddir"/sitemap.uppxml "$1" > sitemap.xml
+pp "$sharedir"/sitemap.uppxml "$1" > sitemap.xml
echo "Making robots.txt"
-pp "$shareddir"/robots.upptxt "$1" > robots.txt
+pp "$sharedir"/robots.upptxt "$1" > robots.txt
Binary files 1.0/ws.sh/bin/stat and 1.0.1/ws.sh/bin/stat differ
diff -urP 1.0/ws.sh/share/l.upphtml 1.0.1/ws.sh/share/l.upphtml
--- 1.0/ws.sh/share/l.upphtml Wed Jun 24 11:20:30 2020
+++ 1.0.1/ws.sh/share/l.upphtml Fri Jul 10 23:15:24 2020
@@ -9,7 +9,8 @@
-
+
diff -urP 1.0/ws.sh/share/man/man1/stat.1 1.0.1/ws.sh/share/man/man1/stat.1
--- 1.0/ws.sh/share/man/man1/stat.1 Thu Jan 1 02:00:00 1970
+++ 1.0.1/ws.sh/share/man/man1/stat.1 Fri Jul 10 23:15:25 2020
@@ -0,0 +1,488 @@
+.\" $OpenBSD: stat.1,v 1.23 2018/03/16 16:58:26 schwarze Exp $
+.\" $NetBSD: stat.1,v 1.11 2003/05/08 13:07:10 wiz Exp $
+.\"
+.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Andrew Brown and Jan Schaumann.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: March 16 2018 $
+.Dt STAT 1
+.Os
+.Sh NAME
+.Nm stat
+.Nd display file status
+.Sh SYNOPSIS
+.Nm
+.Op Fl FLnq
+.Oo
+.Fl f Ar format |
+.Fl l | r | s | x
+.Oc
+.Op Fl t Ar timefmt
+.Op Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility displays information about the file pointed to by
+.Ar file .
+Read, write, or execute permissions of the named file are not required, but
+all directories listed in the pathname leading to the file must be
+searchable.
+If no argument is given,
+.Nm
+displays information about the file descriptor for standard input.
+.Pp
+The information displayed is obtained by calling
+.Xr lstat 2
+with the given argument and evaluating the returned structure.
+The default format displays the
+.Fa st_dev ,
+.Fa st_ino ,
+.Fa st_mode ,
+.Fa st_nlink ,
+.Fa st_uid ,
+.Fa st_gid ,
+.Fa st_rdev ,
+.Fa st_size ,
+.Fa st_atime ,
+.Fa st_mtime ,
+.Fa st_ctime ,
+.Fa st_blksize ,
+.Fa st_blocks ,
+and
+.Fa st_flags
+fields, in that order.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl F
+As in
+.Xr ls 1 ,
+display a slash (/) immediately after each pathname that is a directory, an
+asterisk (*) after each that is executable, an at sign (@) after each symbolic
+link, an equal sign (=) after each socket, and a vertical bar (|) after each
+that is a FIFO.
+The use of
+.Fl F
+implies
+.Fl l .
+.It Fl f Ar format
+Display information using the specified format.
+See the
+.Sx FORMATS
+section for a description of valid formats.
+.It Fl L
+Use
+.Xr stat 2
+instead of
+.Xr lstat 2 .
+The information reported by
+.Nm
+will refer to the target of
+.Ar file ,
+if file is a symbolic link, and not to
+.Ar file
+itself.
+.It Fl l
+Display output in
+.Ic ls Fl lT
+format.
+.It Fl n
+Do not force a newline to appear at the end of each piece of output.
+.It Fl q
+Suppress failure messages if calls to
+.Xr stat 2
+or
+.Xr lstat 2
+fail.
+.It Fl r
+Display raw information.
+That is, for all the fields in the stat-structure,
+display the raw, numerical value (for example, times in seconds since the
+Epoch, etc.).
+.It Fl s
+Format the output as a line of shell variable assignments.
+.It Fl t Ar timefmt
+Display timestamps using the specified format.
+This format is
+passed directly to
+.Xr strftime 3 .
+.It Fl x
+Display information in a more verbose way.
+.El
+.Ss FORMATS
+Format strings are similar to
+.Xr printf 3
+formats in that they start with
+.Cm % ,
+are then followed by a sequence of formatting characters, and end in
+a character that selects the field of the struct stat which is to be
+formatted.
+If the
+.Cm %
+is immediately followed by one of
+.Cm n ,
+.Cm t ,
+.Cm % ,
+or
+.Cm @ ,
+then a newline character, a tab character, a percent character,
+or the current file number is printed, otherwise the string is
+examined for the following:
+.Pp
+Any of the following optional flags:
+.Bl -tag -width Ds
+.It Cm #
+Selects an alternate output form for octal and hexadecimal output.
+Non-zero octal output will have a leading zero, and non-zero
+hexadecimal output will have
+.Sq 0x
+prepended to it.
+.It Cm +
+Asserts that a sign indicating whether a number is positive or negative
+should always be printed.
+Non-negative numbers are not usually printed
+with a sign.
+.It Cm -
+Aligns string output to the left of the field, instead of to the right.
+.It Cm 0
+Sets the fill character for left padding to the 0 character, instead of
+a space.
+.It space
+Reserves a space at the front of non-negative signed output fields.
+A
+.Sq Cm +
+overrides a space if both are used.
+.El
+.Pp
+Then the following fields:
+.Bl -tag -width Ds
+.It Cm size
+An optional decimal digit string specifying the minimum field width.
+.It Cm prec
+An optional precision composed of a decimal point
+.Sq Cm \&.
+and a decimal digit string that indicates the maximum string length,
+the number of digits to appear after the decimal point in floating point
+output, or the minimum number of digits to appear in numeric output.
+.It Cm fmt
+An optional output format specifier which is one of
+.Cm D ,
+.Cm O ,
+.Cm U ,
+.Cm X ,
+.Cm F ,
+or
+.Cm S .
+These represent signed decimal output, octal output, unsigned decimal
+output, hexadecimal output, floating point output, and string output,
+respectively.
+Some output formats do not apply to all fields.
+Floating point output only applies to timespec fields (the
+.Cm a ,
+.Cm m ,
+and
+.Cm c
+fields).
+.Pp
+The special output specifier
+.Cm S
+may be used to indicate that the output, if
+applicable, should be in string format.
+May be used in combination with
+.Bl -tag -width Ds
+.It Cm amc
+Display date in
+.Xr strftime 3
+format.
+.It Cm dr
+Display actual device name.
+.It Cm gu
+Display group or user name.
+.It Cm p
+Display the mode of
+.Ar file
+as in
+.Ic ls -lTd .
+.It Cm N
+Displays the name of
+.Ar file .
+.It Cm T
+Displays the type of
+.Ar file .
+.It Cm Y
+Insert a
+.Dq "\ ->\ "
+into the output.
+Note that the default output format
+for
+.Cm Y
+is a string, but if specified explicitly, these four characters are
+prepended.
+.El
+.It Cm sub
+An optional sub field specifier (high, middle, low).
+Only applies to
+the
+.Cm p ,
+.Cm d ,
+.Cm r ,
+and
+.Cm T
+output formats.
+It can be one of the following:
+.Bl -tag -width Ds
+.It Cm H
+High \(em specifies the major number for devices from
+.Cm r
+or
+.Cm d ,
+the user bits for permissions from the string form of
+.Cm p ,
+the file type bits from the numeric forms of
+.Cm p ,
+and the long output form of
+.Cm T .
+.It Cm L
+Low \(em specifies the minor number for devices from
+.Cm r
+or
+.Cm d ,
+the other bits for permissions from the string form of
+.Cm p ,
+the user, group, and other bits from the numeric forms of
+.Cm p ,
+and the
+.Ic ls -F
+style output character for file type when used with
+.Cm T
+(the use of
+.Cm L
+for this is optional).
+.It Cm M
+Middle \(em specifies the group bits for permissions from the
+string output form of
+.Cm p ,
+or the
+suid, sgid, and sticky bits for the numeric forms of
+.Cm p .
+.El
+.It Cm datum
+A required field specifier, being one of the following:
+.Bl -tag -width Ds
+.It Cm d
+Device upon which
+.Ar file
+resides
+.Pq Fa st_dev .
+.It Cm i
+.Ar file Ns 's
+inode number
+.Pq Fa st_ino .
+.It Cm p
+File type and permissions
+.Pq Fa st_mode .
+.It Cm l
+Number of hard links to
+.Ar file
+.Pq Fa st_nlink .
+.It Cm u , g
+User-id and group-id of
+.Ar file Ns 's
+owner
+.Pq Fa st_uid , st_gid .
+.It Cm r
+Device number for character and block device special files
+.Pq Fa st_rdev .
+.It Cm a , m , c , B
+The time
+.Ar file
+was last accessed or modified, or when the inode was last changed, or
+the birth time of the inode
+.Pq Fa st_atime , st_mtime , st_ctime , st_birthtime .
+If the file system does not support birth time, the value is undefined.
+.It Cm z
+The size of
+.Ar file
+in bytes
+.Pq Fa st_size .
+.It Cm b
+Number of blocks allocated for
+.Ar file
+.Pq Fa st_blocks .
+.It Cm k
+Optimal file system I/O operation block size
+.Pq Fa st_blksize .
+.It Cm f
+User defined flags for
+.Ar file
+.Pq Fa st_flags .
+.It Cm v
+Inode generation number
+.Pq Fa st_gen .
+.El
+.Pp
+The following four field specifiers are not drawn directly from the
+data in struct stat, but are:
+.Bl -tag -width Ds
+.It Cm N
+The name of the file.
+.It Cm T
+The file type, either as in
+.Ic ls -F
+or in a more descriptive form if the sub field specifier
+.Cm H
+is given.
+.It Cm Y
+The target of a symbolic link.
+.It Cm Z
+Expands to
+.Ar major , Ns Ar minor
+from the rdev field for character or block
+special devices and gives size output for all others.
+.El
+.El
+.Pp
+Only the
+.Cm %
+and the field specifier are required.
+Most field specifiers default to
+.Cm U
+as an output form, with the
+exception of
+.Cm p
+which defaults to
+.Cm O ;
+.Cm a , m ,
+and
+.Cm c
+which default to
+.Cm D ;
+and
+.Cm Y , T ,
+and
+.Cm N ,
+which default to
+.Cm S .
+.Sh EXIT STATUS
+.Ex -std stat
+.Sh EXAMPLES
+Given a symbolic link
+.Pa foo
+that points from
+.Pa /tmp/foo
+to
+.Pa / ,
+you would use
+.Nm
+as follows:
+.Bd -literal -offset indent
+\*(Gt stat -F /tmp/foo
+lrwxrwxrwx 1 jschauma cs 1 Apr 24 16:37:28 2002 /tmp/foo@ -\*(Gt /
+
+\*(Gt stat -LF /tmp/foo
+drwxr-xr-x 16 root wheel 512 Apr 19 10:57:54 2002 /tmp/foo/
+.Ed
+.Pp
+To initialize some shell-variables, you could use the
+.Fl s
+flag as follows:
+.Bd -literal -offset indent
+\*(Gt csh
+% eval set `stat -s .cshrc`
+% echo $st_size $st_mtime
+1148 1015432481
+
+\*(Gt sh
+$ eval $(stat -s .profile)
+$ echo $st_size $st_mtime
+1148 1015432481
+.Ed
+.Pp
+In order to get a list of the kind of files including files pointed to if the
+file is a symbolic link, you could use the following format:
+.Bd -literal -offset indent
+$ stat -f "%N: %HT%SY" /tmp/*
+/tmp/bar: Symbolic Link -\*(Gt /tmp/foo
+/tmp/output25568: Regular File
+/tmp/blah: Directory
+/tmp/foo: Symbolic Link -\*(Gt /
+.Ed
+.Pp
+In order to get a list of the devices, their types and the major and minor
+device numbers, formatted with tabs and linebreaks, you could use the
+following format:
+.Bd -literal -offset 4n
+stat -f "Name: %N%n%tType: %HT%n%tMajor: %Hr%n%tMinor: %Lr%n%n" /dev/*
+[...]
+Name: /dev/xfs0
+ Type: Character Device
+ Major: 51
+ Minor: 0
+
+Name: /dev/zero
+ Type: Character Device
+ Major: 2
+ Minor: 12
+.Ed
+.Pp
+In order to determine the permissions set on a file separately, you could use
+the following format:
+.Bd -literal -offset indent
+\*(Gt stat -f "%Sp -\*(Gt owner=%SHp group=%SMp other=%SLp" .
+drwxr-xr-x -\*(Gt owner=rwx group=r-x other=r-x
+.Ed
+.Pp
+In order to determine the three files that have been modified most recently,
+you could use the following format:
+.Bd -literal -offset indent
+\*(Gt stat -f "%m%t%Sm %N" /tmp/* | sort -rn | head -3 | cut -f2-
+Apr 25 11:47:00 2002 /tmp/blah
+Apr 25 10:36:34 2002 /tmp/bar
+Apr 24 16:47:35 2002 /tmp/foo
+.Ed
+.Sh SEE ALSO
+.Xr file 1 ,
+.Xr ls 1 ,
+.Xr readlink 1 ,
+.Xr lstat 2 ,
+.Xr readlink 2 ,
+.Xr stat 2 ,
+.Xr printf 3 ,
+.Xr strftime 3
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Ox 3.8 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+utility was written by
+.An Andrew Brown Aq Mt atatat@NetBSD.org .
+This man page was written by
+.An Jan Schaumann Aq Mt jschauma@NetBSD.org .
diff -urP 1.0/ws.sh/share/robots.upptxt 1.0.1/ws.sh/share/robots.upptxt
--- 1.0/ws.sh/share/robots.upptxt Wed Jun 24 11:20:30 2020
+++ 1.0.1/ws.sh/share/robots.upptxt Fri Jul 10 23:15:24 2020
@@ -1,2 +1,2 @@
-user-agent: *
-sitemap: "$1"/sitemap.xml
+user-agent: \\*
+sitemap: $1/sitemap.xml
diff -urP 1.0/ws.sh/share/sitemap.uppxml 1.0.1/ws.sh/share/sitemap.uppxml
--- 1.0/ws.sh/share/sitemap.uppxml Wed Jun 24 11:20:30 2020
+++ 1.0.1/ws.sh/share/sitemap.uppxml Fri Jul 10 23:15:24 2020
@@ -5,7 +5,7 @@
do
#!
- $1/$(basename $f)
+ $1/$(basename "$f")$(stat -f '%Sm' -t '%Y-%m-%dT%H:%M:%SZ' "$f")1.0