#include <errno.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include <sys/sysinfo.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "list.h"
/* check for matching result of external program */
if (dev->result[0] != '\0') {
- dbg("check for " FIELD_RESULT
- " dev->result='%s', udev->program_result='%s'",
+ dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
struct sysfs_device *sysfs_device = NULL;
struct config_device *dev;
struct perm_device *perm;
- struct sysinfo info;
char *pos;
udev->mode = 0;
udev->ignore_remove = dev->ignore_remove;
if (udev->type == 'n')
- goto done;
+ goto exit;
udev->partitions = dev->partitions;
udev->mode = dev->mode;
strfieldcpy(udev->owner, dev->owner);
+ apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
strfieldcpy(udev->group, dev->group);
+ apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
goto perms;
}
strfieldcpy(udev->name, udev->kernel_name);
if (udev->type == 'n')
- goto done;
+ goto exit;
perms:
/* apply permissions from permissions file to empty fields */
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
-done:
- /* store time of action */
- sysinfo(&info);
- udev->config_uptime = info.uptime;
-
+exit:
return 0;
}