summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ctfconvert/ctfconvert.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/ctfconvert/ctfconvert.c')
-rw-r--r--usr/src/cmd/ctfconvert/ctfconvert.c91
1 files changed, 71 insertions, 20 deletions
diff --git a/usr/src/cmd/ctfconvert/ctfconvert.c b/usr/src/cmd/ctfconvert/ctfconvert.c
index bae355be22..00f409c124 100644
--- a/usr/src/cmd/ctfconvert/ctfconvert.c
+++ b/usr/src/cmd/ctfconvert/ctfconvert.c
@@ -11,6 +11,7 @@
/*
* Copyright 2019 Joyent, Inc.
+ * Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
*/
/*
@@ -37,9 +38,6 @@
#define CTFCONVERT_FATAL 1
#define CTFCONVERT_USAGE 2
-#define CTFCONVERT_DEFAULT_BATCHSIZE 256
-#define CTFCONVERT_DEFAULT_NTHREADS 4
-
static char *ctfconvert_progname;
static void
@@ -55,6 +53,20 @@ ctfconvert_fatal(const char *fmt, ...)
exit(CTFCONVERT_FATAL);
}
+static void
+ctfconvert_warning(void *arg, const char *fmt, ...)
+{
+ va_list ap;
+ char *buf;
+
+ va_start(ap, fmt);
+ if (vasprintf(&buf, fmt, ap) != -1) {
+ (void) fprintf(stderr, "%s: WARNING: %s", ctfconvert_progname,
+ buf);
+ free(buf);
+ }
+ va_end(ap);
+}
static void
ctfconvert_usage(const char *fmt, ...)
@@ -68,7 +80,7 @@ ctfconvert_usage(const char *fmt, ...)
va_end(ap);
}
- (void) fprintf(stderr, "Usage: %s [-ikm] [-j nthrs] [-l label | "
+ (void) fprintf(stderr, "Usage: %s [-ikms] [-j nthrs] [-l label | "
"-L labelenv] [-b batchsize]\n"
" [-o outfile] input\n"
"\n"
@@ -79,10 +91,11 @@ ctfconvert_usage(const char *fmt, ...)
"\t-l set output container's label to specified value\n"
"\t-L set output container's label to value from environment\n"
"\t-m allow input to have missing debug info\n"
- "\t-o copy input to outfile and add CTF\n",
+ "\t-o copy input to outfile and add CTF\n"
+ "\t-s allow truncation of data that cannot be fully converted\n",
ctfconvert_progname,
- CTFCONVERT_DEFAULT_BATCHSIZE,
- CTFCONVERT_DEFAULT_NTHREADS);
+ CTF_CONVERT_DEFAULT_BATCHSIZE,
+ CTF_CONVERT_DEFAULT_NTHREADS);
}
/*
@@ -192,13 +205,13 @@ ctfconvert_fixup_genunix(ctf_file_t *fp)
CTF_K_STRUCT);
if (mcpu == CTF_ERR) {
ctfconvert_fatal("failed to add 'struct machcpu' "
- "forward: %s", ctf_errmsg(ctf_errno(fp)));
+ "forward: %s\n", ctf_errmsg(ctf_errno(fp)));
}
} else {
int kind;
if ((kind = ctf_type_kind(fp, mcpu)) == CTF_ERR) {
ctfconvert_fatal("failed to get the type kind for "
- "the struct machcpu: %s",
+ "the struct machcpu: %s\n",
ctf_errmsg(ctf_errno(fp)));
}
@@ -230,21 +243,22 @@ main(int argc, char *argv[])
{
int c, ifd, err;
boolean_t keep = B_FALSE;
- uint_t flags = 0;
- uint_t bsize = CTFCONVERT_DEFAULT_BATCHSIZE;
- uint_t nthreads = CTFCONVERT_DEFAULT_NTHREADS;
+ ctf_convert_flag_t flags = 0;
+ uint_t bsize = CTF_CONVERT_DEFAULT_BATCHSIZE;
+ uint_t nthreads = CTF_CONVERT_DEFAULT_NTHREADS;
const char *outfile = NULL;
const char *label = NULL;
const char *infile = NULL;
char *tmpfile;
ctf_file_t *ofp;
- char buf[4096];
+ char buf[4096] = "";
boolean_t optx = B_FALSE;
boolean_t ignore_non_c = B_FALSE;
+ ctf_convert_t *cch;
ctfconvert_progname = basename(argv[0]);
- while ((c = getopt(argc, argv, ":b:ij:kl:L:mo:X")) != -1) {
+ while ((c = getopt(argc, argv, ":b:ij:kl:L:mo:sX")) != -1) {
switch (c) {
case 'b': {
long argno;
@@ -288,6 +302,9 @@ main(int argc, char *argv[])
case 'o':
outfile = optarg;
break;
+ case 's':
+ flags |= CTF_ALLOW_TRUNCATION;
+ break;
case 'X':
optx = B_TRUE;
break;
@@ -327,8 +344,32 @@ main(int argc, char *argv[])
if (outfile != NULL && strcmp(infile, outfile) != 0)
keep = B_TRUE;
- ofp = ctf_fdconvert(ifd, label, bsize, nthreads, flags, &err, buf,
- sizeof (buf));
+ cch = ctf_convert_init(&err);
+ if (cch == NULL) {
+ ctfconvert_fatal(
+ "failed to create libctf conversion handle: %s\n",
+ strerror(err));
+ }
+ if ((err = ctf_convert_set_nthreads(cch, nthreads)) != 0)
+ ctfconvert_fatal("Could not set number of threads: %s\n",
+ strerror(err));
+ if ((err = ctf_convert_set_batchsize(cch, bsize)) != 0)
+ ctfconvert_fatal("Could not set batch size: %s\n",
+ strerror(err));
+ if ((err = ctf_convert_set_flags(cch, flags)) != 0)
+ ctfconvert_fatal("Could not set conversion flags: %s\n",
+ strerror(err));
+ if (label != NULL && (err = ctf_convert_set_label(cch, label)) != 0)
+ ctfconvert_fatal("Could not set label: %s\n",
+ strerror(err));
+ if ((err = ctf_convert_set_warncb(cch, ctfconvert_warning, NULL)) != 0)
+ ctfconvert_fatal("Could not set warning callback: %s\n",
+ strerror(err));
+
+ ofp = ctf_fdconvert(cch, ifd, &err, buf, sizeof (buf));
+
+ ctf_convert_fini(cch);
+
if (ofp == NULL) {
/*
* Normally, ctfconvert requires that its input file has at
@@ -351,9 +392,19 @@ main(int argc, char *argv[])
if (keep == B_FALSE)
(void) unlink(infile);
- if (err == ECTF_CONVBKERR || err == ECTF_CONVNODEBUG) {
- ctfconvert_fatal("%s\n", buf);
- } else {
+ switch (err) {
+ case ECTF_CONVBKERR:
+ ctfconvert_fatal("CTF conversion failed: %s", buf);
+ break;
+ case ECTF_CONVNODEBUG:
+ ctfconvert_fatal("CTF conversion failed due to "
+ "missing debug data; use -m to override\n");
+ break;
+ default:
+ if (*buf != '\0') {
+ (void) fprintf(stderr, "%s: %s",
+ ctfconvert_progname, buf);
+ }
ctfconvert_fatal("CTF conversion failed: %s\n",
ctf_errmsg(err));
}
@@ -378,7 +429,7 @@ main(int argc, char *argv[])
if (keep == B_FALSE)
(void) unlink(infile);
ctfconvert_fatal("failed to write CTF section to output file: "
- "%s", ctf_errmsg(ctf_errno(ofp)));
+ "%s\n", ctf_errmsg(ctf_errno(ofp)));
}
ctf_close(ofp);
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-02 08:35:59 +0000