Merge pull request #5674 from kmk3/fix-ws-add-editorconfig

build: Fix whitespace and add .editorconfig

7 files changed, 73 insertions, 76 deletions

diff --git a/test/filters/namespaces.c b/test/filters/namespaces.c
index 06dfa4edf..ecf0fdcd1 100644
--- a/test/filters/namespaces.c
+++ b/test/filters/namespaces.c
@@ -15,82 +15,82 @@
 #define STACK_SIZE 1024 * 1024
 
 static int usage() {
-    fprintf(stderr, "Usage: namespaces <system call>[clone,unshare] <list of namespaces>[cgroup,ipc,mnt,net,pid,time,user,uts]\n");
-    exit(1);
+        fprintf(stderr, "Usage: namespaces <system call>[clone,unshare] <list of namespaces>[cgroup,ipc,mnt,net,pid,time,user,uts]\n");
+        exit(1);
 }
 
 static void die(const char *msg) {
-    fprintf(stderr, "Error: %s: %s\n", msg, strerror(errno));
-    exit(1);
+        fprintf(stderr, "Error: %s: %s\n", msg, strerror(errno));
+        exit(1);
 }
 
 static int ns_flags(const char *list) {
-    int flags = 0;
-
-    char *dup = strdup(list);
-    if (!dup)
-        die("cannot allocate memory");
-
-    char *token = strtok(dup, ",");
-    while (token) {
-        if (strcmp(token, "cgroup") == 0)
-            flags |= CLONE_NEWCGROUP;
-        else if (strcmp(token, "ipc") == 0)
-            flags |= CLONE_NEWIPC;
-        else if (strcmp(token, "net") == 0)
-            flags |= CLONE_NEWNET;
-        else if (strcmp(token, "mnt") == 0)
-            flags |= CLONE_NEWNS;
-        else if (strcmp(token, "pid") == 0)
-            flags |= CLONE_NEWPID;
-        else if (strcmp(token, "time") == 0)
-            flags |= CLONE_NEWTIME;
-        else if (strcmp(token, "user") == 0)
-            flags |= CLONE_NEWUSER;
-        else if (strcmp(token, "uts") == 0)
-            flags |= CLONE_NEWUTS;
-        else
-            usage();
-
-        token = strtok(NULL, ",");
-    }
-
-    free(dup);
-    return flags;
+        int flags = 0;
+
+        char *dup = strdup(list);
+        if (!dup)
+                die("cannot allocate memory");
+
+        char *token = strtok(dup, ",");
+        while (token) {
+                if (strcmp(token, "cgroup") == 0)
+                        flags |= CLONE_NEWCGROUP;
+                else if (strcmp(token, "ipc") == 0)
+                        flags |= CLONE_NEWIPC;
+                else if (strcmp(token, "net") == 0)
+                        flags |= CLONE_NEWNET;
+                else if (strcmp(token, "mnt") == 0)
+                        flags |= CLONE_NEWNS;
+                else if (strcmp(token, "pid") == 0)
+                        flags |= CLONE_NEWPID;
+                else if (strcmp(token, "time") == 0)
+                        flags |= CLONE_NEWTIME;
+                else if (strcmp(token, "user") == 0)
+                        flags |= CLONE_NEWUSER;
+                else if (strcmp(token, "uts") == 0)
+                        flags |= CLONE_NEWUTS;
+                else
+                        usage();
+
+                token = strtok(NULL, ",");
+        }
+
+        free(dup);
+        return flags;
 }
 
 static int child(void *arg) {
-    (void) arg;
+        (void) arg;
 
-    fprintf(stderr, "clone successful\n");
-    return 0;
+        fprintf(stderr, "clone successful\n");
+        return 0;
 }
 
 int main (int argc, char **argv) {
-    if (argc != 3)
-        usage();
-
-    int flags = ns_flags(argv[2]);
-    if (getuid() != 0)
-        flags |= CLONE_NEWUSER;
-
-    if (strcmp(argv[1], "clone") == 0) {
-        void *stack = mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
-                    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-        if (stack == MAP_FAILED)
-            die("mmap");
-
-        if (clone(child, stack + STACK_SIZE, flags | SIGCHLD, NULL) < 0)
-            die("clone");
-    }
-    else if (strcmp(argv[1], "unshare") == 0) {
-        if (unshare(flags))
-            die("unshare");
-
-        fprintf(stderr, "unshare successful\n");
-    }
-    else
-        usage();
-
-    return 0;
+        if (argc != 3)
+                usage();
+
+        int flags = ns_flags(argv[2]);
+        if (getuid() != 0)
+                flags |= CLONE_NEWUSER;
+
+        if (strcmp(argv[1], "clone") == 0) {
+                void *stack = mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
+                                   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                if (stack == MAP_FAILED)
+                        die("mmap");
+
+                if (clone(child, stack + STACK_SIZE, flags | SIGCHLD, NULL) < 0)
+                        die("clone");
+        }
+        else if (strcmp(argv[1], "unshare") == 0) {
+                if (unshare(flags))
+                        die("unshare");
+
+                fprintf(stderr, "unshare successful\n");
+        }
+        else
+                usage();
+
+        return 0;
 }
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp
index eaad5700d..bf95e40dd 100755
--- a/test/fs/private-whitelist.exp
+++ b/test/fs/private-whitelist.exp
@@ -32,9 +32,9 @@ send -- "ls -a ~ | wc -l\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "3" {puts "3\n"}
-        "4" {puts "4\n"}
-        "5" {puts "5\n"}
-        "6" {puts "6\n"}
+        "4" {puts "4\n"}
+        "5" {puts "5\n"}
+        "6" {puts "6\n"}
 }
 
 sleep 1
diff --git a/test/network/firemon-route.exp b/test/network/firemon-route.exp
index 707217eea..69cccfeae 100755
--- a/test/network/firemon-route.exp
+++ b/test/network/firemon-route.exp
@@ -33,7 +33,7 @@ expect {
         "0.0.0.0/0 via 192.168.1.1, dev eth0, metric 0" {puts "Debian testing\n";}
         "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 1024" {puts "Centos 7 testing\n";}
         "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 0" {puts "OpenSUSE testing\n";}
-            "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 100" {puts "Arch testing\n";}
+        "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 100" {puts "Arch testing\n";}
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
diff --git a/test/private-etc/private-etc.sh b/test/private-etc/private-etc.sh
index 8488611b9..c46b684af 100755
--- a/test/private-etc/private-etc.sh
+++ b/test/private-etc/private-etc.sh
@@ -18,4 +18,3 @@ echo "TESTING: groups (test/private-etc/groups.exp)"
 
 echo "TESTING: etc-cleanup (test/private-etc/etc-cleanup.exp)"
 ./etc-cleanup.exp
-
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index 0ef18b79d..5c67b16c5 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -29,4 +29,3 @@ if [[ $(uname -m) == "x86_64" ]]; then
 else
         echo "TESTING SKIP: private-lib test implemented only for x86_64."
 fi
-
diff --git a/test/profiles/test2.profile b/test/profiles/test2.profile
index 9fbd5219a..9504f5085 100644
--- a/test/profiles/test2.profile
+++ b/test/profiles/test2.profile
@@ -1,6 +1,6 @@
 caps
 seccomp
-  private
-  include test.profile
-  include test.local
-  include test25.profile
+private
+include test.profile
+include test.local
+include test25.profile
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index 231f5afa8..f5567ff02 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -150,4 +150,3 @@ then
 else
         echo "TESTING SKIP: whois not found"
 fi
-