mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix overwrite of getopt optind 

Using 'optind' in getopt_long() shadows actual 'optind' being provided
by getopt, thus prevents any future options change from using optind.

See https://www.gnu.org/software/libc/manual/html_node/Getopt-Long-Options.html#index-getopt_005flong
pull/135/head
jakob 2017-07-06 16:52:32 +02:00
parent 8e6e47fe0a
commit cddb87420b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3lock.c
View File

@ -819,7 +819,7 @@ int main(int argc, char *argv[]) {
#endif
int curs_choice = CURS_NONE;
int o;
int optind = 0;
int longoptind = 0;
struct option longopts[] = {
{"version", no_argument, NULL, 'v'},
{"nofork", no_argument, NULL, 'n'},
@ -843,7 +843,7 @@ int main(int argc, char *argv[]) {
errx(EXIT_FAILURE, "pw->pw_name is NULL.\n");
char *optstring = "hvnbdc:p:ui:teI:f";
while ((o = getopt_long(argc, argv, optstring, longopts, &optind)) != -1) {
while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {
switch (o) {
case 'v':
errx(EXIT_SUCCESS, "version " VERSION " © 2010 Michael Stapelberg");
@ -894,7 +894,7 @@ int main(int argc, char *argv[]) {
ignore_empty_password = true;
break;
case 0:
if (strcmp(longopts[optind].name, "debug") == 0)
if (strcmp(longopts[longoptind].name, "debug") == 0)
debug_mode = true;
break;
case 'f':