Compare getopt_long return value against -1, not EOF. Use NULL, not '(int *) 0'...

diff --git a/src/date.c b/src/date.c
index b336542f7b5851e43bf4deaa1be1bb9fea7343d8..b69019b43c19e1a2e6bec1d98fb0514f2c158ab7 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -158,7 +158,7 @@ main (int argc, char **argv)
   textdomain (PACKAGE);
 
   while ((optc = getopt_long (argc, argv, "d:f:r:Rs:u", long_options, NULL))
-        != EOF)
+        != -1)
     switch (optc)
       {
       case 0:

diff --git a/src/env.c b/src/env.c
index 86d00d795cccb9abaedf5db33c606f4a51c20062..c6c8ab60db0b1a1cb11429e16e364a4ba6e810c7 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -122,7 +122,7 @@ main (register int argc, register char **argv, char **envp)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((optc = getopt_long (argc, argv, "+iu:", longopts, (int *) 0)) != EOF)
+  while ((optc = getopt_long (argc, argv, "+iu:", longopts, NULL)) != -1)
     {
       switch (optc)
        {
@@ -158,7 +158,7 @@ main (register int argc, register char **argv, char **envp)
       putenv (*envp);
 
   optind = 0;                  /* Force GNU getopt to re-initialize. */
-  while ((optc = getopt_long (argc, argv, "+iu:", longopts, (int *) 0)) != EOF)
+  while ((optc = getopt_long (argc, argv, "+iu:", longopts, NULL)) != -1)
     if (optc == 'u')
       putenv (optarg);         /* Requires GNU putenv. */
 

diff --git a/src/id.c b/src/id.c
index 6c54633bcbbebf40d0bf9a60f7e09e245655d69e..23c4ad50616b51c7117b9c0c6c7e50c544f96f92 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -104,8 +104,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((optc = getopt_long (argc, argv, "agnruG", longopts, (int *) 0))
-        != EOF)
+  while ((optc = getopt_long (argc, argv, "agnruG", longopts, NULL)) != -1)
     {
       switch (optc)
        {

diff --git a/src/logname.c b/src/logname.c
index 235ad5dcd83693d1c7d23a1759481896cf7f6886..c8197369fd690ee4d6ce99fd84960c069d830caa 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) != EOF)
+  while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
       switch (c)
        {

diff --git a/src/nice.c b/src/nice.c
index 029b85590de0edada4f6b90d39cecc279d1fef15..d66950e3bbc605d71cbf2b0e362ede60150f61d9 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -106,7 +106,7 @@ main (int argc, char **argv)
          optind = 0;
 
          if ((optc = getopt_long (argc - (i - 1), fake_argv, "+n:",
-                                  longopts, (int *) 0)) != EOF)
+                                  longopts, NULL)) != -1)
            {
              switch (optc)
                {

diff --git a/src/pathchk.c b/src/pathchk.c
index c8346148e27378d53040c3574ea24cad32561995..db8e23496a9be4090c4c9c95f7ad0f532ba0ad12 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -124,7 +124,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((optc = getopt_long (argc, argv, "p", longopts, (int *) 0)) != EOF)
+  while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1)
     {
       switch (optc)
        {

diff --git a/src/printenv.c b/src/printenv.c
index 6fb9aca84f1c287f04d11fbe9009da41564be643..ad548c4219d6bef516c9591601354fb3270a31fe 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -87,7 +87,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) != EOF)
+  while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
       switch (c)
        {

diff --git a/src/seq.c b/src/seq.c
index 5a8a26f6e68ac563a67e1aee2baa6f5ee9d7400b..a92c670db0b6c3015dd58ddf90cbeacb4968943c 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -130,7 +130,7 @@ main (int argc, char **argv)
      REQUIRE_ORDER (the '+' in the format string) and it abort on the
      first non-option or negative number.  */
   while ((optc = getopt_long (argc, argv, "+0123456789f:s:w", long_options,
-                             (int *) 0)) != EOF)
+                             NULL)) != -1)
     {
       if ('0' <= optc && optc <= '9')
        {

diff --git a/src/sleep.c b/src/sleep.c
index 9ec0bb33856476edb496bff20c549c6e027fd3c7..6ab1e022e1bed90f208aa9b8f1f5cd022fb5e6d0 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) != EOF)
+  while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
       switch (c)
        {

diff --git a/src/stty.c b/src/stty.c
index a8902f0d34f4cdb0013f57beb4425ec1d1868cb4..e2167765e82f6a3a5710f3331601d16790c480c2 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -673,8 +673,7 @@ main (int argc, char **argv)
 
   /* Recognize the long options only.  */
   opterr = 0;
-  while ((optc = getopt_long_only (argc, argv, "ag", longopts, (int *) 0))
-        != EOF)
+  while ((optc = getopt_long_only (argc, argv, "ag", longopts, NULL)) != -1)
     {
       switch (optc)
        {

diff --git a/src/su.c b/src/su.c
index 51e2e8165fa928330029b01db5c5dbd1bd8ea504..6c8a942fce3d8776863847ff2415bb4195f2de35 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -467,8 +467,7 @@ main (int argc, char **argv)
   simulate_login = 0;
   change_environment = 1;
 
-  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, (int *) 0))
-        != EOF)
+  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
     {
       switch (optc)
        {

diff --git a/src/tee.c b/src/tee.c
index cda83fec0733b819fbed33e56cad4d014ef2e8e4..e5946eeb841d086d43b3bac87263cac4cdcf24a0 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -91,8 +91,7 @@ main (int argc, char **argv)
   append = 0;
   ignore_interrupts = 0;
 
-  while ((optc = getopt_long (argc, argv, "ai", long_options, (int *) 0))
-        != EOF)
+  while ((optc = getopt_long (argc, argv, "ai", long_options, NULL)) != -1)
     {
       switch (optc)
        {

diff --git a/src/tty.c b/src/tty.c
index cc67bdcf444b72b12a402b86ed6ce1c05637f41e..dfc72e5c00e7c63bd26d127b8bad4c1bf7571a99 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
 
   silent = 0;
 
-  while ((optc = getopt_long (argc, argv, "s", longopts, (int *) 0)) != EOF)
+  while ((optc = getopt_long (argc, argv, "s", longopts, NULL)) != -1)
     {
       switch (optc)
        {

diff --git a/src/uname.c b/src/uname.c
index d8f02dbfae7dd75efa63758644f1c991dfb92ac0..a64839338037a1085fc1459689742e4ecbef5939 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -102,8 +102,7 @@ main (int argc, char **argv)
 
   toprint = 0;
 
-  while ((c = getopt_long (argc, argv, "snrvpma", long_options, (int *) 0))
-        != EOF)
+  while ((c = getopt_long (argc, argv, "snrvpma", long_options, NULL)) != -1)
     {
       switch (c)
        {

diff --git a/src/who-users.c b/src/who-users.c
index a4f5e5b33089883a03c2a53e894a3f646a0e82a0..4bb76df4b695c35fee58393325543746be8a580e 100644 (file)
--- a/src/who-users.c
+++ b/src/who-users.c
@@ -698,11 +698,12 @@ main (int argc, char **argv)
   textdomain (PACKAGE);
 
 #ifdef WHO
-  while ((optc = getopt_long (argc, argv, "imqsuwHT", longopts, &longind))
+# define WU_OPTS "imqsuwHT"
 #else
-  while ((optc = getopt_long (argc, argv, "", longopts, &longind))
-#endif /* WHO */
-        != EOF)
+# define WU_OPTS ""
+#endif
+
+  while ((optc = getopt_long (argc, argv, WU_OPTS, longopts, &longind)) != -1)
     {
       switch (optc)
        {

diff --git a/src/whoami.c b/src/whoami.c
index 4d15236908f288164f950bc004023b91c1c80850..52b7b650b908c94ca4c57660eab53b3b1c2b76b8 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  while ((c = getopt_long (argc, argv, "", long_options, (int *) 0)) != EOF)
+  while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
       switch (c)
        {