Skip to contentSkip to conversation

xfsprogs: fix readline/editline for xfs_io and xfs_quota

PATCH In review Eric Sandeen 3 participants 5 messages May 16, 2009 – May 17, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfsprogs: fix readline/editline for xfs_io and xfs_quota

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).

---

libxcmd/Makefile +8 -0
Index: 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)
growfs/Makefile +8 -0
Index: 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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · 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).

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:

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

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
Quoted 11 lines · Christoph Hellwig
Quoted 6 lines · 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).

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

Quoted 8 lines

This patch makes it work for me and looks good:

(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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#3 lore raw
Quoted 1 line · Eric Sandeen

Christoph Hellwig wrote:

...

Quoted 8 lines
Quoted 3 lines

(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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#4 lore raw
Quoted 11 lines · ----- "Eric Sandeen
Quoted 1 line · Eric Sandeen

Christoph Hellwig wrote:

...

Quoted 6 lines
Quoted 3 lines

(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.

Signature · 6 lines
Nathan

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs