Imported from util-linux-2.11o tarball.

5 files changed, 5 insertions, 6 deletions

diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index 5a13c4de8..295e63bb7 100644
--- a/sys-utils/cytune.c
+++ b/sys-utils/cytune.c
@@ -184,8 +184,7 @@ int main(int argc, char *argv[]) {
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
-  while (EOF != (i = getopt(argc, argv, 
-			    "qs:S:t:T:gGi:"))) {
+  while ((i = getopt(argc, argv, "qs:S:t:T:gGi:")) != -1) {
     switch (i) {
     case 'q':
       query = 1;
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index a172fc1f4..29a1bd752 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -53,7 +53,7 @@ main( int argc, char *argv[] ) {
    textdomain(PACKAGE);
 
    progname = argv[0];
-   while ((c = getopt( argc, argv, "cn:s:" )) != EOF) {
+   while ((c = getopt( argc, argv, "cn:s:" )) != -1) {
       switch (c) {
       case 'c':
 	 cmd = 4;
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 0673be564..01cc49488 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -149,7 +149,7 @@ main (int argc, char **argv) {
 	textdomain(PACKAGE);
 
 	progname = argv[0];
-	while ((opt = getopt (argc, argv, options)) != EOF) {
+	while ((opt = getopt (argc, argv, options)) != -1) {
 		switch (opt) {
 		case 'i':
 			id = atoi (optarg);
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index a0dd3ac71..398ebb4ce 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -129,7 +129,7 @@ main (int argc, char **argv) {
 	proFile=defaultpro;
 	mapFile=defaultmap;
 
-	while ((c=getopt(argc,argv,optstring))!=-1) {
+	while ((c = getopt(argc,argv,optstring)) != -1) {
 		switch(c) {
 		case 'm': mapFile=optarg; break;
 		case 'n': optNative++;	  break;
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 9249283d0..90105dcb4 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -135,7 +135,7 @@ main (int argc, char ** argv) {
   cmds->next = 0;
 
   show_irq = 1;
-  while ((c = getopt(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV")) != EOF) {
+  while ((c = getopt(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV")) != -1) {
     switch (c) {
     case 'h':
       print_usage(progname);