summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-04 23:32:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-04 23:32:50 +0000
commit25a91b0a1b0ab3aea1afa6b144c6525924a55f9b (patch)
treeaaf01de2656c4ed984897c593b79c086a59cc0f6
parent8def886f3e44af53bc1116c875c32da0d1d6cee9 (diff)
downloaddrakx-backup-do-not-use-25a91b0a1b0ab3aea1afa6b144c6525924a55f9b.tar
drakx-backup-do-not-use-25a91b0a1b0ab3aea1afa6b144c6525924a55f9b.tar.gz
drakx-backup-do-not-use-25a91b0a1b0ab3aea1afa6b144c6525924a55f9b.tar.bz2
drakx-backup-do-not-use-25a91b0a1b0ab3aea1afa6b144c6525924a55f9b.tar.xz
drakx-backup-do-not-use-25a91b0a1b0ab3aea1afa6b144c6525924a55f9b.zip
add is_ext3
-rw-r--r--perl-install/c/Makefile.PL2
-rw-r--r--perl-install/c/stuff.xs.pm21
2 files changed, 22 insertions, 1 deletions
diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL
index 6b323807c..8bbafae6e 100644
--- a/perl-install/c/Makefile.PL
+++ b/perl-install/c/Makefile.PL
@@ -4,7 +4,7 @@ use Config;
# the contents of the Makefile that is written.
my $libs = '-lldetect';
-$libs .= ' -L/usr/X11R6/lib -lX11 -lgdk -lXxf86misc' if $ENV{C_DRAKX};
+$libs .= ' -L/usr/X11R6/lib -lX11 -lgdk -lXxf86misc -lext2fs' if $ENV{C_DRAKX};
$libs .= ' -lrpm -lrpmdb -lrpmio -lz' if $ENV{C_RPM};
my $pcmcia_dir = $ENV{C_DRAKX} && $Config{archname} =~ /i.86/ ? '../../mdk-stage1/pcmcia' : '';
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 235e929c3..a3952fb28 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -77,6 +77,10 @@ void rpmError_callback(void) {
';
$ENV{C_DRAKX} and print '
+
+#include <ext2fs/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+
#include <gdk/gdkx.h>
void initIMPS2() {
@@ -127,6 +131,23 @@ pcmcia_probe()
$ENV{C_DRAKX} and print '
+int
+is_ext3(device_name)
+ char * device_name
+ CODE:
+ {
+ ext2_filsys fs;
+ int retval = ext2fs_open (device_name, 0, 0, 0, unix_io_manager, &fs);
+ if (retval) {
+ RETVAL = 0;
+ } else {
+ RETVAL = fs->super->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL;
+ ext2fs_close(fs);
+ }
+ }
+ OUTPUT:
+ RETVAL
+
void
setMouseLive(display, type, emulate3buttons)
char *display