isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use sudo_basename() instead of doing the equivalent manually.

Browse Source
This commit is contained in:
Todd C. Miller
2021-02-10 15:14:08 -07:00
parent 41fa461fe1
commit 0663ffbc3f
15 changed files with 38 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sudo_edit.c
View File

@@ -132,20 +132,17 @@ set_tmpdir(struct sudo_cred *user_cred)
static int
sudo_edit_mktemp(const char *ofile, char **tfile)
{
const char *cp, *suff;
const char *base, *suff;
int len, tfd;
debug_decl(sudo_edit_mktemp, SUDO_DEBUG_EDIT);
if ((cp = strrchr(ofile, '/')) != NULL)
cp++;
else
cp = ofile;
suff = strrchr(cp, '.');
base = sudo_basename(ofile);
suff = strrchr(base, '.');
if (suff != NULL) {
len = asprintf(tfile, "%s/%.*sXXXXXXXX%s", edit_tmpdir,
(int)(size_t)(suff - cp), cp, suff);
(int)(size_t)(suff - base), base, suff);
} else {
len = asprintf(tfile, "%s/%s.XXXXXXXX", edit_tmpdir, cp);
len = asprintf(tfile, "%s/%s.XXXXXXXX", edit_tmpdir, base);
}
if (len == -1) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));