From 6deb3295df96c7906adda2bc6b50d123acee6fd4 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 9 May 2008 09:12:12 +0000
Subject: [PATCH] Branch b_release_1_6_5 Reinitialize optind to 0 on each lfs_*
 call, in case lfs is being used interactively.  Most lfs_* functions do this
 already, but a few (find, setstripe, quotachown) do not. b=15212 i=rupesh
 (kalpak original patch) i=johann

---
 lustre/utils/lfs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index dba6a47..aaba0b2 100644
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -188,9 +188,9 @@ static int lfs_setstripe(int argc, char **argv)
                 stripe_count_arg = argv[4];
                 optind = 4;
         } else {
+                optind = 0;
                 while ((c = getopt_long(argc, argv, "c:di:s:",
-                                                long_opts, NULL)) >= 0) 
-                {
+                                                long_opts, NULL)) >= 0) {
                         switch (c) {
                         case 0:
                                 /* Long options. */
@@ -337,6 +337,7 @@ static int lfs_find(int argc, char **argv)
 
         time(&t);
 
+        optind = 0;
         while ((c = getopt_long_only(argc, argv, "-A:C:D:M:n:PpO:qrs:t:v",
                                      long_opts, NULL)) >= 0) {
                 xtime = NULL;
@@ -1060,6 +1061,7 @@ static int lfs_quotachown(int argc, char **argv)
         int c,rc;
         int flag = 0;
 
+        optind = 0;
         while ((c = getopt(argc, argv, "i")) != -1) {
                 switch (c) {
                 case 'i':
-- 
1.8.3.1