Skip to content

Commit

Permalink
Misc. typos
Browse files Browse the repository at this point in the history
Found using `codespell -q 3 -L shotcut,objext,als,ans,creat,varius,chage,tthe`
  • Loading branch information
luzpaz committed Nov 19, 2018
1 parent d9895d3 commit 681e074
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions RELNOTES
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/fjresize.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion src/faudit/caps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/fbuilder/build_profile.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/firejail/cmdline.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/firejail/firejail.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/firejail/fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/firejail/fs_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/firejail/ls.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions src/firejail/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/firejail/no_sandbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions src/firejail/x11.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/firemon/procevent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/fshaper/fshaper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/man/firejail-profile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/man/firejail.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion src/tools/testuid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion test/network/README
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/network/bandwidth.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 681e074

Please sign in to comment.