#include <mntent.h>
#include <sys/stat.h>
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
static int debug;
if (udev == NULL)
goto exit;
- logging_init("fstab_id");
+ udev_log_init("fstab_id");
udev_set_log_fn(udev, log_fn);
while (1) {
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;
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;
exit:
udev_unref(udev);
- logging_close();
+ udev_log_close();
return rc;
}