aboutsummaryrefslogtreecommitdiffstats
path: root/mtools
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-05 18:12:29 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-05 18:12:29 -0700
commit7973bad00a6a011d4b520c160c2cd89a506f3b99 (patch)
tree1a0b4a39a17df023ad451250792b3f00ae686e40 /mtools
parent31972117a90a7109413bb59e1f33d55fcbdf01db (diff)
downloadsyslinux-7973bad00a6a011d4b520c160c2cd89a506f3b99.tar.gz
syslinux-7973bad00a6a011d4b520c160c2cd89a506f3b99.tar.xz
syslinux-7973bad00a6a011d4b520c160c2cd89a506f3b99.zip
mtools: honor TMPDIR, check for errors writing mtools.conf
Honor TMPDIR when picking a place to write mtools.conf. Check for errors while writing mtools.conf. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'mtools')
-rw-r--r--mtools/syslinux.c44
1 files changed, 35 insertions, 9 deletions
diff --git a/mtools/syslinux.c b/mtools/syslinux.c
index 97286c4d..761c31bf 100644
--- a/mtools/syslinux.c
+++ b/mtools/syslinux.c
@@ -1,6 +1,7 @@
/* ----------------------------------------------------------------------- *
*
* Copyright 1998-2008 H. Peter Anvin - All Rights Reserved
+ * Copyright 2010 Intel Corporation; author: H. Peter Anvin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,8 +19,7 @@
* We need device write permission anyway.
*/
-#define _XOPEN_SOURCE 500 /* Required on glibc 2.x */
-#define _BSD_SOURCE
+#define _GNU_SOURCE
#include <alloca.h>
#include <errno.h>
#include <fcntl.h>
@@ -57,6 +57,12 @@ void __attribute__ ((noreturn)) die(const char *msg)
exit(1);
}
+void __attribute__ ((noreturn)) die_err(const char *msg)
+{
+ fprintf(stderr, "%s: %s: %s\n", program, msg, strerror(errno));
+ exit(1);
+}
+
/*
* read/write wrapper functions
*/
@@ -131,7 +137,8 @@ int main(int argc, char *argv[])
struct stat st;
int status;
char **argp, *opt;
- char mtools_conf[] = "/tmp/syslinux-mtools-XXXXXX";
+ const char *tmpdir;
+ char *mtools_conf;
const char *subdir = NULL;
int mtc_fd;
FILE *mtc, *mtp;
@@ -188,12 +195,27 @@ int main(int argc, char *argv[])
usage();
/*
+ * Temp directory of choice...
+ */
+ tmpdir = getenv("TMPDIR");
+#ifdef P_tmpdir
+ if (!tmpdir)
+ tmpdir = P_tmpdir;
+#endif
+#ifdef _PATH_TMP
+ if (!tmpdir)
+ tmpdir = _PATH_TMP;
+#endif
+ if (!tmpdir)
+ tmpdir = "/tmp";
+
+ /*
* First make sure we can open the device at all, and that we have
* read/write permission.
*/
dev_fd = open(device, O_RDWR);
if (dev_fd < 0 || fstat(dev_fd, &st) < 0) {
- perror(device);
+ die_err(device);
exit(1);
}
@@ -216,11 +238,14 @@ int main(int argc, char *argv[])
/*
* Create an mtools configuration file
*/
+ if (asprintf(&mtools_conf, "%s//syslinux-mtools-XXXXXX", tmpdir) < 0 ||
+ !mtools_conf)
+ die_err(tmpdir);
+
mtc_fd = mkstemp(mtools_conf);
- if (mtc_fd < 0 || !(mtc = fdopen(mtc_fd, "w"))) {
- perror(program);
- exit(1);
- }
+ if (mtc_fd < 0 || !(mtc = fdopen(mtc_fd, "w")))
+ die_err(mtools_conf);
+
fprintf(mtc,
/* These are needed for some flash memories */
"MTOOLS_SKIP_CHECK=1\n"
@@ -230,7 +255,8 @@ int main(int argc, char *argv[])
" offset=%llu\n",
(unsigned long)mypid,
dev_fd, (unsigned long long)filesystem_offset);
- fclose(mtc);
+ if (ferror(mtc) || fclose(mtc))
+ die_err(mtools_conf);
/*
* Run mtools to create the LDLINUX.SYS file