find: improve usage text (Natanael Copa <natanael.copa@gmail.com>)

[oweals/busybox.git] / coreutils / install.c

diff --git a/coreutils/install.c b/coreutils/install.c
index 83facad9d304f4761b348a5e2b6d605a7c102b48..c80be01ff4e438bce748f01b79a4ed8608f835bd 100644 (file)
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -1,6 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  Copyright (C) 2003 by Glenn McGrath <bug1@iinet.net.au>
+ * Copyright (C) 2003 by Glenn McGrath <bug1@iinet.net.au>
+ * SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
@@ -40,7 +41,7 @@ static void setdefaultfilecon(const char *path) {
 
        if (!is_selinux_enabled()) {
                return;
-       }       
+       }
        if (lstat(path, &s) != 0) {
                return;
        }
@@ -100,7 +101,7 @@ int install_main(int argc, char **argv)
        /* -c exists for backwards compatibility, it's needed */
 
        flags = getopt32(argc, argv, "cdpsg:m:o:" USE_SELINUX("Z:"), &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext));
-       
+
 #if ENABLE_SELINUX
        if (flags & OPT_PRESERVE_SECURITY_CONTEXT) {
                use_default_selinux_context = 0;
@@ -109,9 +110,7 @@ int install_main(int argc, char **argv)
        }
        if (flags & OPT_SET_SECURITY_CONTEXT) {
                selinux_or_die();
-               if (setfscreatecon(scontext) < 0) {
-                       bb_error_msg_and_die("setfscreatecon(%s)", scontext); // perror?
-               }
+               setfscreatecon_or_die(scontext);
                use_default_selinux_context = 0;
                copy_flags |= FILEUTILS_SET_SECURITY_CONTEXT;
        }