Merging upstream version 4.23.0.

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

1 files changed, 146 insertions, 22 deletions

diff --git a/templates/man2/getdents.2.pot b/templates/man2/getdents.2.pot
index 0e9adea2..310b5bb0 100644
--- a/templates/man2/getdents.2.pot
+++ b/templates/man2/getdents.2.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 16:57+0100\n"
+"POT-Creation-Date: 2024-06-01 05:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,15 +24,15 @@ msgid "getdents"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-10-31"
+msgid "2024-05-02"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable
 #, no-wrap
-msgid "Linux man-pages 6.06"
+msgid "Linux man-pages 6.8"
 msgstr ""
 
 #. type: SH
@@ -158,13 +158,12 @@ msgid "The I<linux_dirent> structure is declared as follows:"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "struct linux_dirent {\n"
 "    unsigned long  d_ino;     /* Inode number */\n"
-"    unsigned long  d_off;     /* Offset to next I<linux_dirent> */\n"
+"    unsigned long  d_off;     /* Not an offset; see below */\n"
 "    unsigned short d_reclen;  /* Length of this I<linux_dirent> */\n"
 "    char           d_name[];  /* Filename (null-terminated) */\n"
 "                      /* length is actually (d_reclen - 2 -\n"
@@ -178,12 +177,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
-"I<d_ino> is an inode number.  I<d_off> is the distance from the start of the "
-"directory to the start of the next I<linux_dirent>.  I<d_reclen> is the size "
-"of this entire I<linux_dirent>.  I<d_name> is a null-terminated filename."
+"I<d_ino> is an inode number.  I<d_off> is a filesystem-specific value with "
+"no specific meaning to user space, though on older filesystems it used to be "
+"the distance from the start of the directory to the start of the next "
+"I<linux_dirent>; see B<readdir>(3)B<.> I<d_reclen> is the size of this "
+"entire I<linux_dirent>.  I<d_name> is a null-terminated filename."
 msgstr ""
 
 #. type: Plain text
@@ -347,13 +347,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "struct linux_dirent64 {\n"
 "    ino64_t        d_ino;    /* 64-bit inode number */\n"
-"    off64_t        d_off;    /* 64-bit offset to next structure */\n"
+"    off64_t        d_off;    /* Not an offset; see getdents() */\n"
 "    unsigned short d_reclen; /* Size of this dirent */\n"
 "    unsigned char  d_type;   /* File type */\n"
 "    char           d_name[]; /* Filename (null-terminated) */\n"
@@ -559,8 +558,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"
@@ -571,6 +569,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>unistd.hE<gt>\n"
 "\\&\n"
 "struct linux_dirent {\n"
@@ -653,6 +652,46 @@ msgid "Linux man-pages 6.03"
 msgstr ""
 
 #. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid ""
+"struct linux_dirent {\n"
+"    unsigned long  d_ino;     /* Inode number */\n"
+"    unsigned long  d_off;     /* Offset to next I<linux_dirent> */\n"
+"    unsigned short d_reclen;  /* Length of this I<linux_dirent> */\n"
+"    char           d_name[];  /* Filename (null-terminated) */\n"
+"                      /* length is actually (d_reclen - 2 -\n"
+"                         offsetof(struct linux_dirent, d_name)) */\n"
+"    /*\n"
+"    char           pad;       // Zero padding byte\n"
+"    char           d_type;    // File type (only since Linux\n"
+"                              // 2.6.4); offset is (d_reclen - 1)\n"
+"    */\n"
+"}\n"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"I<d_ino> is an inode number.  I<d_off> is the distance from the start of the "
+"directory to the start of the next I<linux_dirent>.  I<d_reclen> is the size "
+"of this entire I<linux_dirent>.  I<d_name> is a null-terminated filename."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid ""
+"struct linux_dirent64 {\n"
+"    ino64_t        d_ino;    /* 64-bit inode number */\n"
+"    off64_t        d_off;    /* 64-bit offset to next structure */\n"
+"    unsigned short d_reclen; /* Size of this dirent */\n"
+"    unsigned char  d_type;   /* File type */\n"
+"    char           d_name[]; /* Filename (null-terminated) */\n"
+"};\n"
+msgstr ""
+
+#. type: Plain text
 #: debian-bookworm
 msgid ""
 "Library support for B<getdents64>()  was added in glibc 2.30; glibc does not "
@@ -769,15 +808,94 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "2023-05-03"
+msgid "2023-10-31"
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.06"
+msgstr ""
+
+#. type: Plain text
+#: fedora-40 fedora-rawhide mageia-cauldron
+#, no-wrap
+msgid ""
+"#define _GNU_SOURCE\n"
+"#include E<lt>dirent.hE<gt>     /* Defines DT_* constants */\n"
+"#include E<lt>err.hE<gt>\n"
+"#include E<lt>fcntl.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>unistd.hE<gt>\n"
+"\\&\n"
+"struct linux_dirent {\n"
+"    unsigned long  d_ino;\n"
+"    off_t          d_off;\n"
+"    unsigned short d_reclen;\n"
+"    char           d_name[];\n"
+"};\n"
+"\\&\n"
+"#define BUF_SIZE 1024\n"
+"\\&\n"
+"int\n"
+"main(int argc, char *argv[])\n"
+"{\n"
+"    int                  fd;\n"
+"    char                 d_type;\n"
+"    char                 buf[BUF_SIZE];\n"
+"    long                 nread;\n"
+"    struct linux_dirent  *d;\n"
+"\\&\n"
+"    fd = open(argc E<gt> 1 ? argv[1] : \".\", O_RDONLY | O_DIRECTORY);\n"
+"    if (fd == -1)\n"
+"        err(EXIT_FAILURE, \"open\");\n"
+"\\&\n"
+"    for (;;) {\n"
+"        nread = syscall(SYS_getdents, fd, buf, BUF_SIZE);\n"
+"        if (nread == -1)\n"
+"            err(EXIT_FAILURE, \"getdents\");\n"
+"\\&\n"
+"        if (nread == 0)\n"
+"            break;\n"
+"\\&\n"
+"        printf(\"--------------- nread=%ld ---------------\\en\", nread);\n"
+"        printf(\"inode#    file type  d_reclen  d_off   d_name\\en\");\n"
+"        for (size_t bpos = 0; bpos E<lt> nread;) {\n"
+"            d = (struct linux_dirent *) (buf + bpos);\n"
+"            printf(\"%8lu  \", d-E<gt>d_ino);\n"
+"            d_type = *(buf + bpos + d-E<gt>d_reclen - 1);\n"
+"            printf(\"%-10s \", (d_type == DT_REG) ?  \"regular\" :\n"
+"                             (d_type == DT_DIR) ?  \"directory\" :\n"
+"                             (d_type == DT_FIFO) ? \"FIFO\" :\n"
+"                             (d_type == DT_SOCK) ? \"socket\" :\n"
+"                             (d_type == DT_LNK) ?  \"symlink\" :\n"
+"                             (d_type == DT_BLK) ?  \"block dev\" :\n"
+"                             (d_type == DT_CHR) ?  \"char dev\" : \"???\");\n"
+"            printf(\"%4d %10jd  %s\\en\", d-E<gt>d_reclen,\n"
+"                   (intmax_t) d-E<gt>d_off, d-E<gt>d_name);\n"
+"            bpos += d-E<gt>d_reclen;\n"
+"        }\n"
+"    }\n"
+"\\&\n"
+"    exit(EXIT_SUCCESS);\n"
+"}\n"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "2024-02-25"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
 msgstr ""
 
 #. type: TH
@@ -791,3 +909,9 @@ msgstr ""
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr ""