From: jakob <grandchild@gmx.net>
Date: Thu, 6 Jul 2017 14:52:32 +0000 (+0200)
Subject: Fix overwrite of getopt optind
X-Git-Tag: 2.10~6^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cddb87420bad8e61f0cddfa1028dc0c87fb9ba04;p=i3%2Fi3lock

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
---

diff --git a/i3lock.c b/i3lock.c
index 87a77b1..af678aa 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -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':