X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Ffstab_import%2Ffstab_import.c;h=c66bffb25cb3c2f042f3029fb974e63e755dd913;hp=71ab5d34ee8868e9add0b324a5e41320640c0d5e;hb=f6577968a2f86aade8fff503a53fa52a7245251a;hpb=38f27948cdafd8a4b90a6b4f1f54b89891983506

diff --git a/extras/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c
index 71ab5d34e..c66bffb25 100644
--- a/extras/fstab_import/fstab_import.c
+++ b/extras/fstab_import/fstab_import.c
@@ -24,7 +24,8 @@
 #include <mntent.h>
 #include <sys/stat.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static int debug;
 
@@ -66,9 +67,9 @@ int main(int argc, char *argv[])
 {
 	struct udev *udev;
 	static const struct option options[] = {
-		{ "export", 0, NULL, 'x' },
-		{ "debug", 0, NULL, 'd' },
-		{ "help", 0, NULL, 'h' },
+		{ "export", no_argument, NULL, 'x' },
+		{ "debug", no_argument, NULL, 'd' },
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 	char **devices;
@@ -80,7 +81,7 @@ int main(int argc, char *argv[])
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("fstab_id");
+	udev_log_init("fstab_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
@@ -144,14 +145,14 @@ int main(int argc, char *argv[])
 			if (label[0] == '"' || label[0] == '\'') {
 				char *pos;
 
-				util_strlcpy(str, &label[1], sizeof(str));
+				util_strscpy(str, sizeof(str), &label[1]);
 				pos = strrchr(str, label[0]);
 				if (pos == NULL)
 					continue;
 				pos[0] = '\0';
 				label = str;
 			}
-			if (matches_device_list(udev, devices, str)) {
+			if (matches_device_list(udev, devices, label)) {
 				print_fstab_entry(udev, mnt);
 				rc = 0;
 				break;
@@ -168,14 +169,14 @@ int main(int argc, char *argv[])
 			if (uuid[0] == '"' || uuid[0] == '\'') {
 				char *pos;
 
-				util_strlcpy(str, &uuid[1], sizeof(str));
+				util_strscpy(str, sizeof(str), &uuid[1]);
 				pos = strrchr(str, uuid[0]);
 				if (pos == NULL)
 					continue;
 				pos[0] = '\0';
 				uuid = str;
 			}
-			if (matches_device_list(udev, devices, str)) {
+			if (matches_device_list(udev, devices, uuid)) {
 				print_fstab_entry(udev, mnt);
 				rc = 0;
 				break;
@@ -197,6 +198,6 @@ int main(int argc, char *argv[])
 
 exit:
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }