Merging upstream version 4.23.0.

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

1 files changed, 174 insertions, 28 deletions

diff --git a/po/ru/man3/getgrouplist.3.po b/po/ru/man3/getgrouplist.3.po
index e4c7484b..ae79d432 100644
--- a/po/ru/man3/getgrouplist.3.po
+++ b/po/ru/man3/getgrouplist.3.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:57+0100\n"
+"POT-Creation-Date: 2024-06-01 05:52+0200\n"
 "PO-Revision-Date: 2019-10-05 08:06+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -17,9 +17,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
@@ -31,16 +31,17 @@ msgid "getgrouplist"
 msgstr "B<getgrouplist>()"
 
 #. 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
@@ -315,7 +316,7 @@ msgstr "Начиная с glibc 2.2.2:"
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "BUGS"
-msgstr "ДЕФЕКТЫ"
+msgstr "ОШИБКИ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -385,10 +386,10 @@ 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 ""
+"#include E<lt>errno.hE<gt>\n"
 "#include E<lt>grp.hE<gt>\n"
 "#include E<lt>pwd.hE<gt>\n"
 "#include E<lt>stdio.hE<gt>\n"
@@ -397,10 +398,10 @@ msgid ""
 "int\n"
 "main(int argc, char *argv[])\n"
 "{\n"
-"    int ngroups;\n"
-"    struct passwd *pw;\n"
-"    struct group *gr;\n"
-"    gid_t *groups;\n"
+"    int            ngroups;\n"
+"    gid_t          *groups;\n"
+"    struct group   *gr;\n"
+"    struct passwd  *pw;\n"
 "\\&\n"
 "    if (argc != 3) {\n"
 "        fprintf(stderr, \"Usage: %s E<lt>userE<gt> E<lt>ngroupsE<gt>\\en\", argv[0]);\n"
@@ -417,10 +418,14 @@ msgid ""
 "\\&\n"
 "    /* Fetch passwd structure (contains first group ID for user). */\n"
 "\\&\n"
+"    errno = 0;\n"
 "    pw = getpwnam(argv[1]);\n"
 "    if (pw == NULL) {\n"
-"        perror(\"getpwnam\");\n"
-"        exit(EXIT_SUCCESS);\n"
+"        if (errno)\n"
+"            perror(\"getpwnam\");\n"
+"        else\n"
+"            fprintf(stderr, \"no such user\\en\");\n"
+"        exit(EXIT_FAILURE);\n"
 "    }\n"
 "\\&\n"
 "    /* Retrieve group list. */\n"
@@ -434,7 +439,7 @@ msgid ""
 "    /* Display list of retrieved groups, along with group names. */\n"
 "\\&\n"
 "    fprintf(stderr, \"ngroups = %d\\en\", ngroups);\n"
-"    for (size_t j = 0; j E<lt> ngroups; j++) {\n"
+"    for (int j = 0; j E<lt> ngroups; j++) {\n"
 "        printf(\"%d\", groups[j]);\n"
 "        gr = getgrgid(groups[j]);\n"
 "        if (gr != NULL)\n"
@@ -452,7 +457,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
@@ -679,16 +684,150 @@ msgstr ""
 "}\n"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "2023-07-20"
-msgstr "20 июля 2023 г."
+msgid "2023-10-31"
+msgstr "31 октября 2023 г."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
+
+#. type: Plain text
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid ""
+"#include E<lt>grp.hE<gt>\n"
+"#include E<lt>pwd.hE<gt>\n"
+"#include E<lt>stdio.hE<gt>\n"
+"#include E<lt>stdlib.hE<gt>\n"
+"\\&\n"
+"int\n"
+"main(int argc, char *argv[])\n"
+"{\n"
+"    int ngroups;\n"
+"    struct passwd *pw;\n"
+"    struct group *gr;\n"
+"    gid_t *groups;\n"
+"\\&\n"
+"    if (argc != 3) {\n"
+"        fprintf(stderr, \"Usage: %s E<lt>userE<gt> E<lt>ngroupsE<gt>\\en\", argv[0]);\n"
+"        exit(EXIT_FAILURE);\n"
+"    }\n"
+"\\&\n"
+"    ngroups = atoi(argv[2]);\n"
+"\\&\n"
+"    groups = malloc(sizeof(*groups) * ngroups);\n"
+"    if (groups == NULL) {\n"
+"        perror(\"malloc\");\n"
+"        exit(EXIT_FAILURE);\n"
+"    }\n"
+"\\&\n"
+"    /* Fetch passwd structure (contains first group ID for user). */\n"
+"\\&\n"
+"    pw = getpwnam(argv[1]);\n"
+"    if (pw == NULL) {\n"
+"        perror(\"getpwnam\");\n"
+"        exit(EXIT_SUCCESS);\n"
+"    }\n"
+"\\&\n"
+"    /* Retrieve group list. */\n"
+"\\&\n"
+"    if (getgrouplist(argv[1], pw-E<gt>pw_gid, groups, &ngroups) == -1) {\n"
+"        fprintf(stderr, \"getgrouplist() returned -1; ngroups = %d\\en\",\n"
+"                ngroups);\n"
+"        exit(EXIT_FAILURE);\n"
+"    }\n"
+"\\&\n"
+"    /* Display list of retrieved groups, along with group names. */\n"
+"\\&\n"
+"    fprintf(stderr, \"ngroups = %d\\en\", ngroups);\n"
+"    for (size_t j = 0; j E<lt> ngroups; j++) {\n"
+"        printf(\"%d\", groups[j]);\n"
+"        gr = getgrgid(groups[j]);\n"
+"        if (gr != NULL)\n"
+"            printf(\" (%s)\", gr-E<gt>gr_name);\n"
+"        printf(\"\\en\");\n"
+"    }\n"
+"\\&\n"
+"    exit(EXIT_SUCCESS);\n"
+"}\n"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "2024-03-16"
+msgstr "16 марта 2024 г."
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
+
+#. type: Plain text
+#: fedora-rawhide
+#, no-wrap
+msgid ""
+"#include E<lt>grp.hE<gt>\n"
+"#include E<lt>pwd.hE<gt>\n"
+"#include E<lt>stdio.hE<gt>\n"
+"#include E<lt>stdlib.hE<gt>\n"
+"\\&\n"
+"int\n"
+"main(int argc, char *argv[])\n"
+"{\n"
+"    int            ngroups;\n"
+"    gid_t          *groups;\n"
+"    struct group   *gr;\n"
+"    struct passwd  *pw;\n"
+"\\&\n"
+"    if (argc != 3) {\n"
+"        fprintf(stderr, \"Usage: %s E<lt>userE<gt> E<lt>ngroupsE<gt>\\en\", argv[0]);\n"
+"        exit(EXIT_FAILURE);\n"
+"    }\n"
+"\\&\n"
+"    ngroups = atoi(argv[2]);\n"
+"\\&\n"
+"    groups = malloc(sizeof(*groups) * ngroups);\n"
+"    if (groups == NULL) {\n"
+"        perror(\"malloc\");\n"
+"        exit(EXIT_FAILURE);\n"
+"    }\n"
+"\\&\n"
+"    /* Fetch passwd structure (contains first group ID for user). */\n"
+"\\&\n"
+"    pw = getpwnam(argv[1]);\n"
+"    if (pw == NULL) {\n"
+"        perror(\"getpwnam\");\n"
+"        exit(EXIT_SUCCESS);\n"
+"    }\n"
+"\\&\n"
+"    /* Retrieve group list. */\n"
+"\\&\n"
+"    if (getgrouplist(argv[1], pw-E<gt>pw_gid, groups, &ngroups) == -1) {\n"
+"        fprintf(stderr, \"getgrouplist() returned -1; ngroups = %d\\en\",\n"
+"                ngroups);\n"
+"        exit(EXIT_FAILURE);\n"
+"    }\n"
+"\\&\n"
+"    /* Display list of retrieved groups, along with group names. */\n"
+"\\&\n"
+"    fprintf(stderr, \"ngroups = %d\\en\", ngroups);\n"
+"    for (int j = 0; j E<lt> ngroups; j++) {\n"
+"        printf(\"%d\", groups[j]);\n"
+"        gr = getgrgid(groups[j]);\n"
+"        if (gr != NULL)\n"
+"            printf(\" (%s)\", gr-E<gt>gr_name);\n"
+"        printf(\"\\en\");\n"
+"    }\n"
+"\\&\n"
+"    exit(EXIT_SUCCESS);\n"
+"}\n"
+msgstr ""
 
 #. type: TH
 #: opensuse-leap-15-6
@@ -701,3 +840,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"