splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

mkhtemp: fix err()

Browse Source 
calling it indirectly was out of the question.

must call it directly.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-25 00:03:31 +00:00
parent 3ddd7a0d36
commit f06db344ad
8 changed files with 51 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/libreboot-utils/include/common.h
View File

@@ -494,7 +494,7 @@ int try_err(int loop_err, int errval);
*/ */
void usage(void); void usage(void);
void err_no_cleanup(int nvm_errval, const char *msg, ...); void err_no_cleanup(int stfu, int nvm_errval, const char *msg, ...);
void b0rk(int nvm_errval, const char *msg, ...); void b0rk(int nvm_errval, const char *msg, ...);
int exit_cleanup(void); int exit_cleanup(void);
const char *getnvmprogname(void); const char *getnvmprogname(void);

4
util/libreboot-utils/lib/command.c
View File

@@ -110,7 +110,7 @@ set_cmd(int argc, char *argv[])
cmd = x->cmd[c].str; cmd = x->cmd[c].str;
if (scmp(argv[2], cmd, MAX_CMD_LEN, &rval) < 0) if (scmp(argv[2], cmd, MAX_CMD_LEN, &rval) < 0)
err_no_cleanup(EINVAL, err_no_cleanup(0, EINVAL,
"could not compare command strings"); "could not compare command strings");
if (rval != 0) if (rval != 0)
continue; /* not the right command */ continue; /* not the right command */
@@ -123,7 +123,7 @@ set_cmd(int argc, char *argv[])
return; return;
} }
err_no_cleanup(EINVAL, err_no_cleanup(0, EINVAL,
"Too few args on command '%s'", cmd); "Too few args on command '%s'", cmd);
} }

8
util/libreboot-utils/lib/file.c
View File

@@ -96,16 +96,16 @@ void
xopen(int *fd_ptr, const char *path, int flags, struct stat *st) xopen(int *fd_ptr, const char *path, int flags, struct stat *st)
{ {
if ((*fd_ptr = open(path, flags)) < 0) if ((*fd_ptr = open(path, flags)) < 0)
err_no_cleanup(errno, "%s", path); err_no_cleanup(0, errno, "%s", path);
if (fstat(*fd_ptr, st) < 0) if (fstat(*fd_ptr, st) < 0)
err_no_cleanup(errno, "%s: stat", path); err_no_cleanup(0, errno, "%s: stat", path);
if (!S_ISREG(st->st_mode)) if (!S_ISREG(st->st_mode))
err_no_cleanup(errno, "%s: not a regular file", path); err_no_cleanup(0, errno, "%s: not a regular file", path);
if (lseek_on_eintr(*fd_ptr, 0, SEEK_CUR, 1, 1) == (off_t)-1) if (lseek_on_eintr(*fd_ptr, 0, SEEK_CUR, 1, 1) == (off_t)-1)
err_no_cleanup(errno, "%s: file not seekable", path); err_no_cleanup(0, errno, "%s: file not seekable", path);
} }
/* fsync() the directory of a file, /* fsync() the directory of a file,

2
util/libreboot-utils/lib/num.c
View File

@@ -436,6 +436,6 @@ void
check_bin(size_t a, const char *a_name) check_bin(size_t a, const char *a_name)
{ {
if (a > 1) if (a > 1)
err_no_cleanup(EINVAL, "%s must be 0 or 1, but is %lu", err_no_cleanup(0, EINVAL, "%s must be 0 or 1, but is %lu",
a_name, (size_t)a); a_name, (size_t)a);
} }

26
util/libreboot-utils/lib/state.c
View File

@@ -98,9 +98,9 @@ xstart(int argc, char *argv[])
return &us; return &us;
if (argc < 3) if (argc < 3)
err_no_cleanup(EINVAL, "xstart: Too few arguments"); err_no_cleanup(0, EINVAL, "xstart: Too few arguments");
if (argv == NULL) if (argv == NULL)
err_no_cleanup(EINVAL, "xstart: NULL argv"); err_no_cleanup(0, EINVAL, "xstart: NULL argv");
first_run = 0; first_run = 0;
@@ -113,41 +113,41 @@ xstart(int argc, char *argv[])
us.f.tname = NULL; us.f.tname = NULL;
if ((realdir = realpath(us.f.fname, NULL)) == NULL) if ((realdir = realpath(us.f.fname, NULL)) == NULL)
err_no_cleanup(errno, "xstart: can't get realpath of %s", err_no_cleanup(0, errno, "xstart: can't get realpath of %s",
us.f.fname); us.f.fname);
if (fs_dirname_basename(realdir, &dir, &base, 0) < 0) if (fs_dirname_basename(realdir, &dir, &base, 0) < 0)
err_no_cleanup(errno, "xstart: don't know CWD of %s", err_no_cleanup(0, errno, "xstart: don't know CWD of %s",
us.f.fname); us.f.fname);
if ((us.f.base = strdup(base)) == NULL) if ((us.f.base = strdup(base)) == NULL)
err_no_cleanup(errno, "strdup base"); err_no_cleanup(0, errno, "strdup base");
us.f.dirfd = fs_open(dir, us.f.dirfd = fs_open(dir,
O_RDONLY | O_DIRECTORY); O_RDONLY | O_DIRECTORY);
if (us.f.dirfd < 0) if (us.f.dirfd < 0)
err_no_cleanup(errno, "%s: open dir", dir); err_no_cleanup(0, errno, "%s: open dir", dir);
if (new_tmpfile(&us.f.tmp_fd, &us.f.tname, dir, ".gbe.XXXXXXXXXX") < 0) if (new_tmpfile(&us.f.tmp_fd, &us.f.tname, dir, ".gbe.XXXXXXXXXX") < 0)
err_no_cleanup(errno, "%s", us.f.tname); err_no_cleanup(0, errno, "%s", us.f.tname);
if (fs_dirname_basename(us.f.tname, if (fs_dirname_basename(us.f.tname,
&tmpdir, &tmpbase_local, 0) < 0) &tmpdir, &tmpbase_local, 0) < 0)
err_no_cleanup(errno, "tmp basename"); err_no_cleanup(0, errno, "tmp basename");
us.f.tmpbase = strdup(tmpbase_local); us.f.tmpbase = strdup(tmpbase_local);
if (us.f.tmpbase == NULL) if (us.f.tmpbase == NULL)
err_no_cleanup(errno, "strdup tmpbase"); err_no_cleanup(0, errno, "strdup tmpbase");
free_if_null(&tmpdir); free_if_null(&tmpdir);
if (us.f.tname == NULL) if (us.f.tname == NULL)
err_no_cleanup(errno, "x->f.tname null"); err_no_cleanup(0, errno, "x->f.tname null");
if (*us.f.tname == '\0') if (*us.f.tname == '\0')
err_no_cleanup(errno, "x->f.tname empty"); err_no_cleanup(0, errno, "x->f.tname empty");
if (fstat(us.f.tmp_fd, &us.f.tmp_st) < 0) if (fstat(us.f.tmp_fd, &us.f.tmp_st) < 0)
err_no_cleanup(errno, "%s: stat", us.f.tname); err_no_cleanup(0, errno, "%s: stat", us.f.tname);
memset(us.f.real_buf, 0, sizeof(us.f.real_buf)); memset(us.f.real_buf, 0, sizeof(us.f.real_buf));
memset(us.f.bufcmp, 0, sizeof(us.f.bufcmp)); memset(us.f.bufcmp, 0, sizeof(us.f.bufcmp));
@@ -164,7 +164,7 @@ xstatus(void)
struct xstate *x = xstart(0, NULL); struct xstate *x = xstart(0, NULL);
if (x == NULL) if (x == NULL)
err_no_cleanup(EACCES, "NULL pointer to xstate"); err_no_cleanup(0, EACCES, "NULL pointer to xstate");
return x; return x;
} }

7
util/libreboot-utils/lib/string.c
View File

@@ -119,7 +119,7 @@ slen(const char *s,
/* the one for nvmutil state is in state.c */ /* the one for nvmutil state is in state.c */
/* this one just exits */ /* this one just exits */
void void
err_no_cleanup(int nvm_errval, const char *msg, ...) err_no_cleanup(int stfu, int nvm_errval, const char *msg, ...)
{ {
va_list args; va_list args;
int saved_errno = errno; int saved_errno = errno;
@@ -141,7 +141,10 @@ err_no_cleanup(int nvm_errval, const char *msg, ...)
vfprintf(stderr, msg, args); vfprintf(stderr, msg, args);
va_end(args); va_end(args);
fprintf(stderr, ": %s\n", strerror(errno)); if (p != NULL)
fprintf(stderr, ": %s\n", strerror(errno));
else
fprintf(stderr, "%s\n", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

54
util/libreboot-utils/mkhtemp.c
View File

@@ -94,7 +94,15 @@ main(int argc, char *argv[])
int stfu = 0; /* -q option */ int stfu = 0; /* -q option */
if (lbgetprogname(argv[0]) == NULL) if (lbgetprogname(argv[0]) == NULL)
err_mkhtemp(0, errno, "could not set progname"); err_no_cleanup(stfu, errno, "could not set progname");
/* https://man.openbsd.org/pledge.2 */
#if defined(__OpenBSD__) && defined(OpenBSD)
#if (OpenBSD) >= 509
if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
goto err_usage;
#endif
#endif
while ((c = while ((c =
getopt(argc, argv, "qdp:")) != -1) { getopt(argc, argv, "qdp:")) != -1) {
@@ -118,14 +126,6 @@ main(int argc, char *argv[])
} }
} }
/* https://man.openbsd.org/pledge.2 */
#if defined(__OpenBSD__) && defined(OpenBSD)
#if (OpenBSD) >= 509
if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
goto err_usage;
#endif
#endif
if (optind < argc) if (optind < argc)
template = argv[optind]; template = argv[optind];
if (optind + 1 < argc) if (optind + 1 < argc)
@@ -134,14 +134,14 @@ main(int argc, char *argv[])
/* custom template e.g. foo.XXXXXXXXXXXXXXXXXXXXX */ /* custom template e.g. foo.XXXXXXXXXXXXXXXXXXXXX */
if (template != NULL) { if (template != NULL) {
if (slen(template, maxlen, &tlen) < 0) if (slen(template, maxlen, &tlen) < 0)
err_mkhtemp(stfu, EINVAL, err_no_cleanup(stfu, EINVAL,
"invalid template"); "invalid template");
for (p = template + tlen; for (p = template + tlen;
p > template && *--p == 'X'; xc++); p > template && *--p == 'X'; xc++);
if (xc < 6) if (xc < 6)
err_mkhtemp(stfu, EINVAL, err_no_cleanup(stfu, EINVAL,
"template must end in at least 6 X"); "template must end in at least 6 X");
} }
@@ -155,35 +155,35 @@ main(int argc, char *argv[])
if (tmpdir != NULL) { if (tmpdir != NULL) {
rp = realpath(tmpdir, resolved); rp = realpath(tmpdir, resolved);
if (rp == NULL) if (rp == NULL)
err_mkhtemp(stfu, errno, "%s", tmpdir); err_no_cleanup(stfu, errno, "%s", tmpdir);
tmpdir = resolved; tmpdir = resolved;
} }
if (new_tmp_common(&fd, &s, type, if (new_tmp_common(&fd, &s, type,
tmpdir, template) < 0) tmpdir, template) < 0)
err_mkhtemp(stfu, errno, "%s", s); err_no_cleanup(stfu, errno, "%s", s);
#if defined(__OpenBSD__) && defined(OpenBSD) #if defined(__OpenBSD__) && defined(OpenBSD)
#if (OpenBSD) >= 509 #if (OpenBSD) >= 509
if (pledge("stdio", NULL) == -1) if (pledge("stdio", NULL) == -1)
err_mkhtemp(errno, "pledge, exit"); err_no_cleanup(stfu, errno, "pledge, exit");
#endif #endif
#endif #endif
if (s == NULL) if (s == NULL)
err_mkhtemp(stfu, EFAULT, "bad string initialisation"); err_no_cleanup(stfu, EFAULT, "bad string initialisation");
if (*s == '\0') if (*s == '\0')
err_mkhtemp(stfu, EFAULT, "empty string initialisation"); err_no_cleanup(stfu, EFAULT, "empty string initialisation");
if (slen(s, maxlen, &len) < 0) if (slen(s, maxlen, &len) < 0)
err_mkhtemp(stfu, EFAULT, "unterminated string initialisiert"); err_no_cleanup(stfu, EFAULT, "unterminated string initialisiert");
printf("%s\n", s); printf("%s\n", s);
return EXIT_SUCCESS; return EXIT_SUCCESS;
err_usage: err_usage:
err_mkhtemp(stfu, EINVAL, err_no_cleanup(stfu, EINVAL,
"usage: %s [-d] [-p dir] [template]\n", getnvmprogname()); "usage: %s [-d] [-p dir] [template]\n", getnvmprogname());
}/* }/*
@@ -198,24 +198,6 @@ err_usage:
*/ */
void
err_mkhtemp(int stfu,
int errval, const char *msg, ...)
{
va_list args;
if (stfu || msg == NULL)
goto out;
va_start(args, msg);
vfprintf(stderr, msg, args);
va_end(args);
err_no_cleanup(errval, msg, args);
out:
exit(EXIT_FAILURE);
}

14
util/libreboot-utils/nvmutil.c
View File

@@ -36,34 +36,34 @@ main(int argc, char *argv[])
size_t c; size_t c;
if (lbgetprogname(argv[0]) == NULL) if (lbgetprogname(argv[0]) == NULL)
err_no_cleanup(errno, "could not set progname"); err_no_cleanup(0, errno, "could not set progname");
/* https://man.openbsd.org/pledge.2 /* https://man.openbsd.org/pledge.2
https://man.openbsd.org/unveil.2 */ https://man.openbsd.org/unveil.2 */
#if defined(__OpenBSD__) && defined(OpenBSD) #if defined(__OpenBSD__) && defined(OpenBSD)
#if (OpenBSD) >= 604 #if (OpenBSD) >= 604
if (pledge("stdio flock rpath wpath cpath unveil", NULL) == -1) if (pledge("stdio flock rpath wpath cpath unveil", NULL) == -1)
err_no_cleanup(errno, "pledge plus unveil, main"); err_no_cleanup(0, errno, "pledge plus unveil, main");
if (unveil("/dev/null", "r") == -1) if (unveil("/dev/null", "r") == -1)
err_no_cleanup(errno, "unveil r: /dev/null"); err_no_cleanup(0, errno, "unveil r: /dev/null");
#elif (OpenBSD) >= 509 #elif (OpenBSD) >= 509
if (pledge("stdio flock rpath wpath cpath", NULL) == -1) if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
err_no_cleanup(errno, "pledge, main"); err_no_cleanup(0, errno, "pledge, main");
#endif #endif
#endif #endif
#ifndef S_ISREG #ifndef S_ISREG
err_no_cleanup(ECANCELED, err_no_cleanup(0, ECANCELED,
"Can't determine file types (S_ISREG undefined)"); "Can't determine file types (S_ISREG undefined)");
#endif #endif
#if ((CHAR_BIT) != 8) #if ((CHAR_BIT) != 8)
err_no_cleanup(ECANCELED, "Unsupported char size"); err_no_cleanup(0, ECANCELED, "Unsupported char size");
#endif #endif
x = xstart(argc, argv); x = xstart(argc, argv);
if (x == NULL) if (x == NULL)
err_no_cleanup(ECANCELED, "NULL state on init"); err_no_cleanup(0, ECANCELED, "NULL state on init");
/* parse user command */ /* parse user command */
/* TODO: CHECK ACCESSES VIA xstatus() */ /* TODO: CHECK ACCESSES VIA xstatus() */