xfs_scrub: load and unload libicu properly
Make sure we actually load and unload libicu properly. This isn't
strictly required since the library can bootstrap itself, but unloading
means fewer things for valgrind to complain about.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
diff --git a/scrub/unicrash.c b/scrub/unicrash.c
index d5d2cf2..de3217c 100644
--- a/scrub/unicrash.c
+++ b/scrub/unicrash.c
@@ -722,3 +722,20 @@
return __unicrash_check_name(uc, dsc, _("filesystem label"),
label, 0);
}
+
+/* Load libicu and initialize it. */
+bool
+unicrash_load(void)
+{
+ UErrorCode uerr = U_ZERO_ERROR;
+
+ u_init(&uerr);
+ return U_FAILURE(uerr);
+}
+
+/* Unload libicu once we're done with it. */
+void
+unicrash_unload(void)
+{
+ u_cleanup();
+}
diff --git a/scrub/unicrash.h b/scrub/unicrash.h
index c3a7f38..32cae3d 100644
--- a/scrub/unicrash.h
+++ b/scrub/unicrash.h
@@ -25,6 +25,8 @@
const char *attrname);
int unicrash_check_fs_label(struct unicrash *uc, struct descr *dsc,
const char *label);
+bool unicrash_load(void);
+void unicrash_unload(void);
#else
# define unicrash_dir_init(u, c, b) (0)
# define unicrash_xattr_init(u, c, b) (0)
@@ -33,6 +35,8 @@
# define unicrash_check_dir_name(u, d, n) (0)
# define unicrash_check_xattr_name(u, d, n) (0)
# define unicrash_check_fs_label(u, d, n) (0)
+# define unicrash_init() (0)
+# define unicrash_unload() do { } while (0)
#endif /* HAVE_LIBICU */
#endif /* XFS_SCRUB_UNICRASH_H_ */
diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index 538e16d..45750d6 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -616,6 +616,11 @@
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
+ if (unicrash_load()) {
+ fprintf(stderr,
+ _("%s: could initialize Unicode library.\n"), progname);
+ goto out;
+ }
pthread_mutex_init(&ctx.lock, NULL);
pthread_rwlock_init(&ctx.repair_rwlock, NULL);
@@ -808,6 +813,7 @@
phase_end(&all_pi, 0);
if (progress_fp)
fclose(progress_fp);
+ unicrash_unload();
/*
* If we're being run as a service, the return code must fit the LSB
