From nobody Wed Jul 06 11:03:57 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BB79B1D00A12; Wed, 6 Jul 2022 11:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LdGrF3fsyz3NFL; Wed, 6 Jul 2022 11:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657105437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvObWxlhxnWKGCRMWulVh7paf5A7zjrqceDRkrqt2wc=; b=bpuxzfIvBQZY25b6onMc7eEtbUrMS5qNbjmW4el5i07kSuP3fw9Tkvx0ArPdkKVw9AZmKC zv51VxK2XoYUstuk9ir4FoDSKWb1swx+b+So0k/RiB0v62j6ZCylJ5G78M1ESS3ogrxqDR cyfS6IHh8GpFNwvmgrXDm6CrRe8C2KXaceGe10dH/LlQ+T5m0F8SFZERxe6iPTvNFkujMV 9Q6rT1PUhLBxqHiKJsumFKNYzAm3j4Q/MJZl8lXHkxVk0U88/yYe7zE31LWxQgzg6AHLPn Ghup/QUJ0ipHpTm12us7/AoKfRv24lb8i60ECS1n7Mc3hDERgMZ/lrpmyEbfJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F7E0191E5; Wed, 6 Jul 2022 11:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 266B3v8H096351; Wed, 6 Jul 2022 11:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266B3vie096350; Wed, 6 Jul 2022 11:03:57 GMT (envelope-from git) Date: Wed, 6 Jul 2022 11:03:57 GMT Message-Id: <202207061103.266B3vie096350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: aa54b10f0570 - stable/13 - libsysdecode: For future use extract common code to a separate files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa54b10f057095395f3a51697e1fb5fb2dbe1a24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657105437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvObWxlhxnWKGCRMWulVh7paf5A7zjrqceDRkrqt2wc=; b=ahbHVmigMtezKLv8SnwTBRewPgTOvPcQp6vb3sI2eZGDmfVZ3DfsOSSYyN2KF4M2hiLSh8 xFgaKr2sQY9z7rViTLAA91RwH1K7n9tvLgrpScqR67F4DOcogncsXTgqQnI8C28W/DZX2d qXi0CR6DdfojaIzEzSAhqe3qhxIYo8nbIYdANJXLPuUIJ8ZNE4JXa+0ZALY4XKo5FsZeuR 81CG4gYOpt0TguP+otfGfLZAxk+Xpb2L7muS/1ZRXHFOlzAz3kU83rRSlELYQla7fCrZTT DykOann1LHM8OKceUaiKQEnhynknH8aDZVIIUNEbSCg0EvmMd49Eb6S043eAlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657105437; a=rsa-sha256; cv=none; b=NHIrl5HwX5HG+lMmad3E1q+CxP8BNVPTOsPCVfRSqQFDeCKM5+DC8r63sdltQ+TME2F5t4 2AdJnc6Dk7I3J4hWJEB8I5Qk86cyloVJ3M49KwkNUw9OqFsTi5eyH/ZopSW80tqJ8VJUQw Bu2vAbj/D890R3LNrH9eno6dwyOugnebstUKTc2zw0vaZPgXxGvjPbvwGQfav46/nOc4i3 8R3WtXzcn4OTJOQylNHZVex2byWCoGU1AsvJrU5YhvIYdp9zlTWTSl0fZWQ8NUHKAcdmE1 /ZRh1zp8gpqGoYdh7ZhRnsVMAoAHI+B2Z4PaZHGRTu443eIuQNkGzyK2a4Ei0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=aa54b10f057095395f3a51697e1fb5fb2dbe1a24 commit aa54b10f057095395f3a51697e1fb5fb2dbe1a24 Author: Dmitry Chagin AuthorDate: 2022-06-22 10:12:21 +0000 Commit: Dmitry Chagin CommitDate: 2022-07-06 11:02:12 +0000 libsysdecode: For future use extract common code to a separate files Reviewed by: jhb, emaste Differential revision: https://reviews.freebsd.org/D35353 MFC after: 2 weeks (cherry picked from commit 9dac609629d4e0ba813df6169f8bd8383fca024f) --- lib/libsysdecode/Makefile | 2 +- lib/libsysdecode/flags.c | 159 +----------------------------------------- lib/libsysdecode/support.c | 168 +++++++++++++++++++++++++++++++++++++++++++++ lib/libsysdecode/support.h | 62 +++++++++++++++++ 4 files changed, 232 insertions(+), 159 deletions(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index 671c23d95a70..7f8175e7bd53 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -4,7 +4,7 @@ LIB= sysdecode -SRCS= errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c +SRCS= errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c support.c INCS= sysdecode.h CFLAGS+= -I${.OBJDIR} diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index f02c8dd8b339..c89c0ab75302 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -71,14 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * This is taken from the xlat tables originally in truss which were - * in turn taken from strace. - */ -struct name_table { - uintmax_t val; - const char *str; -}; +#include "support.h" #define X(a) { a, #a }, #define XEND { 0, NULL } @@ -93,156 +86,6 @@ struct name_table { #undef TABLE_ENTRY #undef TABLE_END -/* - * These are simple support macros. print_or utilizes a variable - * defined in the calling function to track whether or not it should - * print a logical-OR character ('|') before a string. if_print_or - * simply handles the necessary "if" statement used in many lines - * of this file. - */ -#define print_or(fp,str,orflag) do { \ - if (orflag) fputc(fp, '|'); else orflag = true; \ - fprintf(fp, str); } \ - while (0) -#define if_print_or(fp,i,flag,orflag) do { \ - if ((i & flag) == flag) \ - print_or(fp,#flag,orflag); } \ - while (0) - -static const char * -lookup_value(struct name_table *table, uintmax_t val) -{ - - for (; table->str != NULL; table++) - if (table->val == val) - return (table->str); - return (NULL); -} - -/* - * Used when the value maps to a bitmask of #definition values in the - * table. This is a helper routine which outputs a symbolic mask of - * matched masks. Multiple masks are separated by a pipe ('|'). - * The value is modified on return to only hold unmatched bits. - */ -static void -print_mask_part(FILE *fp, struct name_table *table, uintmax_t *valp, - bool *printed) -{ - uintmax_t rem; - - rem = *valp; - for (; table->str != NULL; table++) { - if ((table->val & rem) == table->val) { - /* - * Only print a zero mask if the raw value is - * zero. - */ - if (table->val == 0 && *valp != 0) - continue; - fprintf(fp, "%s%s", *printed ? "|" : "", table->str); - *printed = true; - rem &= ~table->val; - } - } - - *valp = rem; -} - -/* - * Used when the value maps to a bitmask of #definition values in the - * table. The return value is true if something was printed. If - * rem is not NULL, *rem holds any bits not decoded if something was - * printed. If nothing was printed and rem is not NULL, *rem holds - * the original value. - */ -static bool -print_mask_int(FILE *fp, struct name_table *table, int ival, int *rem) -{ - uintmax_t val; - bool printed; - - printed = false; - val = (unsigned)ival; - print_mask_part(fp, table, &val, &printed); - if (rem != NULL) - *rem = val; - return (printed); -} - -/* - * Used for a mask of optional flags where a value of 0 is valid. - */ -static bool -print_mask_0(FILE *fp, struct name_table *table, int val, int *rem) -{ - - if (val == 0) { - fputs("0", fp); - if (rem != NULL) - *rem = 0; - return (true); - } - return (print_mask_int(fp, table, val, rem)); -} - -/* - * Like print_mask_0 but for a unsigned long instead of an int. - */ -static bool -print_mask_0ul(FILE *fp, struct name_table *table, u_long lval, u_long *rem) -{ - uintmax_t val; - bool printed; - - if (lval == 0) { - fputs("0", fp); - if (rem != NULL) - *rem = 0; - return (true); - } - - printed = false; - val = lval; - print_mask_part(fp, table, &val, &printed); - if (rem != NULL) - *rem = val; - return (printed); -} - -static void -print_integer(FILE *fp, int val, int base) -{ - - switch (base) { - case 8: - fprintf(fp, "0%o", val); - break; - case 10: - fprintf(fp, "%d", val); - break; - case 16: - fprintf(fp, "0x%x", val); - break; - default: - abort2("bad base", 0, NULL); - break; - } -} - -static bool -print_value(FILE *fp, struct name_table *table, uintmax_t val) -{ - const char *str; - - str = lookup_value(table, val); - if (str != NULL) { - fputs(str, fp); - return (true); - } - return (false); -} - const char * sysdecode_atfd(int fd) { diff --git a/lib/libsysdecode/support.c b/lib/libsysdecode/support.c new file mode 100644 index 000000000000..0777ab28f52e --- /dev/null +++ b/lib/libsysdecode/support.c @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2006 "David Kirchner" . All rights reserved. + * + * 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 AUTHOR 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 AUTHOR 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. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include "support.h" + +const char * +lookup_value(struct name_table *table, uintmax_t val) +{ + + for (; table->str != NULL; table++) + if (table->val == val) + return (table->str); + return (NULL); +} + +/* + * Used when the value maps to a bitmask of #definition values in the + * table. This is a helper routine which outputs a symbolic mask of + * matched masks. Multiple masks are separated by a pipe ('|'). + * The value is modified on return to only hold unmatched bits. + */ +void +print_mask_part(FILE *fp, struct name_table *table, uintmax_t *valp, + bool *printed) +{ + uintmax_t rem; + + rem = *valp; + for (; table->str != NULL; table++) { + if ((table->val & rem) == table->val) { + /* + * Only print a zero mask if the raw value is + * zero. + */ + if (table->val == 0 && *valp != 0) + continue; + fprintf(fp, "%s%s", *printed ? "|" : "", table->str); + *printed = true; + rem &= ~table->val; + } + } + + *valp = rem; +} + +/* + * Used when the value maps to a bitmask of #definition values in the + * table. The return value is true if something was printed. If + * rem is not NULL, *rem holds any bits not decoded if something was + * printed. If nothing was printed and rem is not NULL, *rem holds + * the original value. + */ +bool +print_mask_int(FILE *fp, struct name_table *table, int ival, int *rem) +{ + uintmax_t val; + bool printed; + + printed = false; + val = (unsigned)ival; + print_mask_part(fp, table, &val, &printed); + if (rem != NULL) + *rem = val; + return (printed); +} + +/* + * Used for a mask of optional flags where a value of 0 is valid. + */ +bool +print_mask_0(FILE *fp, struct name_table *table, int val, int *rem) +{ + + if (val == 0) { + fputs("0", fp); + if (rem != NULL) + *rem = 0; + return (true); + } + return (print_mask_int(fp, table, val, rem)); +} + +/* + * Like print_mask_0 but for a unsigned long instead of an int. + */ +bool +print_mask_0ul(FILE *fp, struct name_table *table, u_long lval, u_long *rem) +{ + uintmax_t val; + bool printed; + + if (lval == 0) { + fputs("0", fp); + if (rem != NULL) + *rem = 0; + return (true); + } + + printed = false; + val = lval; + print_mask_part(fp, table, &val, &printed); + if (rem != NULL) + *rem = val; + return (printed); +} + +void +print_integer(FILE *fp, int val, int base) +{ + + switch (base) { + case 8: + fprintf(fp, "0%o", val); + break; + case 10: + fprintf(fp, "%d", val); + break; + case 16: + fprintf(fp, "0x%x", val); + break; + default: + abort2("bad base", 0, NULL); + break; + } +} + +bool +print_value(FILE *fp, struct name_table *table, uintmax_t val) +{ + const char *str; + + str = lookup_value(table, val); + if (str != NULL) { + fputs(str, fp); + return (true); + } + return (false); +} diff --git a/lib/libsysdecode/support.h b/lib/libsysdecode/support.h new file mode 100644 index 000000000000..fecb0bf1bb5e --- /dev/null +++ b/lib/libsysdecode/support.h @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2006 "David Kirchner" . All rights reserved. + * + * 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 AUTHOR 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 AUTHOR 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. + */ + +#ifndef __SYSDECODE_SUPPORT_H__ +#define __SYSDECODE_SUPPORT_H__ + +/* + * This is taken from the xlat tables originally in truss which were + * in turn taken from strace. + */ +struct name_table { + uintmax_t val; + const char *str; +}; + +/* + * These are simple support macros. print_or utilizes a variable + * defined in the calling function to track whether or not it should + * print a logical-OR character ('|') before a string. if_print_or + * simply handles the necessary "if" statement used in many lines + * of this file. + */ +#define print_or(fp,str,orflag) do { \ + if (orflag) fputc(fp, '|'); else orflag = true; \ + fprintf(fp, str); } \ + while (0) +#define if_print_or(fp,i,flag,orflag) do { \ + if ((i & flag) == flag) \ + print_or(fp,#flag,orflag); } \ + while (0) + +const char *lookup_value(struct name_table *, uintmax_t); +void print_integer(FILE *, int, int); +bool print_mask_0(FILE *, struct name_table *, int, int *); +bool print_mask_0ul(FILE *, struct name_table *, u_long, u_long *); +bool print_mask_int(FILE *, struct name_table *, int, int *); +void print_mask_part(FILE *, struct name_table *, uintmax_t *, bool *); +bool print_value(FILE *, struct name_table *, uintmax_t); + +#endif /* !__SYSDECODE_SUPPORT_H__ */