Update copyright headers

[strace] / tests / umount.c

diff --git a/tests/umount.c b/tests/umount.c
index 9ad88284b5638d4ee7e9c2d101572558ef5022a7..9c709f228a040694728dca8e5520db834c4dcad3 100644 (file)
--- a/tests/umount.c
+++ b/tests/umount.c
@@ -1,37 +1,16 @@
 /*
- * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
-#include <errno.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
+#include <unistd.h>
 
 #ifdef __NR_oldumount
 # define TEST_SYSCALL_STR "oldumount"
@@ -48,24 +27,16 @@ int
 main(void)
 {
        static const char sample[] = "umount.sample";
-       const char *errno_text;
        if (mkdir(sample, 0700))
                perror_msg_and_fail("mkdir: %s", sample);
-       (void) syscall(__NR_oldumount, sample);
-       switch (errno) {
-               case ENOSYS:
-                       errno_text = "ENOSYS";
-                       break;
-               case EPERM:
-                       errno_text = "EPERM";
-                       break;
-               default:
-                       errno_text = "EINVAL";
-       }
-       printf("%s(\"%s\") = -1 %s (%m)\n",
-              TEST_SYSCALL_STR, sample, errno_text);
+
+       long rc = syscall(__NR_oldumount, sample);
+       printf("%s(\"%s\") = %ld %s (%m)\n",
+              TEST_SYSCALL_STR, sample, rc, errno2name());
+
        if (rmdir(sample))
                perror_msg_and_fail("rmdir: %s", sample);
+
        puts("+++ exited with 0 +++");
        return 0;
 }