d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unportable calls to basename().

Browse Source 
The POSIX version of basename() doesn't use a 'const char *' argument;
the function may overwrite its input buffer. Instead of copying the
input string, let's just simplify this code by using our getprogname()
function that already returns the name of the application in the right
format.

Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D6094
This commit is contained in:
ed 2016-04-26 10:04:06 +00:00
parent 94d1b679ab
commit 3a781f5763
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/bsdinstall/partedit/partedit.c
View File

@ -27,15 +27,15 @@
*/
#include <sys/param.h>
#include <libgen.h>
#include <libutil.h>
#include <inttypes.h>
#include <errno.h>
#include <fstab.h>
#include <libgeom.h>
#include <dialog.h>
#include <dlg_keys.h>
#include <errno.h>
#include <fstab.h>
#include <inttypes.h>
#include <libgeom.h>
#include <libutil.h>
#include <stdlib.h>
#include "diskeditor.h"
#include "partedit.h"
@ -71,13 +71,14 @@ int
main(int argc, const char **argv)
{
struct partition_metadata *md;
const char *prompt;
const char *progname, *prompt;
struct partedit_item *items = NULL;
struct gmesh mesh;
int i, op, nitems, nscroll;
int error;
if (strcmp(basename(argv[0]), "sade") == 0)
progname = getprogname();
if (strcmp(progname, "sade") == 0)
sade_mode = 1;
TAILQ_INIT(&part_metadata);
@ -93,7 +94,7 @@ main(int argc, const char **argv)
/* Revert changes on SIGINT */
signal(SIGINT, sigint_handler);
if (strcmp(basename(argv[0]), "autopart") == 0) { /* Guided */
if (strcmp(progname, "autopart") == 0) { /* Guided */
prompt = "Please review the disk setup. When complete, press "
"the Finish button.";
/* Experimental ZFS autopartition support */
@ -102,7 +103,7 @@ main(int argc, const char **argv)
} else {
part_wizard("ufs");
}
} else if (strcmp(basename(argv[0]), "scriptedpart") == 0) {
} else if (strcmp(progname, "scriptedpart") == 0) {
error = scripted_editor(argc, argv);
prompt = NULL;
if (error != 0) {