From 7c950efa3438b02097d915497d67248dde709e72 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 11 May 2009 15:06:06 +0200 Subject: build-sys: fix blkid.h include for old e2fsprogs When building util-linux-ng-2.15, I get this: ../lib/fsprobe.c:10:19: error: blkid.h: No such file or directory Unfortunately, the blkid.pc uses -I${includedir}/blkidi since e2fsprogs v1.41.2. The old versions use -I${includedir} only. Reported-by: Robert Schwebel Signed-off-by: Karel Zak --- lib/fsprobe.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/fsprobe.c b/lib/fsprobe.c index cd008cc3..c5fa8c63 100644 --- a/lib/fsprobe.c +++ b/lib/fsprobe.c @@ -7,7 +7,11 @@ #include #include +#ifdef HAVE_BLKID_BLKID_H +#include +#else #include +#endif #include "blkdev.h" #include "canonicalize.h" -- cgit v1.2.3 From d94e8a9ebc02f575f15a3fcfa650eb8af8180371 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 19 May 2009 13:52:43 +0200 Subject: mount: (and fsck) remove libvolume_id support The libvolume_id is deprecated in favor of libblkid. The libblkid from u-l-ng provides the same functionality as libvolume_id. Signed-off-by: Karel Zak --- fsck/Makefile.am | 7 --- lib/fsprobe.c | 133 ++---------------------------------------------------- mount/Makefile.am | 8 ---- 3 files changed, 3 insertions(+), 145 deletions(-) (limited to 'lib') diff --git a/fsck/Makefile.am b/fsck/Makefile.am index abe6d5c3..567fee8b 100644 --- a/fsck/Makefile.am +++ b/fsck/Makefile.am @@ -8,7 +8,6 @@ fsck_SOURCES = base_device.c fsck.c fsck.h ../lib/ismounted.c \ fsck_LDADD = fsck_CFLAGS = -if HAVE_BLKID if BUILD_LIBBLKID fsck_LDADD += $(ul_libblkid_la) fsck_CFLAGS += -I$(ul_libblkid_srcdir) @@ -16,9 +15,3 @@ else fsck_LDADD += $(BLKID_LIBS) fsck_CFLAGS += $(BLKID_CFLAGS) endif -endif - -if HAVE_VOLUME_ID -fsck_LDADD += $(VOLUME_ID_LIBS) -fsck_CFLAGS += $(VOLUME_ID_CFLAGS) -endif diff --git a/lib/fsprobe.c b/lib/fsprobe.c index c5fa8c63..0f5a4ac0 100644 --- a/lib/fsprobe.c +++ b/lib/fsprobe.c @@ -18,7 +18,9 @@ #include "pathnames.h" #include "fsprobe.h" -#if defined(HAVE_BLKID_EVALUATE_TAG) || defined(HAVE_LIBVOLUME_ID) +static blkid_cache blcache; + +#ifdef HAVE_BLKID_EVALUATE_TAG /* ask kernel developers why we need such ugly open() method... */ static int open_device(const char *devname) @@ -101,9 +103,6 @@ fsprobe_get_devname_by_spec(const char *spec) return canonicalize_path(spec); } -#ifdef HAVE_LIBBLKID -static blkid_cache blcache; - void fsprobe_init(void) { @@ -266,129 +265,3 @@ fsprobe_get_uuid_by_devname(const char *devname) } #endif /* !HAVE_BLKID_EVALUATE_TAG */ -#else /* !HAVE_LIBBLKID */ - -/* - * libvolume_id from udev - * -- deprecated - */ -#include - -enum probe_type { - VOLUME_ID_NONE, - VOLUME_ID_LABEL, - VOLUME_ID_UUID, - VOLUME_ID_TYPE, -}; - -static char -*probe(const char *device, enum probe_type type) -{ - int fd; - uint64_t size; - struct volume_id *id; - const char *val; - char *value = NULL; - int retries = 0; - - fd = open_device(devname); - if (fd < 0) - return NULL; - id = volume_id_open_fd(fd); - if (!id) { - close(fd); - return NULL; - } - if (blkdev_get_size(fd, &size) != 0) - size = 0; - if (volume_id_probe_all(id, 0, size) == 0) { - switch(type) { - case VOLUME_ID_LABEL: - if (volume_id_get_label(id, &val)) - value = strdup(val); - break; - case VOLUME_ID_UUID: - if (volume_id_get_uuid(id, &val)) - value = strdup(val); - break; - case VOLUME_ID_TYPE: - if (volume_id_get_type(id, &val)) - value = strdup(val); - break; - default: - break; - } - } - volume_id_close(id); - close(fd); - return value; -} - -void -fsprobe_init(void) -{ -} - -void -fsprobe_exit(void) -{ -} - -int -fsprobe_known_fstype(const char *fstype) -{ - if (volume_id_get_prober_by_type(fstype) != NULL) - return 1; - return 0; -} - -char * -fsprobe_get_uuid_by_devname(const char *devname) -{ - return probe(devname, VOLUME_ID_UUID); -} - -char * -fsprobe_get_label_by_devname(const char *devname) -{ - return probe(devname, VOLUME_ID_LABEL); -} - -char * -fsprobe_get_fstype_by_devname(const char *devname) -{ - return probe(devname, VOLUME_ID_TYPE); -} - -char * -fsprobe_get_devname_by_uuid(const char *uuid) -{ - char dev[PATH_MAX]; - size_t len; - - if (!uuid) - return NULL; - - strcpy(dev, _PATH_DEV_BYUUID "/"); - len = strlen(_PATH_DEV_BYUUID "/"); - if (!volume_id_encode_string(uuid, &dev[len], sizeof(dev) - len)) - return NULL; - return canonicalize_path(dev); -} - -char * -fsprobe_get_devname_by_label(const char *label) -{ - char dev[PATH_MAX]; - size_t len; - - if (!label) - return NULL; - strcpy(dev, _PATH_DEV_BYLABEL "/"); - len = strlen(_PATH_DEV_BYLABEL "/"); - if (!volume_id_encode_string(label, &dev[len], sizeof(dev) - len)) - return NULL; - return canonicalize_path(dev); -} - -#endif /* HAVE_LIBVOLUME_ID */ diff --git a/mount/Makefile.am b/mount/Makefile.am index 7714efbc..b0e63740 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -71,7 +71,6 @@ losetup_static_LDFLAGS = $(ldflags_static) losetup_static_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) endif -if HAVE_BLKID if BUILD_LIBBLKID ldadd_common += $(ul_libblkid_la) ldadd_static += $(ul_libblkid_la) @@ -81,13 +80,6 @@ ldadd_common += $(BLKID_LIBS) ldadd_static += $(BLKID_LIBS_STATIC) cflags_common += $(BLKID_CFLAGS) endif -endif - -if HAVE_VOLUME_ID -ldadd_common += $(VOLUME_ID_LIBS) -ldadd_static += $(VOLUME_ID_LIBS_STATIC) -cflags_common += $(VOLUME_ID_CFLAGS) -endif if HAVE_SELINUX mount_LDADD += $(SELINUX_LIBS) -- cgit v1.2.3 From d5a8c30cebc874c4adcdef6a12a3e6567a81da23 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 29 May 2009 13:20:47 +0200 Subject: mount: use TAG parsing function from libblkid Signed-off-by: Karel Zak --- lib/fsprobe.c | 26 ++++---------------------- mount/fstab.c | 1 + 2 files changed, 5 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/fsprobe.c b/lib/fsprobe.c index 0f5a4ac0..b47de0ec 100644 --- a/lib/fsprobe.c +++ b/lib/fsprobe.c @@ -47,35 +47,16 @@ open_device(const char *devname) * Parses NAME=value, returns -1 on parse error, 0 success. The success is also * when the 'spec' doesn't contain name=value pair (because the spec could be * a devname too). In particular case the pointer 'name' is set to NULL. - - * The result is a new allocated string (the 'name' pointer). */ int fsprobe_parse_spec(const char *spec, char **name, char **value) { - char *vl, *tk, *cp; - *name = NULL; *value = NULL; - if (!(cp = strchr(spec, '='))) - return 0; /* no name= */ - - tk = strdup(spec); - vl = tk + (cp - spec); - *vl++ = '\0'; - - if (*vl == '"' || *vl == '\'') { - if (!(cp = strrchr(vl+1, *vl))) { - free(tk); - return -1; /* parse error */ - } - vl++; - *cp = '\0'; - } + if (strchr(spec, '=')) + return blkid_parse_tag_string(spec, name, value); - *name = tk; - *value = vl; return 0; } @@ -96,7 +77,8 @@ fsprobe_get_devname_by_spec(const char *spec) else if (!strcmp(name,"UUID")) nspec = fsprobe_get_devname_by_uuid(value); - free((void *) name); + free(name); + free(value); return nspec; } diff --git a/mount/fstab.c b/mount/fstab.c index 13dda871..82e90f3a 100644 --- a/mount/fstab.c +++ b/mount/fstab.c @@ -404,6 +404,7 @@ getfs_by_spec (const char *spec) { mc = getfs_by_uuid (value); free(name); + free(value); return mc; } -- cgit v1.2.3