X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.c;h=072280a58e6242bc5679fdf85ae110b729710ce2;hp=bfa704ef21754b9472c4bd297c9e7002a8821590;hb=647f7c49e8ddfbbe2afd9545484a3ad936f438e9;hpb=e5931bb7d86226a3823bdf5f4ec01c857827d386

diff --git a/udev/udevadm.c b/udev/udevadm.c
index bfa704ef2..072280a58 100644
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -1,23 +1,20 @@
 /*
  * Copyright (C) 2007-2008 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>
@@ -82,7 +79,7 @@ static const struct command cmds[] = {
 	},
 	{
 		.name = "settle",
-		.cmd = udevadm_settle, "",
+		.cmd = udevadm_settle,
 		.help = "wait for the event queue to finish",
 	},
 	{
@@ -127,9 +124,9 @@ int main(int argc, char *argv[])
 {
 	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;
@@ -143,7 +140,7 @@ int main(int argc, char *argv[])
 
 	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];
@@ -167,8 +164,8 @@ int main(int argc, char *argv[])
 				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);
+				err(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;
@@ -203,7 +200,9 @@ int main(int argc, char *argv[])
 	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;
 			}
@@ -213,7 +212,7 @@ int main(int argc, char *argv[])
 	help(udev, argc, argv);
 	rc = 2;
 out:
-	sysfs_cleanup();
+	udev_selinux_exit(udev);
 	udev_unref(udev);
 	logging_close();
 	return rc;