summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMrunal Patel <mrunalp@gmail.com>2016-05-12 10:11:51 -0700
committerColin Walters (automation) <walters+githubbot@verbum.org>2016-05-12 18:24:12 +0000
commit4c943ddc5a12d4027b7d58c0c3d1112ea043a251 (patch)
treec823683a7f6230f7003874e778e5a7b1d7832d65
parent2fe416d264853677389785431099e5291adf13a5 (diff)
downloadbubblewrap-4c943ddc5a12d4027b7d58c0c3d1112ea043a251.tar.gz
Convert tabs to spaces
Signed-off-by: Mrunal Patel <mrunalp@gmail.com> Closes: #65 Approved by: cgwalters
-rw-r--r--bind-mount.h2
-rw-r--r--bubblewrap.c76
-rw-r--r--network.h2
-rw-r--r--utils.c4
-rw-r--r--utils.h8
5 files changed, 46 insertions, 46 deletions
diff --git a/bind-mount.h b/bind-mount.h
index a70f877..9385cee 100644
--- a/bind-mount.h
+++ b/bind-mount.h
@@ -8,7 +8,7 @@
*
* This library 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
diff --git a/bubblewrap.c b/bubblewrap.c
index 4b5abb6..5da1638 100644
--- a/bubblewrap.c
+++ b/bubblewrap.c
@@ -136,35 +136,35 @@ usage (int ecode)
fprintf (stderr, "usage: %s [OPTIONS...] COMMAND [ARGS...]\n\n", argv0);
fprintf (stderr,
- " --help Print this help\n"
- " --version Print version\n"
- " --args FD Parse nul-separated args from FD\n"
- " --unshare-user Create new user namespace (may be automatically implied if not setuid)\n"
- " --unshare-ipc Create new ipc namespace\n"
- " --unshare-pid Create new pid namespace\n"
- " --unshare-net Create new network namespace\n"
- " --unshare-uts Create new uts namespace\n"
- " --uid UID Custom uid in the sandbox (requires --unshare-user)\n"
- " --gid GID Custon gid in the sandbox (requires --unshare-user)\n"
- " --chdir DIR Change directory to DIR\n"
- " --setenv VAR VALUE Set an environment variable\n"
- " --unsetenv VAR Unset an environment variable\n"
- " --lock-file DEST Take a lock on DEST while sandbox is running\n"
- " --sync-fd FD Keep this fd open while sandbox is running\n"
- " --bind SRC DEST Bind mount the host path SRC on DEST\n"
- " --dev-bind SRC DEST Bind mount the host path SRC on DEST, allowing device access\n"
- " --ro-bind SRC DEST Bind mount the host path SRC readonly on DEST\n"
- " --exec-label LABEL Exec Label for the sandbox\n"
- " --file-label LABEL File label for temporary sandbox content\n"
- " --proc DEST Mount procfs on DEST\n"
- " --dev DEST Mount new dev on DEST\n"
- " --tmpfs DEST Mount new tmpfs on DEST\n"
- " --mqueue DEST Mount new mqueue on DEST\n"
- " --dir DEST Create dir at DEST\n"
- " --file FD DEST Copy from FD to dest DEST\n"
- " --bind-data FD DEST Copy from FD to file which is bind-mounted on DEST\n"
- " --symlink SRC DEST Create symlink at DEST with target SRC\n"
- " --seccomp FD Load and use seccomp rules from FD\n"
+ " --help Print this help\n"
+ " --version Print version\n"
+ " --args FD Parse nul-separated args from FD\n"
+ " --unshare-user Create new user namespace (may be automatically implied if not setuid)\n"
+ " --unshare-ipc Create new ipc namespace\n"
+ " --unshare-pid Create new pid namespace\n"
+ " --unshare-net Create new network namespace\n"
+ " --unshare-uts Create new uts namespace\n"
+ " --uid UID Custom uid in the sandbox (requires --unshare-user)\n"
+ " --gid GID Custon gid in the sandbox (requires --unshare-user)\n"
+ " --chdir DIR Change directory to DIR\n"
+ " --setenv VAR VALUE Set an environment variable\n"
+ " --unsetenv VAR Unset an environment variable\n"
+ " --lock-file DEST Take a lock on DEST while sandbox is running\n"
+ " --sync-fd FD Keep this fd open while sandbox is running\n"
+ " --bind SRC DEST Bind mount the host path SRC on DEST\n"
+ " --dev-bind SRC DEST Bind mount the host path SRC on DEST, allowing device access\n"
+ " --ro-bind SRC DEST Bind mount the host path SRC readonly on DEST\n"
+ " --exec-label LABEL Exec Label for the sandbox\n"
+ " --file-label LABEL File label for temporary sandbox content\n"
+ " --proc DEST Mount procfs on DEST\n"
+ " --dev DEST Mount new dev on DEST\n"
+ " --tmpfs DEST Mount new tmpfs on DEST\n"
+ " --mqueue DEST Mount new mqueue on DEST\n"
+ " --dir DEST Create dir at DEST\n"
+ " --file FD DEST Copy from FD to dest DEST\n"
+ " --bind-data FD DEST Copy from FD to file which is bind-mounted on DEST\n"
+ " --symlink SRC DEST Create symlink at DEST with target SRC\n"
+ " --seccomp FD Load and use seccomp rules from FD\n"
);
exit (ecode);
}
@@ -812,9 +812,9 @@ int opt_seccomp_fd = -1;
static void
parse_args_recurse (int *argcp,
- char ***argvp,
- bool in_file,
- int *total_parsed_argc_p)
+ char ***argvp,
+ bool in_file,
+ int *total_parsed_argc_p)
{
SetupOp *op;
int argc = *argcp;
@@ -878,9 +878,9 @@ parse_args_recurse (int *argcp,
while (p != NULL && p < data_end)
{
data_argc++;
- (*total_parsed_argc_p)++;
- if (*total_parsed_argc_p > MAX_ARGS)
- die ("Exceeded maximum number of arguments %u", MAX_ARGS);
+ (*total_parsed_argc_p)++;
+ if (*total_parsed_argc_p > MAX_ARGS)
+ die ("Exceeded maximum number of arguments %u", MAX_ARGS);
p = memchr (p, 0, data_end - p);
if (p != NULL)
p++;
@@ -1208,7 +1208,7 @@ parse_args_recurse (int *argcp,
static void
parse_args (int *argcp,
- char ***argvp)
+ char ***argvp)
{
int total_parsed_argc = *argcp;
parse_args_recurse (argcp, argvp, FALSE, &total_parsed_argc);
@@ -1296,7 +1296,7 @@ main (int argc,
{
event_fd = eventfd (0, EFD_CLOEXEC | EFD_NONBLOCK);
if (event_fd == -1)
- die_with_error ("eventfd()");
+ die_with_error ("eventfd()");
}
/* We block sigchild here so that we can use signalfd in the monitor. */
@@ -1494,7 +1494,7 @@ main (int argc,
close (opt_seccomp_fd);
if (prctl (PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog) != 0)
- die_with_error ("prctl(PR_SET_SECCOMP)");
+ die_with_error ("prctl(PR_SET_SECCOMP)");
}
umask (old_umask);
diff --git a/network.h b/network.h
index 99bd948..559bb50 100644
--- a/network.h
+++ b/network.h
@@ -8,7 +8,7 @@
*
* This library 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
diff --git a/utils.c b/utils.c
index aeebddc..abc4008 100644
--- a/utils.c
+++ b/utils.c
@@ -241,7 +241,7 @@ strconcat3 (const char *s1,
char*
xasprintf (const char *format,
- ...)
+ ...)
{
char *buffer = NULL;
va_list args;
@@ -405,7 +405,7 @@ ensure_file (const char *path,
}
-#define BUFSIZE 8192
+#define BUFSIZE 8192
/* Sets errno on error (!= 0), ENOSPC on short write */
int
copy_file_data (int sfd,
diff --git a/utils.h b/utils.h
index 2291093..82c5c2a 100644
--- a/utils.h
+++ b/utils.h
@@ -8,7 +8,7 @@
*
* This library 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -39,7 +39,7 @@
#define UNUSED __attribute__((__unused__))
-#define N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
+#define N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
#define TRUE 1
#define FALSE 0
@@ -71,7 +71,7 @@ char *strconcat3 (const char *s1,
const char *s2,
const char *s3);
char* xasprintf (const char *format,
- ...) __attribute__((format(printf, 1, 2)));
+ ...) __attribute__((format(printf, 1, 2)));
bool has_prefix (const char *str,
const char *prefix);
bool has_path_prefix (const char *str,
@@ -110,7 +110,7 @@ int raw_clone (unsigned long flags,
int pivot_root (const char *new_root,
const char *put_old);
char *label_mount (const char *opt,
- const char *mount_label);
+ const char *mount_label);
int label_exec (const char *exec_label);
int label_create_file (const char *file_label);