Print this page
9899 cw(1onbld) should shadow more compilation
9888 cw shouldn't use __unused
@@ -306,11 +306,11 @@
struct aelist *i_ae;
uint32_t i_flags;
int i_oldargc;
char **i_oldargv;
pid_t i_pid;
- char i_discard[MAXPATHLEN];
+ char *i_discard;
char *i_stderr;
} cw_ictx_t;
/*
* Status values to indicate which Studio compiler and associated
@@ -477,16 +477,10 @@
newae(h, "-fno-unit-at-a-time");
newae(h, "-fno-optimize-sibling-calls");
}
}
-/* ARGSUSED */
-static void
-Xamode(struct aelist __unused *h)
-{
-}
-
static void
Xsmode(struct aelist *h)
{
static int xsonce;
@@ -557,10 +551,39 @@
newae(h, *table);
table++;
}
}
+/*
+ * The compiler wants the output file to end in appropriate extension. If
+ * we're generating a name from whole cloth (path == NULL), we assume that
+ * extension to be .o, otherwise we match the extension of the caller.
+ */
+static char *
+discard_file_name(const char *path)
+{
+ char *ret, *ext, *file;
+
+ if (path == NULL) {
+ ext = ".o";
+ } else {
+ ext = strrchr(path, '.');
+ }
+
+ if ((ret = calloc(MAXPATHLEN, sizeof (char))) == NULL)
+ nomem();
+
+ if ((file = tempnam(NULL, ".cw")) == NULL)
+ nomem();
+
+ (void) strlcpy(ret, file, MAXPATHLEN);
+ if (ext != NULL)
+ (void) strlcat(ret, ext, MAXPATHLEN);
+ free(file);
+ return (ret);
+}
+
static void
do_gcc(cw_ictx_t *ctx)
{
int c;
int nolibc = 0;
@@ -634,14 +657,19 @@
* Otherwise, filenames and partial arguments
* are passed through for gcc to chew on. However,
* output is always discarded for the secondary
* compiler.
*/
- if ((ctx->i_flags & CW_F_SHADOW) && in_output)
+ if ((ctx->i_flags & CW_F_SHADOW) && in_output) {
+ ctx->i_discard = discard_file_name(arg);
+
+ if (ctx->i_discard == NULL)
+ nomem();
newae(ctx->i_ae, ctx->i_discard);
- else
+ } else {
newae(ctx->i_ae, arg);
+ }
in_output = 0;
continue;
}
if (ctx->i_flags & CW_F_CXX) {
@@ -753,10 +781,14 @@
if (arglen == 1) {
in_output = 1;
newae(ctx->i_ae, arg);
} else if (ctx->i_flags & CW_F_SHADOW) {
newae(ctx->i_ae, "-o");
+ ctx->i_discard = discard_file_name(arg);
+ if (ctx->i_discard == NULL)
+ nomem();
+
newae(ctx->i_ae, ctx->i_discard);
} else {
newae(ctx->i_ae, arg);
}
break;
@@ -994,11 +1026,10 @@
error(arg);
break;
case 'X':
if (strcmp(arg, "-Xa") == 0 ||
strcmp(arg, "-Xt") == 0) {
- Xamode(ctx->i_ae);
break;
}
if (strcmp(arg, "-Xs") == 0) {
Xsmode(ctx->i_ae);
break;
@@ -1192,12 +1223,20 @@
}
}
free(nameflag);
- if (c_files > 1 && (ctx->i_flags & CW_F_SHADOW) &&
- op != CW_O_PREPROCESS) {
+ /*
+ * When compiling multiple source files in a single invocation some
+ * compilers output objects into the current directory with
+ * predictable and conventional names.
+ *
+ * We prevent any attempt to compile multiple files at once so that
+ * any such objects created by a shadow can't escape into a later
+ * link-edit.
+ */
+ if (c_files > 1 && op != CW_O_PREPROCESS) {
errx(2, "multiple source files are "
"allowed only with -E or -P");
}
/*
@@ -1261,28 +1300,35 @@
(void) fprintf(stderr,
"Incompatible -xarch= and/or -m32/-m64 options used.\n");
exit(2);
}
- if ((op == CW_O_LINK || op == CW_O_PREPROCESS) &&
- (ctx->i_flags & CW_F_SHADOW))
+ if (ctx->i_flags & CW_F_SHADOW) {
+ if (op == CW_O_PREPROCESS)
+ exit(0);
+ else if (op == CW_O_LINK && c_files == 0)
exit(0);
+ }
if (model != NULL)
newae(ctx->i_ae, model);
if (!nolibc)
newae(ctx->i_ae, "-lc");
if (!seen_o && (ctx->i_flags & CW_F_SHADOW)) {
+ ctx->i_discard = discard_file_name(NULL);
+
+ if (ctx->i_discard == NULL)
+ nomem();
newae(ctx->i_ae, "-o");
newae(ctx->i_ae, ctx->i_discard);
}
}
static void
do_cc(cw_ictx_t *ctx)
{
- int in_output = 0, seen_o = 0;
+ int in_output = 0, seen_o = 0, c_files = 0;
cw_op_t op = CW_O_LINK;
char *nameflag;
if (ctx->i_flags & CW_F_PROG) {
newae(ctx->i_ae, "-V");
@@ -1292,21 +1338,31 @@
if (asprintf(&nameflag, "-_%s=", ctx->i_compiler->c_name) == -1)
nomem();
while (--ctx->i_oldargc > 0) {
char *arg = *++ctx->i_oldargv;
+ size_t arglen = strlen(arg);
if (strncmp(arg, "-_CC=", 5) == 0) {
newae(ctx->i_ae, strchr(arg, '=') + 1);
continue;
}
if (*arg != '-') {
+ if (!in_output && arglen > 2 &&
+ arg[arglen - 2] == '.' &&
+ (arg[arglen - 1] == 'S' || arg[arglen - 1] == 's' ||
+ arg[arglen - 1] == 'c' || arg[arglen - 1] == 'i'))
+ c_files++;
+
if (in_output == 0 || !(ctx->i_flags & CW_F_SHADOW)) {
newae(ctx->i_ae, arg);
} else {
in_output = 0;
+ ctx->i_discard = discard_file_name(arg);
+ if (ctx->i_discard == NULL)
+ nomem();
newae(ctx->i_ae, ctx->i_discard);
}
continue;
}
switch (*(arg + 1)) {
@@ -1327,10 +1383,13 @@
if (strlen(arg) == 2) {
in_output = 1;
newae(ctx->i_ae, arg);
} else if (ctx->i_flags & CW_F_SHADOW) {
newae(ctx->i_ae, "-o");
+ ctx->i_discard = discard_file_name(arg);
+ if (ctx->i_discard == NULL)
+ nomem();
newae(ctx->i_ae, ctx->i_discard);
} else {
newae(ctx->i_ae, arg);
}
break;
@@ -1350,16 +1409,29 @@
}
}
free(nameflag);
- if ((op == CW_O_LINK || op == CW_O_PREPROCESS) &&
- (ctx->i_flags & CW_F_SHADOW))
+ /* See the comment on this same code in do_gcc() */
+ if (c_files > 1 && op != CW_O_PREPROCESS) {
+ errx(2, "multiple source files are "
+ "allowed only with -E or -P");
+ }
+
+ if (ctx->i_flags & CW_F_SHADOW) {
+ if (op == CW_O_PREPROCESS)
exit(0);
+ else if (op == CW_O_LINK && c_files == 0)
+ exit(0);
+ }
if (!seen_o && (ctx->i_flags & CW_F_SHADOW)) {
newae(ctx->i_ae, "-o");
+ ctx->i_discard = discard_file_name(NULL);
+
+ if (ctx->i_discard == NULL)
+ nomem();
newae(ctx->i_ae, ctx->i_discard);
}
}
static void
@@ -1465,10 +1537,11 @@
}
}
} while (!WIFEXITED(status) && !WIFSIGNALED(status));
(void) unlink(ctx->i_discard);
+ free(ctx->i_discard);
if (stat(ctx->i_stderr, &s) < 0) {
warn("stat failed on child cleanup");
return (-1);
}
@@ -1495,24 +1568,10 @@
}
static int
exec_ctx(cw_ictx_t *ctx, int block)
{
- char *file;
-
- /*
- * To avoid offending cc's sensibilities, the name of its output
- * file must end in '.o'.
- */
- if ((file = tempnam(NULL, ".cw")) == NULL) {
- nomem();
- return (-1);
- }
- (void) strlcpy(ctx->i_discard, file, MAXPATHLEN);
- (void) strlcat(ctx->i_discard, ".o", MAXPATHLEN);
- free(file);
-
if ((ctx->i_stderr = tempnam(NULL, ".cw")) == NULL) {
nomem();
return (-1);
}