tests,debugfs: ea_set's "-f <value_file" needs to be before the other args

For systems that don't use GNU's getopt(3), options have to be before
all non-option arguments.  So change the usage message for debugfs's
ea_set command, and then fix the d_xattr_sorting test.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/xattrs.c b/debugfs/xattrs.c
index e71bc15..b938cc0 100644 (file)
--- a/debugfs/xattrs.c
+++ b/debugfs/xattrs.c
@@ -196,15 +196,14 @@ void do_set_xattr(int argc, char **argv)
                        }
                        break;
                default:
-                       printf("%s: Usage: %s <file> <attr> [-f infile | "
-                              "value]\n", argv[0], argv[0]);
-                       goto out2;
+                       goto print_usage;
                }
        }
 
        if (!(fp && optind == argc - 2) && !(!fp && optind == argc - 3)) {
-               printf("%s: Usage: %s <file> <attr> [-f infile | value>]\n",
-                      argv[0], argv[0]);
+       print_usage:
+               printf("Usage:\t%s <file> <attr> <value>\n", argv[0]);
+               printf("\t%s -f <value_file> <file> <attr>\n", argv[0]);
                goto out2;
        }
 

diff --git a/tests/d_xattr_sorting/expect b/tests/d_xattr_sorting/expect
index 17da663..30a6eab 100644 (file)
--- a/tests/d_xattr_sorting/expect
+++ b/tests/d_xattr_sorting/expect
@@ -1,9 +1,9 @@
 debugfs sort extended attributes
 mke2fs -Fq -b 1024 test.img 512
 Exit status is 0
-ea_set / security.SMEG64 -f /tmp/b
+ea_set -f /tmp/b / security.SMEG64
 Exit status is 0
-ea_set / security.imb -f /tmp/b
+ea_set -f /tmp/b / security.imb
 Exit status is 0
 ea_set / user.moo cow
 Exit status is 0

diff --git a/tests/d_xattr_sorting/script b/tests/d_xattr_sorting/script
index 30187f1..8d5602e 100644 (file)
--- a/tests/d_xattr_sorting/script
+++ b/tests/d_xattr_sorting/script
@@ -21,14 +21,14 @@ B=$(mktemp ${TMPDIR:-/tmp}/b.XXXXXX)
 
 perl -e 'print "x" x 256;' > $B
 
-echo "ea_set / security.SMEG64 -f /tmp/b" > $OUT.new
-$DEBUGFS -w -R "ea_set / security.SMEG64 -f $B" $TMPFILE >> $OUT.new 2>&1
+echo "ea_set -f /tmp/b / security.SMEG64" > $OUT.new
+$DEBUGFS -w -R "ea_set -f $B / security.SMEG64" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
 sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 
-echo "ea_set / security.imb -f /tmp/b" > $OUT.new
-$DEBUGFS -w -R "ea_set / security.imb -f $B" $TMPFILE >> $OUT.new 2>&1
+echo "ea_set -f /tmp/b / security.imb" > $OUT.new
+$DEBUGFS -w -R "ea_set -f $B / security.imb" $TMPFILE >> $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
 sed -f $cmd_dir/filter.sed $OUT.new >> $OUT