diff options
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/cmd/ccidadm/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/ccidadm/ccidadm.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/demangle/Makefile | 40 | ||||
| -rw-r--r-- | usr/src/cmd/demangle/demangle.c | 211 | ||||
| -rw-r--r-- | usr/src/cmd/devfsadm/usb_link.c | 4 |
6 files changed, 257 insertions, 8 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index 7a410a3a49..dd035124e9 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -119,6 +119,7 @@ COMMON_SUBDIRS= \ date \ dc \ dd \ + demangle \ deroff \ devfsadm \ syseventd \ diff --git a/usr/src/cmd/ccidadm/Makefile b/usr/src/cmd/ccidadm/Makefile index de9761ff9d..d1d9221c80 100644 --- a/usr/src/cmd/ccidadm/Makefile +++ b/usr/src/cmd/ccidadm/Makefile @@ -18,15 +18,12 @@ PROG= ccidadm include ../Makefile.cmd include ../Makefile.ctf -ROOTCMDDIR = $(ROOTLIB)/ccid CFLAGS += $(CCVERBOSE) LDLIBS += -lofmt -lcmdutils SRCS = ccidadm.c atr.c OBJS = $(SRCS:%.c=%.o) CPPFLAGS += -I$(SRC)/common/ccid -ROOTCCIDFILES = $(PROG:%=$(ROOTCMDDIR)/%) - .KEEP_STATE: $(PROG): $(OBJS) @@ -43,9 +40,9 @@ $(PROG): $(OBJS) all: $(PROG) -install: all $(ROOTCMD) +install: all $(ROOTUSRSBINPROG) clean: - $(RM) $(OBJS) + $(RM) $(OBJS) $(PROG) include ../Makefile.targ diff --git a/usr/src/cmd/ccidadm/ccidadm.c b/usr/src/cmd/ccidadm/ccidadm.c index 1d3c2bcbfc..6309ecfcc8 100644 --- a/usr/src/cmd/ccidadm/ccidadm.c +++ b/usr/src/cmd/ccidadm/ccidadm.c @@ -220,7 +220,7 @@ static boolean_t ccidadm_list_slot_usable_str(uccid_cmd_status_t *ucs, char *buf, uint_t buflen) { - char *un = ""; + const char *un = ""; ccid_class_features_t feat; uint_t prot = CCID_CLASS_F_SHORT_APDU_XCHG | CCID_CLASS_F_EXT_APDU_XCHG; uint_t param = CCID_CLASS_F_AUTO_PARAM_NEG | CCID_CLASS_F_AUTO_PPS; diff --git a/usr/src/cmd/demangle/Makefile b/usr/src/cmd/demangle/Makefile new file mode 100644 index 0000000000..8366ac85f3 --- /dev/null +++ b/usr/src/cmd/demangle/Makefile @@ -0,0 +1,40 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Joyent, Inc. +# + +PROG= demangle +OBJS= demangle.o +SRCS= $(OBJS:%.o=%.c) + +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.ctf + +CSTD= $(CSTD_GNU99) + +LDLIBS += -ldemangle-sys -lcustr + +.KEEP_STATE: + +all: $(PROG) + +$(PROG): $(OBJS) + $(LINK.c) $(OBJS) -o $@ $(LDLIBS) + $(POST_PROCESS) + +clean: + $(RM) $(OBJS) + +install: all $(ROOTPROG) + +include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/demangle/demangle.c b/usr/src/cmd/demangle/demangle.c new file mode 100644 index 0000000000..33a68edc9e --- /dev/null +++ b/usr/src/cmd/demangle/demangle.c @@ -0,0 +1,211 @@ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + */ + +/* + * Copyright 2020 Joyent, Inc. + */ + +#include <ctype.h> +#include <demangle-sys.h> +#include <err.h> +#include <errno.h> +#include <libcustr.h> +#include <locale.h> +#include <stdio.h> +#include <stdlib.h> + +#define _(x) gettext(x) + +locale_t c_locale; + +static int do_symbols(sysdem_lang_t, int, char * const *); +static int do_input(sysdem_lang_t, FILE *restrict, FILE *restrict); +static int do_demangle(const char *, sysdem_lang_t, FILE *); +static void appendc(custr_t *, char); +static void xputc(int, FILE *); + +static void +usage(void) +{ + (void) fprintf(stderr, _("Usage: %s [-l lang] [sym...]\n"), + getprogname()); + exit(2); +} + +int +main(int argc, char * const *argv) +{ + sysdem_lang_t lang = SYSDEM_LANG_AUTO; + int c; + int ret; + + (void) setlocale(LC_ALL, ""); + +#if !defined(TEXT_DOMAIN) +#define TEXT_DOMAIN "SYS_TEST" +#endif + (void) textdomain(TEXT_DOMAIN); + + /* + * For detecting symbol boundaries, we want to use the C locale + * definitions for use in isalnum_l(). + */ + if ((c_locale = newlocale(LC_CTYPE_MASK, "C", NULL)) == NULL) + err(EXIT_FAILURE, _("failed to construct C locale")); + + while ((c = getopt(argc, argv, "hl:")) != -1) { + switch (c) { + case 'l': + if (sysdem_parse_lang(optarg, &lang)) + break; + + errx(EXIT_FAILURE, _("Unsupported language '%s'\n"), + optarg); + case 'h': + case '?': + usage(); + } + } + + argc -= optind; + argv += optind; + + if (argc > 0) + ret = do_symbols(lang, argc, argv); + else + ret = do_input(lang, stdin, stdout); + + return ((ret < 0) ? EXIT_FAILURE : EXIT_SUCCESS); +} + +static int +do_symbols(sysdem_lang_t lang, int argc, char * const *argv) +{ + int ret = 0; + + for (int i = 0; i < argc; i++) { + if (do_demangle(argv[i], lang, stdout) < 0) + ret = -1; + else + xputc('\n', stdout); + } + + return (ret); +} + +static int +do_input(sysdem_lang_t lang, FILE *restrict in, FILE *restrict out) +{ + custr_t *word = NULL; + int c; + int ret = 0; + boolean_t in_symbol = B_FALSE; + + if (custr_alloc(&word) != 0) + err(EXIT_FAILURE, _("failed to allocate memory")); + + while ((c = fgetc(in)) != EOF) { + if (in_symbol) { + /* + * All currently supported mangling formats only use + * alphanumeric characters, '.', '_', or '$' in + * mangled names. Once we've seen the potential start + * of a symbol ('_'), we accumulate subsequent + * charaters into 'word'. If we encounter a character + * that is not a part of that set ([A-Za-z0-9._$]), we + * treat it as a delimiter, we stop accumulating + * characters into word, and we attempt to demangle the + * accumulated string in 'word' by calling + * demangle_custr(). + * + * Similar utilities like c++filt behave in a similar + * fashion when reading from stdin to allow for + * demangling of symbols embedded in surrounding text. + */ + if (isalnum_l(c, c_locale) || c == '.' || c == '_' || + c == '$') { + appendc(word, c); + continue; + } + + /* + * Hit a symbol boundary, attempt to demangle what + * we've accumulated in word and reset word. + */ + if (do_demangle(custr_cstr(word), lang, out) < 0) + ret = -1; + + custr_reset(word); + in_symbol = B_FALSE; + } + + if (c != '_') { + xputc(c, out); + } else { + in_symbol = B_TRUE; + appendc(word, c); + } + } + + if (ferror(in)) + err(EXIT_FAILURE, _("error reading input")); + + /* + * If we were accumulating characters for a symbol and hit EOF, + * attempt to demangle what we accumulated. + */ + if (custr_len(word) > 0 && do_demangle(custr_cstr(word), lang, out) < 0) + ret = -1; + + custr_free(word); + return (ret); +} + +/* + * Attempt to demangle 'sym' as a symbol for 'lang' and write the result + * to 'out'. If 'sym' could not be demangled as 'lang' symbol, the original + * string is output instead. + * + * If an error other than 'not a mangled symbol' is encountered (e.g. ENOMEM), + * a warning is sent to stderr and -1 is returned. Otherwise, 0 is returned + * (including when 'sym' is merely not a mangled symbol of 'lang'). + */ +static int +do_demangle(const char *sym, sysdem_lang_t lang, FILE *out) +{ + char *demangled = sysdemangle(sym, lang, NULL); + + if (demangled == NULL && errno != EINVAL) { + warn(_("error while demangling '%s'"), sym); + return (-1); + } + + if (fprintf(out, "%s", (demangled != NULL) ? demangled : sym) < 0) + err(EXIT_FAILURE, _("failed to write to output")); + + free(demangled); + return (0); +} + +static void +appendc(custr_t *cus, char c) +{ + if (custr_appendc(cus, c) == 0) + return; + err(EXIT_FAILURE, _("failed to save character from input")); +} + +static void +xputc(int c, FILE *out) +{ + if (fputc(c, out) < 0) + err(EXIT_FAILURE, _("failed to write output")); +} diff --git a/usr/src/cmd/devfsadm/usb_link.c b/usr/src/cmd/devfsadm/usb_link.c index 80996a1773..b233f85daf 100644 --- a/usr/src/cmd/devfsadm/usb_link.c +++ b/usr/src/cmd/devfsadm/usb_link.c @@ -316,8 +316,8 @@ usb_process(di_minor_t minor, di_node_t node) return (DEVFSADM_CONTINUE); } - if (strcmp(di_minor_nodetype(minor), DDI_NT_CCID_ATTACHMENT_POINT) - == 0) { + if (strcmp(di_minor_nodetype(minor), DDI_NT_CCID_ATTACHMENT_POINT) == + 0) { ccid_create_link(p_path, minor_nm, node, minor); free(l_path); free(p_path); |