diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:39:48 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:39:48 +0000 |
| commit | f9b92b874c7e2b0a97203e8b3e370a82027fee42 (patch) | |
| tree | 5b0afcf9f17c210b1248494d7039b477f403793f /usr/src/lib/libdtrace/common/dt_cc.c | |
| parent | 99ab767f0b40b10adde1dc9ceaf6bb39d2be5d69 (diff) | |
| parent | 435bba8aa5d73ccd0b9ec7c79e28bec795904992 (diff) | |
| download | illumos-joyent-f9b92b874c7e2b0a97203e8b3e370a82027fee42.tar.gz | |
illumos sync
Diffstat (limited to 'usr/src/lib/libdtrace/common/dt_cc.c')
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_cc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr/src/lib/libdtrace/common/dt_cc.c b/usr/src/lib/libdtrace/common/dt_cc.c index 8b8bcf475c..8b98b6d6f8 100644 --- a/usr/src/lib/libdtrace/common/dt_cc.c +++ b/usr/src/lib/libdtrace/common/dt_cc.c @@ -2158,7 +2158,7 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) (void) snprintf(fname, sizeof (fname), "%s/%s", path, dp->d_name); - if ((fp = fopen(fname, "r")) == NULL) { + if ((fp = fopen(fname, "rF")) == NULL) { dt_dprintf("skipping library %s: %s\n", fname, strerror(errno)); continue; @@ -2180,12 +2180,15 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) dt_dprintf("skipping library %s, already processed " "library with the same name: %s", dp->d_name, dld->dtld_library); + (void) fclose(fp); continue; } dtp->dt_filetag = fname; - if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) + if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) { + (void) fclose(fp); return (-1); /* preserve dt_errno */ + } rv = dt_compile(dtp, DT_CTX_DPROG, DTRACE_PROBESPEC_NAME, NULL, @@ -2193,8 +2196,10 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) if (rv != NULL && dtp->dt_errno && (dtp->dt_errno != EDT_COMPILER || - dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) + dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) { + (void) fclose(fp); return (-1); /* preserve dt_errno */ + } if (dtp->dt_errno) dt_dprintf("error parsing library %s: %s\n", |