* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
-
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
},
{
.name = "settle",
- .cmd = udevadm_settle, "",
+ .cmd = udevadm_settle,
.help = "wait for the event queue to finish",
},
{
{
struct udev *udev;
static const struct option options[] = {
- { "debug", 0, NULL, 'd' },
- { "help", 0, NULL, 'h' },
- { "version", 0, NULL, 'V' },
+ { "debug", no_argument, NULL, 'd' },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' },
{}
};
const char *command;
logging_init("udevadm");
udev_set_log_fn(udev, log_fn);
- sysfs_init();
+ udev_selinux_init(udev);
/* see if we are a compat link, this will be removed in a future release */
command = argv[0];
if (command != NULL)
for (i = 0; cmds[i].cmd != NULL; i++) {
if (strcmp(cmds[i].name, command) == 0) {
- optind++;
+ argc -= optind;
+ argv += optind;
+ optind = 0;
rc = run_command(udev, &cmds[i], argc, argv);
goto out;
}
help(udev, argc, argv);
rc = 2;
out:
- sysfs_cleanup();
+ udev_selinux_exit(udev);
udev_unref(udev);
logging_close();
return rc;