circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 15:16:57 +00:00
Code Issues Projects Releases Wiki Activity

__progname -> getprogname()

Browse Source 
Fix fallout from recent use of getprogname(), which deprecates __progname.
This commit is contained in:
Thomas Adam
2016-05-27 20:11:32 +01:00
parent a2e0db67cc
commit c10d83b4df
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compat/getopt.c
View File

@ -84,7 +84,8 @@ BSDgetopt(int nargc, char *const *nargv, const char *ostr)
++BSDoptind; ++BSDoptind;
if (BSDopterr && *ostr != ':') if (BSDopterr && *ostr != ':')
(void)fprintf(stderr, (void)fprintf(stderr,
"%s: unknown option -- %c\n", __progname, BSDoptopt); "%s: unknown option -- %c\n", getprogname(),
BSDoptopt);
return (BADCH); return (BADCH);
} }
if (*++oli != ':') { /* don't need argument */ if (*++oli != ':') { /* don't need argument */
@ -102,7 +103,7 @@ BSDgetopt(int nargc, char *const *nargv, const char *ostr)
if (BSDopterr) if (BSDopterr)
(void)fprintf(stderr, (void)fprintf(stderr,
"%s: option requires an argument -- %c\n", "%s: option requires an argument -- %c\n",
__progname, BSDoptopt); getprogname(), BSDoptopt);
return (BADCH); return (BADCH);
} }
else /* white space */ else /* white space */

2
tmux.c
View File

@ -225,7 +225,7 @@ main(int argc, char **argv)
flags |= CLIENT_CONTROL; flags |= CLIENT_CONTROL;
break; break;
case 'V': case 'V':
printf("%s %s\n", __progname, VERSION); printf("%s %s\n", getprogname(), VERSION);
exit(0); exit(0);
case 'f': case 'f':
set_cfg_file(optarg); set_cfg_file(optarg);