[PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota

[PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota

[Eric Sandeen]

It looks like libxcmd wasn't ever being built with -DENABLE_READLINE
even when it was asked for by configure --enable-readline=yes
so xfs_io & xfs_quota didn't get the functionality.

This seems to fix it up for me (fixes editline too while we're
at it).

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---


Index: xfsprogs-3.0.1/libxcmd/Makefile
===================================================================
--- xfsprogs-3.0.1.orig/libxcmd/Makefile
+++ xfsprogs-3.0.1/libxcmd/Makefile
@@ -20,6 +20,14 @@ ifeq ($(HAVE_GETMNTINFO),yes)
 LCFLAGS += -DHAVE_GETMNTINFO
 endif
 
+ifeq ($(ENABLE_READLINE),yes)
+LCFLAGS += -DENABLE_READLINE
+endif
+
+ifeq ($(ENABLE_EDITLINE),yes)
+LCFLAGS += -DENABLE_EDITLINE
+endif
+
 default: $(LTLIBRARY)
 
 include $(BUILDRULES)

Index: xfsprogs-3.0.1/growfs/Makefile
===================================================================
--- xfsprogs-3.0.1.orig/growfs/Makefile
+++ xfsprogs-3.0.1/growfs/Makefile
@@ -10,6 +10,14 @@ LTCOMMAND = xfs_growfs
 CFILES = xfs_growfs.c
 
 LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
+ifeq ($(ENABLE_READLINE),yes)
+LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+endif
+
+ifeq ($(ENABLE_EDITLINE),yes)
+LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
+endif
+
 LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
 LLDFLAGS = -static
 LSRCFILES = xfs_info.sh

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota

[Christoph Hellwig]

On Fri, May 15, 2009 at 08:31:40PM -0500, Eric Sandeen wrote:
> It looks like libxcmd wasn't ever being built with -DENABLE_READLINE
> even when it was asked for by configure --enable-readline=yes
> so xfs_io & xfs_quota didn't get the functionality.
> 
> This seems to fix it up for me (fixes editline too while we're
> at it).

I've also been wondering for quite some while why xfs_io didn't have
working readline support.

This patch makes it work for me and looks good:


Reviewed-by: Christoph Hellwig <hch@lst.de>

(btw, any reason we don't enable readline support by default if
we find the headers installed?)

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota

[Eric Sandeen]

Christoph Hellwig wrote:
> On Fri, May 15, 2009 at 08:31:40PM -0500, Eric Sandeen wrote:
>> It looks like libxcmd wasn't ever being built with -DENABLE_READLINE
>> even when it was asked for by configure --enable-readline=yes
>> so xfs_io & xfs_quota didn't get the functionality.
>>
>> This seems to fix it up for me (fixes editline too while we're
>> at it).
> 
> I've also been wondering for quite some while why xfs_io didn't have
> working readline support.
> 
> This patch makes it work for me and looks good:
> 
> 
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> 
> (btw, any reason we don't enable readline support by default if
> we find the headers installed?)
> 

I dunno... Nathan, any idea?  Maybe some git-digging is in order.

-Eric

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota

[Eric Sandeen]

Eric Sandeen wrote:
> Christoph Hellwig wrote:

...

>> (btw, any reason we don't enable readline support by default if
>> we find the headers installed?)
>>
> 
> I dunno... Nathan, any idea?  Maybe some git-digging is in order.
> 
> -Eric
> 

xfsprogs-2.4.2 (25 March 2003)
        - Added the xfs_io(8) command, an xfs_db(8) alike command
          for testing and debugging the XFS file IO path.
        - Added an optional dependency on the GNU readline library
          which is "off" by default and enabled with the configure
          option --enable-readline=yes; it affects the interactive
          tools only (xfs_db and now xfs_io).

looks like it was done that way originally and never changed, commit
e246ba5f93896ac873d25f65c05496e6e2c69e34 I think.

Fine by me to make the default yes if it's there ...

-Eric

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfsprogs: fix readline/editline for xfs_io and xfs_quota

[Nathan Scott]

----- "Eric Sandeen" <sandeen@sandeen.net> wrote:

> Eric Sandeen wrote:
> > Christoph Hellwig wrote:
> 
> ...
> 
> >> (btw, any reason we don't enable readline support by default if
> >> we find the headers installed?)
> >>
> > 
> > I dunno... Nathan, any idea?  Maybe some git-digging is in order.
> > 

No idea, sorry, too long ago... perhaps not wanting to introduce
dependencies unexpectedly (rescue disks/installers, etc might not
have readline lib).

cheers.

-- 
Nathan

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs