Changeset 3789

Timestamp:

12/02/08 13:26:17 (5 weeks ago)

Author:

stepan

Message:

build_opt_tbl:
make sure the temporary files are created in the same directory as the
target files so they can be rename()d. This fixes a compilation issue on
machines with the build directory living on another partition than /tmp.
Pretty trivial.

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Stefan Reinauer <stepan@…>

Files:

• trunk/coreboot-v2/util/options/build_opt_tbl.c (modified) (5 diffs)

trunk/coreboot-v2/util/options/build_opt_tbl.c

@@ -5 +5 @@
 #include <ctype.h>
 #include <errno.h>
+#include <libgen.h>
 #include "../../src/include/pc80/mc146818rtc.h"
 #include "../../src/include/boot/coreboot_tables.h"
@@ -12 +13 @@
 #define MAX_VALUE_BYTE_LENGTH 64
 
-#define TMPFILE_TEMPLATE "/tmp/build_opt_tbl_XXXXXX"
+#define TMPFILE_LEN 256
+#define TMPFILE_TEMPLATE "/build_opt_tbl_XXXXXX"
 
 static unsigned char cmos_table[4096];
@@ -216 +218 @@
         FILE *fp;
         int tmpfile;
-        char tmpfilename[32];
+        char tmpfilename[TMPFILE_LEN];
         struct cmos_option_table *ct;
         struct cmos_entries *ce;
@@ -486 +488 @@
         /* See if we want to output a C source file */
         if(option) {
-                strcpy(tmpfilename, TMPFILE_TEMPLATE);
+                strncpy(tmpfilename, dirname(option), TMPFILE_LEN);
+                strncat(tmpfilename, TMPFILE_TEMPLATE, TMPFILE_LEN);
                 tmpfile = mkstemp(tmpfilename);
                 if(tmpfile == -1) {
@@ -536 +539 @@
                 struct lb_record *ptr, *end;
 
-                strcpy(tmpfilename, TMPFILE_TEMPLATE);
+                strncpy(tmpfilename, dirname(option), TMPFILE_LEN);
+                strncat(tmpfilename, TMPFILE_TEMPLATE, TMPFILE_LEN);
                 tmpfile = mkstemp(tmpfilename);
                 if(tmpfile == -1) {