scc

commit 4bf6b4ce284606f33871caac9836f9a5a4b0a97f
parent 777c75e345f724aa3a6830fdd340437bab46c65e
Author: Quentin Rameau <quinq@fifth.space>
Date:   Thu, 16 Jun 2016 10:47:41 +0200

[driver] add support for the combination of -c and -o

This is unspecified behaviour[1], but it seems that almost everybody out
there relies on that, so.

[1] “-o outfile: Use the pathname outfile, instead of the default a.out,
for the executable file produced. If the -o option is present with -c or
-E, the result is unspecified.”

Diffstat:
M
driver/posix/scc.c
 | 
22
++++++++++++++--------

1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/driver/posix/scc.c b/driver/posix/scc.c
@@ -52,7 +52,7 @@ struct objects {
 };
 
 char *argv0;
-static char *arch;
+static char *arch, *outfile;
 static struct objects objtmp, objout;
 static int Eflag, Sflag, cflag, kflag, sflag;
 
@@ -144,8 +144,7 @@ inittool(int tool)
 		break;
 	case LD:
 		addarg(tool, "-o");
-		if (!t->outfile)
-			t->outfile = xstrdup("a.out");
+		t->outfile = outfile ? outfile : xstrdup("a.out");
 		addarg(tool, t->outfile);
 		break;
 	case AS:
@@ -212,7 +211,7 @@ settool(int tool, char *infile, int nexttool)
 		addarg(tool, t->outfile);
 		break;
 	case AS:
-		t->outfile = outfilename(infile, "o");
+		t->outfile = outfile ? outfile : outfilename(infile, "o");
 		addarg(tool, t->outfile);
 		break;
 	case LD:
@@ -375,8 +374,15 @@ build(char *file)
 static void
 usage(void)
 {
-	die("usage: %s [-E|-kS] [-w] [-m arch] [-c] [-o binout] [-s]\n"
-	    "       [-D macro[=val]]... [-I dir]... file...", argv0);
+	die("usage: scc [-D def[=val]]... [-U def]... [-I dir]... "
+	    "[-L dir]... [-l dir]...\n"
+	    "           [-ksw] [-m arch] [-E|-S] [-o outfile] file...\n"
+	    "       scc [-D def[=val]]... [-U def]... [-I dir]... "
+	    "[-L dir]... [-l dir]...\n"
+	    "           [-ksw] [-m arch] [-E|-S] -c file...\n"
+	    "       scc [-D def[=val]]... [-U def]... [-I dir]... "
+	    "[-L dir]... [-l dir]...\n"
+	    "           [-ksw] [-m arch] -c -o outfile file");
 }
 
 int
@@ -424,7 +430,7 @@ main(int argc, char *argv[])
 		arch = EARGF(usage());
 		break;
 	case 'o':
-		tools[LD].outfile = xstrdup(EARGF(usage()));
+		outfile = xstrdup(EARGF(usage()));
 		break;
 	case 's':
 		sflag = 1;
@@ -440,7 +446,7 @@ main(int argc, char *argv[])
 		usage();
 	} ARGEND
 
-	if (Eflag && (Sflag || kflag))
+	if (Eflag && (Sflag || kflag) || argc > 1 && cflag && outfile)
 		usage();
 
 	if (!argc)