Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 115 insertions, 21 deletions

diff --git a/po/ru/man2/kcmp.2.po b/po/ru/man2/kcmp.2.po
index b7e5fd9a..b84d97e0 100644
--- a/po/ru/man2/kcmp.2.po
+++ b/po/ru/man2/kcmp.2.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:59+0100\n"
+"POT-Creation-Date: 2024-06-01 05:59+0200\n"
 "PO-Revision-Date: 2019-10-05 08:18+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -16,9 +16,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
-"(n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: TH
@@ -29,16 +29,17 @@ msgid "kcmp"
 msgstr "kcmp"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-10-31"
-msgstr "31 октября 2023 г."
+msgid "2024-05-02"
+msgstr "2 мая 2024 г."
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-#, no-wrap
-msgid "Linux man-pages 6.06"
-msgstr "Linux man-pages 6.06"
+#: archlinux debian-unstable
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages 6.8"
+msgstr "Linux man-pages 6.7"
 
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -626,7 +627,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "NOTES"
-msgstr "ЗАМЕЧАНИЯ"
+msgstr "ПРИМЕЧАНИЯ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -704,8 +705,7 @@ msgid "Program source"
 msgstr "Исходный код программы"
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "#define _GNU_SOURCE\n"
@@ -716,6 +716,7 @@ msgid ""
 "#include E<lt>stdio.hE<gt>\n"
 "#include E<lt>stdlib.hE<gt>\n"
 "#include E<lt>sys/syscall.hE<gt>\n"
+"#include E<lt>sys/types.hE<gt>\n"
 "#include E<lt>sys/wait.hE<gt>\n"
 "#include E<lt>unistd.hE<gt>\n"
 "\\&\n"
@@ -790,7 +791,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "СМ. ТАКЖЕ"
+msgstr "СМОТРИТЕ ТАКЖЕ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -1077,16 +1078,102 @@ msgstr ""
 "}\n"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
+#, no-wrap
+msgid "2023-10-31"
+msgstr "31 октября 2023 г."
+
+#. type: TH
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "2023-05-03"
-msgstr "3 мая 2023 г."
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
+
+#. type: Plain text
+#: fedora-40 fedora-rawhide mageia-cauldron
+#, no-wrap
+msgid ""
+"#define _GNU_SOURCE\n"
+"#include E<lt>err.hE<gt>\n"
+"#include E<lt>fcntl.hE<gt>\n"
+"#include E<lt>linux/kcmp.hE<gt>\n"
+"#include E<lt>stdint.hE<gt>\n"
+"#include E<lt>stdio.hE<gt>\n"
+"#include E<lt>stdlib.hE<gt>\n"
+"#include E<lt>sys/syscall.hE<gt>\n"
+"#include E<lt>sys/wait.hE<gt>\n"
+"#include E<lt>unistd.hE<gt>\n"
+"\\&\n"
+"static int\n"
+"kcmp(pid_t pid1, pid_t pid2, int type,\n"
+"     unsigned long idx1, unsigned long idx2)\n"
+"{\n"
+"    return syscall(SYS_kcmp, pid1, pid2, type, idx1, idx2);\n"
+"}\n"
+"\\&\n"
+"static void\n"
+"test_kcmp(char *msg, pid_t pid1, pid_t pid2, int fd_a, int fd_b)\n"
+"{\n"
+"    printf(\"\\et%s\\en\", msg);\n"
+"    printf(\"\\et\\etkcmp(%jd, %jd, KCMP_FILE, %d, %d) ==E<gt> %s\\en\",\n"
+"           (intmax_t) pid1, (intmax_t) pid2, fd_a, fd_b,\n"
+"           (kcmp(pid1, pid2, KCMP_FILE, fd_a, fd_b) == 0) ?\n"
+"                        \"same\" : \"different\");\n"
+"}\n"
+"\\&\n"
+"int\n"
+"main(void)\n"
+"{\n"
+"    int                fd1, fd2, fd3;\n"
+"    static const char  pathname[] = \"/tmp/kcmp.test\";\n"
+"\\&\n"
+"    fd1 = open(pathname, O_CREAT | O_RDWR, 0600);\n"
+"    if (fd1 == -1)\n"
+"        err(EXIT_FAILURE, \"open\");\n"
+"\\&\n"
+"    printf(\"Parent PID is %jd\\en\", (intmax_t) getpid());\n"
+"    printf(\"Parent opened file on FD %d\\en\\en\", fd1);\n"
+"\\&\n"
+"    switch (fork()) {\n"
+"    case -1:\n"
+"        err(EXIT_FAILURE, \"fork\");\n"
+"\\&\n"
+"    case 0:\n"
+"        printf(\"PID of child of fork() is %jd\\en\", (intmax_t) getpid());\n"
+"\\&\n"
+"        test_kcmp(\"Compare duplicate FDs from different processes:\",\n"
+"                  getpid(), getppid(), fd1, fd1);\n"
+"\\&\n"
+"        fd2 = open(pathname, O_CREAT | O_RDWR, 0600);\n"
+"        if (fd2 == -1)\n"
+"            err(EXIT_FAILURE, \"open\");\n"
+"        printf(\"Child opened file on FD %d\\en\", fd2);\n"
+"\\&\n"
+"        test_kcmp(\"Compare FDs from distinct open()s in same process:\",\n"
+"                  getpid(), getpid(), fd1, fd2);\n"
+"\\&\n"
+"        fd3 = dup(fd1);\n"
+"        if (fd3 == -1)\n"
+"            err(EXIT_FAILURE, \"dup\");\n"
+"        printf(\"Child duplicated FD %d to create FD %d\\en\", fd1, fd3);\n"
+"\\&\n"
+"        test_kcmp(\"Compare duplicated FDs in same process:\",\n"
+"                  getpid(), getpid(), fd1, fd3);\n"
+"        break;\n"
+"\\&\n"
+"    default:\n"
+"        wait(NULL);\n"
+"    }\n"
+"\\&\n"
+"    exit(EXIT_SUCCESS);\n"
+"}\n"
+msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-rawhide
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
 #. type: TH
 #: opensuse-leap-15-6
@@ -1099,3 +1186,10 @@ msgstr "30 марта 2023 г."
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr "Linux man-pages 6.04"
+
+#. type: TH
+#: opensuse-tumbleweed
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages (unreleased)"
+msgstr "Linux man-pages 6.7"