dhcpd,dumpleases: write and use 64-bit current time in lease file.

[oweals/busybox.git] / selinux / chcon.c

diff --git a/selinux/chcon.c b/selinux/chcon.c
index 6e98c4ab9fc8348f58d736f49caa533c5c0c5105..55c2522f66642a83a520fb951ae3981b92dbed76 100644 (file)
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -4,6 +4,8 @@
  * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp>
  *
  * Copyright (C) 2006 - 2007 KaiGai Kohei <kaigai@kaigai.gr.jp>
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 #include <getopt.h>
 #include <selinux/context.h>
@@ -28,7 +30,11 @@ static char *type = NULL;
 static char *range = NULL;
 static char *specified_context = NULL;
 
-static int change_filedir_context(const char *fname, struct stat *stbuf, void *userData, int depth)
+static int FAST_FUNC change_filedir_context(
+               const char *fname,
+               struct stat *stbuf UNUSED_PARAM,
+               void *userData UNUSED_PARAM,
+               int depth UNUSED_PARAM)
 {
        context_t context = NULL;
        security_context_t file_context = NULL;
@@ -105,7 +111,7 @@ skip:
 }
 
 #if ENABLE_FEATURE_CHCON_LONG_OPTIONS
-static const char chcon_longopts[] =
+static const char chcon_longopts[] ALIGN1 =
        "recursive\0"      No_argument       "R"
        "changes\0"        No_argument       "c"
        "no-dereference\0" No_argument       "h"
@@ -120,8 +126,8 @@ static const char chcon_longopts[] =
        ;
 #endif
 
-int chcon_main(int argc, char **argv);
-int chcon_main(int argc, char **argv)
+int chcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chcon_main(int argc UNUSED_PARAM, char **argv)
 {
        char *reference_file;
        char *fname;
@@ -136,7 +142,7 @@ int chcon_main(int argc, char **argv)
                ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
 #endif
                ":f--v:v--f";  /* 'verbose' and 'quiet' are exclusive */
-       getopt32(argc, argv, "Rchf:u:r:t:l:v",
+       getopt32(argv, "Rchfu:r:t:l:v",
                &user, &role, &type, &range, &reference_file);
        argv += optind;