glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getdents: fix typos in array output

Browse Source 
Array should be enclosed by square brakets, and elements should be
separated by commas.

* dirent.c (SYS_FUNC(getdents), SYS_FUNC(getdents64)): Fix typos
in array output.
* tests/getdents.awk: Update regexps to match fixed output.
* tests/getdents.out: Update output.

Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
This commit is contained in:
Gabriel Laskar 2015-11-19 11:44:30 +01:00 committed by Dmitry V. Levin
parent f54cb96f7f
commit a2df1c12de
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dirent.c
View File

@ -92,7 +92,7 @@ SYS_FUNC(getdents)
}
if (!abbrev(tcp))
tprints("{");
tprints("[");
for (i = 0; len && i <= len - sizeof(struct kernel_dirent); ) {
struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
@ -105,7 +105,7 @@ SYS_FUNC(getdents)
d_name_len = D_NAME_LEN_MAX;
tprintf("%s{d_ino=%lu, d_off=%lu, d_reclen=%u, d_name=",
i ? " " : "", d->d_ino, d->d_off, d->d_reclen);
i ? ", " : "", d->d_ino, d->d_off, d->d_reclen);
if (print_quoted_string(d->d_name, d_name_len,
QUOTE_0_TERMINATED) > 0) {
@ -127,7 +127,7 @@ SYS_FUNC(getdents)
i += d->d_reclen;
}
if (!abbrev(tcp))
tprints("}");
tprints("]");
else
tprintf("/* %u entries */", dents);
tprintf(", %lu", tcp->u_arg[2]);
@ -175,7 +175,7 @@ SYS_FUNC(getdents64)
}
if (!abbrev(tcp))
tprints("{");
tprints("[");
for (i = 0; len && i <= len - d_name_offset; ) {
struct dirent64 *d = (struct dirent64 *) &buf[i];
if (!abbrev(tcp)) {
@ -191,7 +191,7 @@ SYS_FUNC(getdents64)
tprintf("%s{d_ino=%" PRIu64 ", d_off=%" PRId64
", d_reclen=%u, d_type=",
i ? " " : "",
i ? ", " : "",
d->d_ino,
d->d_off,
d->d_reclen);
@ -213,7 +213,7 @@ SYS_FUNC(getdents64)
dents++;
}
if (!abbrev(tcp))
tprints("}");
tprints("]");
else
tprintf("/* %u entries */", dents);
tprintf(", %lu", tcp->u_arg[2]);

30
tests/getdents.awk
View File

@ -20,28 +20,28 @@ BEGIN {
dirent64_2 = "\\{" d_ino ", " d_off ", " d_reclen ", " d_type_dir ", " d_name_2 "\\}"
dirent64_3 = "\\{" d_ino ", " d_off ", " d_reclen ", " d_type_reg ", " d_name_3 "\\}"
d_123 = dirent_1 " " dirent_2 " " dirent_3
d_213 = dirent_2 " " dirent_1 " " dirent_3
d_132 = dirent_1 " " dirent_3 " " dirent_2
d_321 = dirent_3 " " dirent_2 " " dirent_1
d_231 = dirent_2 " " dirent_3 " " dirent_1
d_312 = dirent_3 " " dirent_1 " " dirent_2
d_123 = dirent_1 ", " dirent_2 ", " dirent_3
d_213 = dirent_2 ", " dirent_1 ", " dirent_3
d_132 = dirent_1 ", " dirent_3 ", " dirent_2
d_321 = dirent_3 ", " dirent_2 ", " dirent_1
d_231 = dirent_2 ", " dirent_3 ", " dirent_1
d_312 = dirent_3 ", " dirent_1 ", " dirent_2
d64_123 = dirent64_1 " " dirent64_2 " " dirent64_3
d64_213 = dirent64_2 " " dirent64_1 " " dirent64_3
d64_132 = dirent64_1 " " dirent64_3 " " dirent64_2
d64_321 = dirent64_3 " " dirent64_2 " " dirent64_1
d64_231 = dirent64_2 " " dirent64_3 " " dirent64_1
d64_312 = dirent64_3 " " dirent64_1 " " dirent64_2
d64_123 = dirent64_1 ", " dirent64_2 ", " dirent64_3
d64_213 = dirent64_2 ", " dirent64_1 ", " dirent64_3
d64_132 = dirent64_1 ", " dirent64_3 ", " dirent64_2
d64_321 = dirent64_3 ", " dirent64_2 ", " dirent64_1
d64_231 = dirent64_2 ", " dirent64_3 ", " dirent64_1
d64_312 = dirent64_3 ", " dirent64_1 ", " dirent64_2
dents = "\\{(" d_123 "|" d_213 "|" d_132 "|" d_321 "|" d_231 "|" d_312 ")\\}"
dents64 = "\\{(" d64_123 "|" d64_213 "|" d64_132 "|" d64_321 "|" d64_231 "|" d64_312 ")\\}"
dents = "\\[(" d_123 "|" d_213 "|" d_132 "|" d_321 "|" d_231 "|" d_312 ")\\]"
dents64 = "\\[(" d64_123 "|" d64_213 "|" d64_132 "|" d64_321 "|" d64_231 "|" d64_312 ")\\]"
getdents = "getdents\\(" i ", " dents ", " len "\\)"
getdents64 = "getdents64\\(" i ", " dents64 ", " len "\\)"
r[1] = "^(" getdents "|" getdents64 ") += " len "$"
r[2] = "^getdents(64)?\\([0-9]+, \\{\\}, [1-9][0-9]+\\) += 0$"
r[2] = "^getdents(64)?\\([0-9]+, \\[\\], [1-9][0-9]+\\) += 0$"
s[3] = "+++ exited with 0 +++"
lines = 3

4
tests/getdents.out
View File

@ -1,3 +1,3 @@
getdents(3, {{d_ino=123456789, d_off=1, d_reclen=24, d_name=".", d_type=DT_DIR} {d_ino=234567890, d_off=2, d_reclen=24, d_name="..", d_type=DT_DIR} {d_ino=345678901, d_off=3, d_reclen=280, d_name="A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nZ", d_type=DT_REG}}, 4096) = 328
getdents(3, {}, 4096) = 0
getdents(3, [{d_ino=123456789, d_off=1, d_reclen=24, d_name=".", d_type=DT_DIR}, {d_ino=234567890, d_off=2, d_reclen=24, d_name="..", d_type=DT_DIR}, {d_ino=345678901, d_off=3, d_reclen=280, d_name="A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nZ", d_type=DT_REG}], 4096) = 328
getdents(3, [], 4096) = 0
+++ exited with 0 +++