volume_id: hpfs - read label and uuid

[elogind.git] / udev / test-udev.c

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 6c01bdbcd45249b49c9529da8c93661591eb592b..4aa7999fc0e57ce1194c993a8a4b3b75828abd77 100644 (file)
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -1,24 +1,21 @@
 /*
  * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-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 <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -33,7 +30,6 @@
 
 #include "udev.h"
 #include "udev_rules.h"
-#include "udev_selinux.h"
 
 static void asmlinkage sig_handler(int signum)
 {
@@ -63,7 +59,6 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                exit(1);
        dbg(udev, "version %s\n", VERSION);
-       selinux_init(udev);
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
@@ -112,7 +107,7 @@ int main(int argc, char *argv[])
 
        /* override built-in sysfs device */
        udevice->dev = dev;
-       strlcpy(udevice->action, action, sizeof(udevice->action));
+       util_strlcpy(udevice->action, action, sizeof(udevice->action));
 
        /* get dev_t from environment, which is needed for "remove" to work, "add" works also from sysfs */
        maj = getenv("MAJOR");
@@ -135,7 +130,6 @@ int main(int argc, char *argv[])
 fail:
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
-       selinux_exit(udev);
 exit:
        udev_unref(udev);
        if (retval != 0)