Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
ClausKlein committed Aug 31, 2023
1 parent 39e485d commit ca2992e
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ Checks:
HeaderFilterRegex:
'.*'

#TODO: this isn't realy pedantic tody! CK
#TODO: this isn't realy pedantic today! CK
WarningsAsErrors:
'*'
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ default:
- sudo apt install --assume-yes clang-tidy python3-pip libboost-filesystem-dev
- python3 -m pip install -U -r requirements.txt
- echo -e "\e[0Ksection_end:`date +%s`:my_setup_linux\r\e[0K"
- git config --global [email protected]:mirror/github.com/.insteadOf https://github.com/
- git config --global user.name "Claus Klein"
- git config --global user.email "[email protected]"
- ssh-keyscan -t rsa code.rsint.net >> ~/.ssh/known_hosts
- git config --global url.https://code.rsint.net/mirror/github.com/.insteadOf https://github.com/
- git config --global -l
- git clone https://github.com/aminya/project_options.git
- pushd project_options && git remote -v && cat .gitmodules && popd

.standard-rules: # Make a hidden job to hold the common rules
rules:
Expand Down
8 changes: 4 additions & 4 deletions test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -uex

# NOTE: not loger used: tftp-hpa 5.2
# NOTE: not longer used: tftp-hpa 5.2
# Usage: tftp [-4][-6][-v][-V][-l][-m mode][-w size][-B blocksize] [-R port:port] [host [port]] [-c command]
#XXX TFTP="/usr/bin/tftp -v -4 127.0.0.1 1234 -m binary"

Expand Down Expand Up @@ -148,7 +148,7 @@ fi
##############################################
# NOTE we start our an own client
##############################################
# normal binary upload with dublicate ack's
# normal binary upload with duplicate ack's
# TODO: should not fail
## bin/tftpd_test 1234 &
## sleep 1
Expand All @@ -168,7 +168,7 @@ if test "${UNAME}" == "Linux"; then
wait
fi
##############################################
echo "NOTE: absolut path upload must fail!"
echo "NOTE: absolute path upload must fail!"
dd if=bin/tftpd_test of=test32k.dat bs=1024 count=32
bin/tftpd_test 1234 &
sleep 1
Expand All @@ -194,7 +194,7 @@ sleep 1
${TFTP} --input=build.ninja --upload=./../build.ninja && exit 1
wait

# invalid absolut path upload must fail
# invalid absolute path upload must fail
bin/tftpd_test 1234 &
sleep 1
${TFTP} --input=build.ninja --upload=//srv///tftp/build.ninja && exit 1
Expand Down
2 changes: 1 addition & 1 deletion tftp/tftp.1
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Note that the
protocol, unlike the
.Tn FTP
protocol,
does not maintain connections betwen transfers; thus, the
does not maintain connections between transfers; thus, the
.Cm connect
command does not actually create a connection,
but merely remembers what host is to be used for transfers.
Expand Down
2 changes: 1 addition & 1 deletion tftpd.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class receiver : public server
} while (false);

// ===============================
// write the current data segement
// write the current data segment
// ===============================
size_t const seg_length = rxlen - TFTP_HEADER;
ssize_t written = writeit(file_guard_.get(), &dp_, seg_length, false);
Expand Down
2 changes: 1 addition & 1 deletion tftpd_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static bool set_tsize(uintmax_t *vp)
}

if (sz == 0) {
sz = g_tsize; // only usefull for RRQ
sz = g_tsize; // only useful for RRQ
} else {
g_tsize = sz; // in case of WRQ
}
Expand Down
2 changes: 1 addition & 1 deletion tftpd_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ constexpr bool suppress_error{false};
// Change root directory on startup. This means the remote host does not need to pass along the directory as part of the
// transfer, and may add security.
constexpr bool secure_tftp{true};
// Allow new files to be created. Normaly, tftpd will only allow upload of files that already exist.
// Allow new files to be created. Normally, tftpd will only allow upload of files that already exist.
constexpr bool allow_create{true};

struct formats
Expand Down

0 comments on commit ca2992e

Please sign in to comment.