/*
- * Copyright (C) 2007-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007-2009 Kay Sievers <kay.sievers@vrfy.org>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
-
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
fprintf(stderr, "%s: ", fn);
vfprintf(stderr, format, args);
} else {
+ if (priority <= LOG_ERR)
+ vfprintf(stderr, format, args);
vsyslog(priority, format, args);
}
}
printf("Usage: udevadm [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n");
for (cmd = cmds; cmd->name != NULL; cmd++)
- printf(" %-12s %s\n", cmd->name, cmd->help);
+ if (cmd->help != NULL)
+ printf(" %-12s %s\n", cmd->name, cmd->help);
printf("\n");
return 0;
}
},
{
.name = "settle",
- .cmd = udevadm_settle, "",
+ .cmd = udevadm_settle,
.help = "wait for the event queue to finish",
},
{
{
.name = "version",
.cmd = version,
- .help = "print the version number",
},
{
.name = "help",
.cmd = help,
- .help = "print this help text",
},
{}
};
{
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;
int i;
- const char *pos;
int rc = 1;
udev = udev_new();
if (udev == NULL)
goto out;
- logging_init("udevadm");
+ udev_log_init("udevadm");
udev_set_log_fn(udev, log_fn);
- sysfs_init();
-
- /* see if we are a compat link, this will be removed in a future release */
- command = argv[0];
- pos = strrchr(command, '/');
- if (pos != NULL)
- command = &pos[1];
-
- /* the trailing part of the binary or link name is the command */
- if (strncmp(command, "udev", 4) == 0)
- command = &command[4];
-
- for (i = 0; cmds[i].cmd != NULL; i++) {
- if (strcmp(cmds[i].name, command) == 0) {
- char path[128];
- char prog[512];
- ssize_t len;
-
- snprintf(path, sizeof(path), "/proc/%lu/exe", (unsigned long) getppid());
- len = readlink(path, prog, sizeof(prog));
- if (len > 0) {
- prog[len] = '\0';
- fprintf(stderr, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
- "this will stop working in a future release\n", prog, argv[0], command);
- info(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
- "this will stop working in a future release\n", prog, argv[0], command);
- }
- rc = run_command(udev, &cmds[i], argc, argv);
- goto out;
- }
- }
+ udev_selinux_init(udev);
while (1) {
int option;
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;
}
}
- fprintf(stderr, "unknown command, try udevadm help\n\n");
+ fprintf(stderr, "missing or unknown command\n\n");
+ help(udev, argc, argv);
rc = 2;
out:
- sysfs_cleanup();
+ udev_selinux_exit(udev);
udev_unref(udev);
- logging_close();
+ udev_log_close();
return rc;
}