From 681e074681d8864c07f6cfa5c263ed6e384da878 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Mon, 19 Nov 2018 10:07:39 -0500 Subject: Misc. typos Found using `codespell -q 3 -L shotcut,objext,als,ans,creat,varius,chage,tthe` --- README | 4 ++-- RELNOTES | 4 ++-- contrib/fjresize.py | 2 +- src/faudit/caps.c | 2 +- src/fbuilder/build_profile.c | 2 +- src/firejail/cmdline.c | 2 +- src/firejail/firejail.h | 6 +++--- src/firejail/fs.c | 2 +- src/firejail/fs_lib.c | 2 +- src/firejail/ls.c | 4 ++-- src/firejail/main.c | 4 ++-- src/firejail/no_sandbox.c | 2 +- src/firejail/x11.c | 10 +++++----- src/firemon/procevent.c | 2 +- src/fshaper/fshaper.sh | 4 ++-- src/man/firejail-profile.txt | 2 +- src/man/firejail.txt | 2 +- src/tools/testuid.c | 2 +- test/network/README | 2 +- test/network/bandwidth.exp | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README b/README index bd43f3f2d..e79d4ae10 100644 --- a/README +++ b/README @@ -64,7 +64,7 @@ Aleksey Manevich (https://github.com/manevich) - fix double quotes/single quotes problem - big rework of argument processing subsystem - --join fixes - - spliting up cmdline.c + - splitting up cmdline.c - Busybox support - X11 support rewrite - gether shell selection code in one place @@ -330,7 +330,7 @@ Jaykishan Mutkawoa (https://github.com/jmutkawoa) - cpio profile James Elford (https://github.com/jelford) - pass password manager support - - removed shell none from ssh-agent configuration, fixing the infinit loop + - removed shell none from ssh-agent configuration, fixing the infinite loop - added gcloud profile - blacklist sensitive cloud provider files in disable-common Jean Lucas (https://github.com/flacks) diff --git a/RELNOTES b/RELNOTES index 8aa80ddf3..4e2e22acf 100644 --- a/RELNOTES +++ b/RELNOTES @@ -147,7 +147,7 @@ firejail (0.9.50) baseline; urgency=low * feature: --profile.print * enhancement: print all seccomp filters under --debug * enhancement: /proc/sys mounting - * enhancement: rework IP address assingment for --net options + * enhancement: rework IP address assignment for --net options * enhancement: support for newer Xpra versions (2.1+) - set xpra-attach yes in /etc/firejail/firejail.config * enhancement: all profiles use a standard layout style @@ -181,7 +181,7 @@ firejail (0.9.50~rc1) baseline; urgency=low * feature: --profile.print * enhancement: print all seccomp filters under --debug * enhancement: /proc/sys mounting - * enhancement: rework IP address assingment for --net options + * enhancement: rework IP address assignment for --net options * enhancement: support for newer Xpra versions (2.1+) - set xpra-attach yes in /etc/firejail/firejail.config * enhancement: all profiles use a standard layout style diff --git a/contrib/fjresize.py b/contrib/fjresize.py index 3997cf280..4eb33f120 100755 --- a/contrib/fjresize.py +++ b/contrib/fjresize.py @@ -8,7 +8,7 @@ usage = """usage: fjresize.py firejail-name displaysize resize firejail xephyr windows. fjdisplay.py with no other arguments will list running named firejails with displays. fjresize.py with only a firejail name will list valid resolutions. -names can be shortend as long its unambiguous. +names can be shortened as long its unambiguous. note: you may need to move the xephyr window for the resize to take effect example: fjresize.py browser 1280x800 diff --git a/src/faudit/caps.c b/src/faudit/caps.c index 46c262c89..e0fb38488 100644 --- a/src/faudit/caps.c +++ b/src/faudit/caps.c @@ -43,7 +43,7 @@ static int extract_caps(uint64_t *val) { return 1; } -// return 1 if the capability is in tbe map +// return 1 if the capability is in the map static int check_capability(uint64_t map, int cap) { int i; uint64_t mask = 1ULL; diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index 74f0da226..d9cb1f568 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c @@ -91,7 +91,7 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { if (arg_debug) printf("command len %d + %d + 1\n", (int) (sizeof(cmdlist) / sizeof(char*)), argc - index); char *cmd[len]; - cmd[0] = cmdlist[0]; // explicit assignemnt to clean scan-build error + cmd[0] = cmdlist[0]; // explicit assignment to clean scan-build error // build command unsigned i = 0; diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c index 1fe5a2398..d616f3599 100644 --- a/src/firejail/cmdline.c +++ b/src/firejail/cmdline.c @@ -77,7 +77,7 @@ static void quote_cmdline(char *command_line, char *window_title, int len, int a // enclose args by single quotes, // and since single quote can't be represented in single quoted text - // each occurence of it should be enclosed by double quotes + // each occurrence of it should be enclosed by double quotes in_quotes = false; for (j = 0; j < strlen(argv[i + index]); j++) { // single quote diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 2e921ad37..c66904c1b 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h @@ -359,7 +359,7 @@ extern int arg_private_bin; // private bin directory extern int arg_private_tmp; // private tmp directory extern int arg_private_lib; // private lib directory extern int arg_scan; // arp-scan all interfaces -extern int arg_whitelist; // whitelist commad +extern int arg_whitelist; // whitelist command extern int arg_nosound; // disable sound extern int arg_noautopulse; // disable automatic ~/.config/pulse init extern int arg_novideo; //disable video devices in /dev @@ -380,7 +380,7 @@ extern char *arg_audit_prog; // audit extern int arg_apparmor; // apparmor extern int arg_allow_debuggers; // allow debuggers extern int arg_x11_block; // block X11 -extern int arg_x11_xorg; // use X11 security extention +extern int arg_x11_xorg; // use X11 security extension extern int arg_allusers; // all user home directories visible extern int arg_machineid; // preserve /etc/machine-id extern int arg_disable_mnt; // disable /mnt and /media @@ -437,7 +437,7 @@ void preproc_mount_mnt_dir(void); void preproc_clean_run(void); // fs.c -// blacklist files or directoies by mounting empty files on top of them +// blacklist files or directories by mounting empty files on top of them void fs_blacklist(void); // remount a directory read-only void fs_rdonly(const char *dir); diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 38af1fccf..ff920b913 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c @@ -72,7 +72,7 @@ static void disable_file(OPERATION op, const char *filename) { if (fname == NULL && errno == EACCES) { if (arg_debug) printf("Debug: no access to file %s, forcing mount\n", filename); - // realpath and stat funtions will fail on FUSE filesystems + // realpath and stat functions will fail on FUSE filesystems // they don't seem to like a uid of 0 // force mounting int rv = mount(RUN_RO_DIR, filename, "none", MS_BIND, "mode=400,gid=0"); diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index a607280a0..d2e9da022 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c @@ -114,7 +114,7 @@ void fslib_copy_libs(const char *full_path) { if (chown(RUN_LIB_FILE, getuid(), getgid())) errExit("chown"); - // run fldd to extact the list of files + // run fldd to extract the list of files if (arg_debug || arg_debug_private_lib) printf(" running fldd %s\n", full_path); sbox_run(SBOX_USER | SBOX_SECCOMP | SBOX_CAPS_NONE, 3, PATH_FLDD, full_path, RUN_LIB_FILE); diff --git a/src/firejail/ls.c b/src/firejail/ls.c index 51370da60..164dc465a 100644 --- a/src/firejail/ls.c +++ b/src/firejail/ls.c @@ -353,7 +353,7 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) { exit(1); } - // copy the temporary file into the destionation file + // copy the temporary file into the destination file child = fork(); if (child < 0) errExit("fork"); @@ -428,7 +428,7 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) { exit(1); } - // copy the temporary file into the destionation file + // copy the temporary file into the destination file child = fork(); if (child < 0) errExit("fork"); diff --git a/src/firejail/main.c b/src/firejail/main.c index 4eb92658c..f35b2a925 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c @@ -93,7 +93,7 @@ int arg_private_bin = 0; // private bin directory int arg_private_tmp = 0; // private tmp directory int arg_private_lib = 0; // private lib directory int arg_scan = 0; // arp-scan all interfaces -int arg_whitelist = 0; // whitelist commad +int arg_whitelist = 0; // whitelist command int arg_nosound = 0; // disable sound int arg_noautopulse = 0; // disable automatic ~/.config/pulse init int arg_novideo = 0; //disable video devices in /dev @@ -114,7 +114,7 @@ char *arg_audit_prog = NULL; // audit int arg_apparmor = 0; // apparmor int arg_allow_debuggers = 0; // allow debuggers int arg_x11_block = 0; // block X11 -int arg_x11_xorg = 0; // use X11 security extention +int arg_x11_xorg = 0; // use X11 security extension int arg_allusers = 0; // all user home directories visible int arg_machineid = 0; // preserve /etc/machine-id int arg_allow_private_blacklist = 0; // blacklist things in private directories diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c index 7c5cc1df9..78322807b 100644 --- a/src/firejail/no_sandbox.c +++ b/src/firejail/no_sandbox.c @@ -190,7 +190,7 @@ void run_no_sandbox(int argc, char **argv) { int prog_index = 0; // find first non option arg: - // - first argument not starting wiht --, + // - first argument not starting with --, // - whatever follows after -c (example: firejail -c ls) for (i = 1; i < argc; i++) { if (strcmp(argv[i], "-c") == 0) { diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 9a15a06c8..c30ab5956 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c @@ -228,7 +228,7 @@ void x11_start_xvfb(int argc, char **argv) { assert(xvfb_screen); - char *server_argv[256] = { // rest initialyzed to NULL + char *server_argv[256] = { // rest initialized to NULL "Xvfb", display_str, "-screen", "0", xvfb_screen }; unsigned pos = 0; @@ -418,7 +418,7 @@ void x11_start_xephyr(int argc, char **argv) { pid_t jail = 0; pid_t server = 0; - // default xephyr screen can be overwriten by a --xephyr-screen= command line option + // default xephyr screen can be overwritten by a --xephyr-screen= command line option char *newscreen = extract_setting(argc, argv, "--xephyr-screen="); if (newscreen) xephyr_screen = newscreen; @@ -446,7 +446,7 @@ void x11_start_xephyr(int argc, char **argv) { errExit("asprintf"); assert(xephyr_screen); - char *server_argv[256] = { // rest initialyzed to NULL + char *server_argv[256] = { // rest initialized to NULL "Xephyr", "-ac", "-br", "-noreset", "-screen", xephyr_screen }; unsigned pos = 0; @@ -627,7 +627,7 @@ void x11_start_xpra_old(int argc, char **argv, int display, char *display_str) { pid_t server = 0; // build the start command - char *server_argv[256] = { // rest initialyzed to NULL + char *server_argv[256] = { // rest initialized to NULL "xpra", "start", display_str, "--no-daemon", }; unsigned pos = 0; @@ -861,7 +861,7 @@ void x11_start_xpra_new(int argc, char **argv, char *display_str) { pid_t server = 0; // build the start command - char *server_argv[256] = { // rest initialyzed to NULL + char *server_argv[256] = { // rest initialized to NULL "xpra", "start", display_str, "--daemon=no", "--attach=yes", "--exit-with-children=yes" }; unsigned spos = 0; diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c index 5b16191be..64d7d8f2d 100644 --- a/src/firemon/procevent.c +++ b/src/firemon/procevent.c @@ -385,7 +385,7 @@ static int procevent_monitor(const int sock, pid_t mypid) { int add_new = 0; if (pids[pid].level < 0) // not a firejail process continue; - else if (pids[pid].level == 0) { // new porcess, do we track it? + else if (pids[pid].level == 0) { // new process, do we track it? if (pid_is_firejail(pid) && mypid == 0) { pids[pid].level = 1; add_new = 1; diff --git a/src/fshaper/fshaper.sh b/src/fshaper/fshaper.sh index 470137895..30a07fb86 100755 --- a/src/fshaper/fshaper.sh +++ b/src/fshaper/fshaper.sh @@ -21,7 +21,7 @@ if [ "$1" = "--clear" ]; then fi DEV=$2 - echo "Removing bandwith limits" + echo "Removing bandwidth limits" /sbin/tc qdisc del dev $DEV root 2> /dev/null > /dev/null /sbin/tc qdisc del dev $DEV ingress 2> /dev/null > /dev/null exit @@ -30,7 +30,7 @@ fi if [ "$1" = "--set" ]; then DEV=$2 - echo "Removing bandwith limit" + echo "Removing bandwidth limit" /sbin/tc qdisc del dev $DEV ingress #2> /dev/null > /dev/null if [ $# -ne 4 ]; then diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index 251346bd5..4e22796c9 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt @@ -275,7 +275,7 @@ Build a new /lib directory and bring in the libraries required by the applicatio This feature is still under development, see \fBman 1 firejail\fR for some examples. .TP \fBprivate-opt file,directory -Build a new /optin a temporary +Build a new /opt in a temporary filesystem, and copy the files and directories in the list. All modifications are discarded when the sandbox is closed. .TP diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 2fe2e8bfa..8898c6791 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt @@ -1712,7 +1712,7 @@ vm86, vm86old, vmsplice and vserver. To help creating useful seccomp filters more easily, the following system call groups are defined: @clock, @cpu-emulation, @debug, @default, @default-nodebuggers, @default-keep, @module, @obsolete, -@privileged, @raw-io, @reboot, @resources and @swap. In addtion, a +@privileged, @raw-io, @reboot, @resources and @swap. In addition, a system call can be specified by its number instead of name with prefix $, so for example $165 would be equal to mount on i386. diff --git a/src/tools/testuid.c b/src/tools/testuid.c index 633b9773e..51395a98d 100644 --- a/src/tools/testuid.c +++ b/src/tools/testuid.c @@ -30,7 +30,7 @@ static void print_status(void) { FILE *fp = fopen("/proc/self/status", "r"); if (!fp) { - fprintf(stderr, "Error, cannot open staus file\n"); + fprintf(stderr, "Error, cannot open status file\n"); exit(1); } diff --git a/test/network/README b/test/network/README index 4404c53b0..1e215b41e 100644 --- a/test/network/README +++ b/test/network/README @@ -1,7 +1,7 @@ Warning: this test requires root access to configure a number of bridge, mac and vlan devices. Please take a look at configure file. By the time you are finished testing, you'll probably have to reboot the computer to get your -networking subsytem back to normal. +networking subsystem back to normal. Limitations - to be investigated and fixed: - the test is assuming an eth0 wired interface to be present diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index ff293a569..8f4e39022 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp @@ -50,7 +50,7 @@ sleep 1 send -- "firejail --bandwidth=test clear br0\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Removing bandwith limits" + "Removing bandwidth limits" } sleep 1 -- cgit v1.2.3-54-g00ecf