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

dhclient: recorrect __progname to getprogname()

Browse Source 
A more correct way to modernize code that uses __progname is to just
replace each occurance of it with a call to getprogname(3)

Reported by:	ian
Reviewed by:	imp
This commit is contained in:
Eitan Adler 2018-06-25 01:29:54 +00:00
parent adcd95974d
commit b537db698c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/dhclient/dhclient.c
View File

@ -149,7 +149,6 @@ int fork_privchld(int, int);
#define MIN_MTU 68 #define MIN_MTU 68
static time_t scripttime; static time_t scripttime;
static char *__progname;
int int
findproto(char *cp, int n) findproto(char *cp, int n)
@ -379,12 +378,10 @@ main(int argc, char *argv[])
pid_t otherpid; pid_t otherpid;
cap_rights_t rights; cap_rights_t rights;
__progname = basename(argv[0]);
init_casper(); init_casper();
/* Initially, log errors to stderr as well as to syslogd. */ /* Initially, log errors to stderr as well as to syslogd. */
cap_openlog(capsyslog, __progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY); cap_openlog(capsyslog, getprogname(), LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY);
cap_setlogmask(capsyslog, LOG_UPTO(LOG_DEBUG)); cap_setlogmask(capsyslog, LOG_UPTO(LOG_DEBUG));
while ((ch = getopt(argc, argv, "bc:dl:p:qu")) != -1) while ((ch = getopt(argc, argv, "bc:dl:p:qu")) != -1)
@ -566,7 +563,7 @@ void
usage(void) usage(void)
{ {
fprintf(stderr, "usage: %s [-bdqu] ", __progname); fprintf(stderr, "usage: %s [-bdqu] ", getprogname());
fprintf(stderr, "[-c conffile] [-l leasefile] interface\n"); fprintf(stderr, "[-c conffile] [-l leasefile] interface\n");
exit(1); exit(1);
} }