On Thu, 2013-05-02 at 11:08 -0500, Eric Sandeen wrote: > On 5/2/13 10:38 AM, Chandra Seetharaman wrote: > > On Thu, 2013-05-02 at 09:53 -0500, Eric Sandeen wrote: > >> Pull all of the old xfs_check script into common/rc:_xfs_check() > >> so that it properly handles all options, including external log > >> devices. > > > > I see changes only related to USAGE. iiuc, log devices are handled > > properly by current code. > > also: > > >> + set -- extra $@ > >> + shift $OPTIND > > have you *tested* log devices w/ your original code? It failed for > Michael and for myself, so... ;) > > -Eric yikes. sorry :( > > >> > >> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> > >> --- > >> > >> diff --git a/common/rc b/common/rc > >> index 19a0e18..b47a53e 100644 > >> --- a/common/rc > >> +++ b/common/rc > >> @@ -393,8 +393,8 @@ _xfs_check() > >> { > >> OPTS=" " > >> DBOPTS=" " > >> + USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special" > >> > >> - OPTIND=1 > >> while getopts "b:fi:l:stvV" c > >> do > >> case $c in > >> @@ -410,8 +410,17 @@ _xfs_check() > >> ;; > >> esac > >> done > >> - ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 > >> - return $? > >> + set -- extra $@ > >> + shift $OPTIND > >> + case $# in > >> + 1) ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 > >> + status=$? > >> + ;; > >> + 2) echo $USAGE 1>&1 > >> + status=2 > >> + ;; > >> + esac > >> + return $status > >> } > >> > >> _setup_large_ext4_fs() > >> > >> > >> > > > > > > _______________________________________________ > > xfs mailing list > > xfs@xxxxxxxxxxx > > http://oss.sgi.com/mailman/listinfo/xfs > > > _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs