From 1090fd720f0c25b8e3e7e5e61e6a5fcebe9a10b1 Mon Sep 17 00:00:00 2001
From: jkar8572 <jkar8572>
Date: Thu, 26 Apr 2001 09:36:08 +0000
Subject: Fixed underscore bug (Nathan Scott) EOF -> -1 (Michael Meskes)

---
 convertquota.c | 2 +-
 edquota.c      | 6 +++---
 quot.c         | 2 +-
 quota.c        | 4 ++--
 quotacheck.c   | 4 ++--
 quotaon.c      | 4 ++--
 repquota.c     | 4 ++--
 setquota.c     | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/convertquota.c b/convertquota.c
index 5422081..c061459 100644
--- a/convertquota.c
+++ b/convertquota.c
@@ -35,7 +35,7 @@ void parse_options(int argcnt, char **argstr)
 	else
 		slash++;
 	sstrncpy(cmdname, slash, sizeof(cmdname));
-	while ((ret = getopt(argcnt, argstr, "Vugh:")) != EOF) {
+	while ((ret = getopt(argcnt, argstr, "Vugh:")) != -1) {
 		switch (ret) {
 			case '?':
 			case 'h':
diff --git a/edquota.c b/edquota.c
index 1910e7f..52c92a1 100644
--- a/edquota.c
+++ b/edquota.c
@@ -34,7 +34,7 @@
 
 #ident "$Copyright: (c) 1980, 1990 Regents of the University of California. $"
 #ident "$Copyright: All rights reserved. $"
-#ident "$Id: edquota.c,v 1.2 2001/04/11 10:12:36 jkar8572 Exp $"
+#ident "$Id: edquota.c,v 1.3 2001/04/26 09:36:08 jkar8572 Exp $"
 
 /*
  * Disk quota editor.
@@ -93,9 +93,9 @@ int main(int argc, char **argv)
 
 	quotatype = USRQUOTA;
 #if defined(RPC_SETQUOTA)
-	while ((ret = getopt(argc, argv, "ugrntVp:F:")) != EOF) {
+	while ((ret = getopt(argc, argv, "ugrntVp:F:")) != -1) {
 #else
-	while ((ret = getopt(argc, argv, "ugtVp:F:")) != EOF) {
+	while ((ret = getopt(argc, argv, "ugtVp:F:")) != -1) {
 #endif
 		switch (ret) {
 		  case 'p':
diff --git a/quot.c b/quot.c
index fff2812..940dbc5 100644
--- a/quot.c
+++ b/quot.c
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 	now = time(0);
 	progname = basename(argv[0]);
 
-	while ((c = getopt(argc, argv, "acfguvV")) != EOF) {
+	while ((c = getopt(argc, argv, "acfguvV")) != -1) {
 		switch (c) {
 		  case 'a':
 			  aflag++;
diff --git a/quota.c b/quota.c
index 1f30c0f..bea2865 100644
--- a/quota.c
+++ b/quota.c
@@ -34,7 +34,7 @@
 
 #ident "$Copyright: (c) 1980, 1990 Regents of the University of California. $"
 #ident "$Copyright: All rights reserved. $"
-#ident "$Id: quota.c,v 1.3 2001/04/25 12:52:19 jkar8572 Exp $"
+#ident "$Id: quota.c,v 1.4 2001/04/26 09:36:08 jkar8572 Exp $"
 
 /*
  * Disk quota reporting program.
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 
 	gettexton();
 
-	while ((ret = getopt(argc, argv, "guqvVF:")) != EOF) {
+	while ((ret = getopt(argc, argv, "guqvVF:")) != -1) {
 		switch (ret) {
 		  case 'g':
 			  gflag++;
diff --git a/quotacheck.c b/quotacheck.c
index 0c2e46a..f1f02a8 100644
--- a/quotacheck.c
+++ b/quotacheck.c
@@ -8,7 +8,7 @@
  *	New quota format implementation - Jan Kara <jack@suse.cz> - Sponsored by SuSE CR
  */
 
-#ident "$Id: quotacheck.c,v 1.6 2001/04/25 14:16:44 jkar8572 Exp $"
+#ident "$Id: quotacheck.c,v 1.7 2001/04/26 09:36:08 jkar8572 Exp $"
 
 #include <dirent.h>
 #include <stdio.h>
@@ -281,7 +281,7 @@ static void parse_options(int argcnt, char **argstr)
 	else
 		slash = argstr[0];
 
-	while ((ret = getopt(argcnt, argstr, "VhcvugidnfF:mMRa")) != EOF) {
+	while ((ret = getopt(argcnt, argstr, "VhcvugidnfF:mMRa")) != -1) {
 		switch (ret) {
 		  case 'g':
 			  gwant = 1;
diff --git a/quotaon.c b/quotaon.c
index 12cce13..e6545d4 100644
--- a/quotaon.c
+++ b/quotaon.c
@@ -34,7 +34,7 @@
 
 #ident "$Copyright: (c) 1980, 1990 Regents of the University of California $"
 #ident "$Copyright: All rights reserved. $"
-#ident "$Id: quotaon.c,v 1.2 2001/04/11 10:12:36 jkar8572 Exp $"
+#ident "$Id: quotaon.c,v 1.3 2001/04/26 09:36:08 jkar8572 Exp $"
 
 /*
  * Turn quota on/off for a filesystem.
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 	else if (strcmp(whoami, "quotaon") != 0)
 		die(1, _("Name must be quotaon or quotaoff not %s\n"), whoami);
 
-	while ((c = getopt(argc, argv, "afvugx:V")) != EOF) {
+	while ((c = getopt(argc, argv, "afvugx:V")) != -1) {
 		switch (c) {
 		  case 'a':
 			  aflag++;
diff --git a/repquota.c b/repquota.c
index 4f78251..0399167 100644
--- a/repquota.c
+++ b/repquota.c
@@ -38,7 +38,7 @@ static void parse_options(int argcnt, char **argstr)
 	else
 		slash++;
 
-	while ((ret = getopt(argcnt, argstr, "VavughF:")) != EOF) {
+	while ((ret = getopt(argcnt, argstr, "VavughF:")) != -1) {
 		switch (ret) {
 		  case '?':
 		  case 'h':
@@ -124,7 +124,7 @@ static void report_it(struct quota_handle *h, int type)
 	time2str(h->qh_info.dqi_igrace, igbuf, TF_ROUND);
 	printf(_("Block grace time: %s; Inode grace time: %s\n"), bgbuf, igbuf);
 	printf(_("                        Block limits                File limits\n"));
-	printf(_("%-10s       used    soft    hard  grace    used  soft  hard  grace\n"), (type == USRQUOTA)?_("User"):_("Group"));
+	printf(_("%-9s       used    soft    hard  grace    used  soft  hard  grace\n"), (type == USRQUOTA)?_("User"):_("Group"));
 	printf("----------------------------------------------------------------------\n");
 
 	if (h->qh_ops->scan_dquots(h, print) < 0)
diff --git a/setquota.c b/setquota.c
index a08783a..4f27ca8 100644
--- a/setquota.c
+++ b/setquota.c
@@ -92,7 +92,7 @@ static void parse_options(int argcnt, char **argstr)
 	flags |= FL_RPC;
 #endif
 
-	while ((ret = getopt(argcnt, argstr, opts)) != EOF) {
+	while ((ret = getopt(argcnt, argstr, opts)) != -1) {
 		switch (ret) {
 		  case '?':
 		  case 'h':
-- 
cgit v1.2.3