[hackers] [scc] [driver] add support for naming intermediary files || Quentin Rameau

From: <git_AT_suckless.org>
Date: Thu, 2 Jun 2016 18:27:00 +0200 (CEST)

commit 715d9b507edeed0bdfce06c54042f8642255265d
Author: Quentin Rameau <quinq_AT_fifth.space>
AuthorDate: Thu Jun 2 16:08:31 2016 +0200
Commit: Quentin Rameau <quinq_AT_fifth.space>
CommitDate: Thu Jun 2 18:23:35 2016 +0200

    [driver] add support for naming intermediary files

diff --git a/driver/posix/scc.c b/driver/posix/scc.c
index db224fa..264b75d 100644
--- a/driver/posix/scc.c
+++ b/driver/posix/scc.c
_AT_@ -30,6 +30,7 @@ static struct tool {
         char cmd[PATH_MAX];
         char *args[NARGS];
         char bin[16];
+ char *outfile;
         int nargs, in, out;
         pid_t pid;
 } tools[NR_TOOLS] = {
_AT_@ -90,15 +91,58 @@ inittool(int tool)
         return tool;
 }
 
+char *
+newfileext(char *name, char *ext)
+{
+ char *new, *dot;
+ size_t newsz, nameln = strlen(name);
+ int n;
+
+ if (!(dot = strrchr(name, '.')))
+ dot = &name[nameln];
+
+ nameln = nameln - strlen(dot);
+ newsz = nameln + strlen(ext) + 1 + 1;
+
+ new = xmalloc(newsz);
+
+ n = snprintf(new, newsz, "%.*s.%s", nameln, name, ext);
+ if (n < 0 || n >= newsz)
+ die("wrong output filename");
+
+ return new;
+}
+
 int
-settool(int tool, int output)
+settool(int tool, char *input, int output)
 {
         struct tool *t = &tools[tool];
         int fds[2];
+ char *ext;
         static int fdin;
 
- if (tool == TEE)
- t->args[1] = "out.ir";
+ switch (tool) {
+ case CC1:
+ ADDARG(tool, input);
+ break;
+ case TEE:
+ switch (output) {
+ case CC2:
+ ext = "ir"; break;
+ case QBE:
+ ext = "qbe"; break;
+ case NR_TOOLS:
+ if (!Sflag)
+ break;
+ case AS:
+ ext = "as"; break;
+ }
+ t->outfile = newfileext(input, ext);
+ t->args[1] = t->outfile;
+ break;
+ default:
+ break;
+ }
 
         if (fdin) {
                 t->in = fdin;
_AT_@ -156,7 +200,6 @@ build(char *file)
                         out = Eflag ? NR_TOOLS : CC2;
                         if (!Eflag)
                                 keepfile = kflag;
- ADDARG(tool, file);
                         break;
                 case CC2:
                         if (!arch || strcmp(arch, "qbe")) {
_AT_@ -186,7 +229,9 @@ build(char *file)
                         out = TEE;
                 }
 
- spawn(settool(inittool(tool), out));
+ spawn(settool(inittool(tool), file, out));
+
+ free(tools[tool].outfile);
         }
         for (i = 0; i < NR_TOOLS; ++i) {
                 if ((pid = tools[i].pid) == 0)
Received on Thu Jun 02 2016 - 18:27:00 CEST