diff options
Diffstat (limited to 'src/xz')
| -rw-r--r-- | src/xz/coder.c | 2 | ||||
| -rw-r--r-- | src/xz/file_io.c | 2 | ||||
| -rw-r--r-- | src/xz/main.c | 6 | ||||
| -rw-r--r-- | src/xz/main.h | 2 | ||||
| -rw-r--r-- | src/xz/message.c | 10 | ||||
| -rw-r--r-- | src/xz/message.h | 2 | ||||
| -rw-r--r-- | src/xz/xz.1 | 16 |
7 files changed, 20 insertions, 20 deletions
diff --git a/src/xz/coder.c b/src/xz/coder.c index cd5da299..2ee0c704 100644 --- a/src/xz/coder.c +++ b/src/xz/coder.c @@ -189,7 +189,7 @@ coder_set_compression_settings(void) if (memory_usage > memory_limit) { // If --no-auto-adjust was used or we didn't find LZMA1 or - // LZMA2 as the last filter, give an error immediatelly. + // LZMA2 as the last filter, give an error immediately. // --format=raw implies --no-auto-adjust. if (!auto_adjust || opt_format == FORMAT_RAW) memlimit_too_small(memory_usage); diff --git a/src/xz/file_io.c b/src/xz/file_io.c index 020f33dd..a78002eb 100644 --- a/src/xz/file_io.c +++ b/src/xz/file_io.c @@ -54,7 +54,7 @@ extern void io_init(void) { // Make sure that stdin, stdout, and and stderr are connected to - // a valid file descriptor. Exit immediatelly with exit code ERROR + // a valid file descriptor. Exit immediately with exit code ERROR // if we cannot make the file descriptors valid. Maybe we should // print an error message, but our stderr could be screwed anyway. tuklib_open_stdxxx(E_ERROR); diff --git a/src/xz/main.c b/src/xz/main.c index c5330039..e0905893 100644 --- a/src/xz/main.c +++ b/src/xz/main.c @@ -46,7 +46,7 @@ static const char * read_name(const args_info *args) { // FIXME: Maybe we should have some kind of memory usage limit here - // like the tool has for the actual compression and uncompression. + // like the tool has for the actual compression and decompression. // Giving some huge text file with --files0 makes us to read the // whole file in RAM. static char *name = NULL; @@ -188,7 +188,7 @@ main(int argc, char **argv) if (opt_mode != MODE_LIST) signals_init(); - // coder_run() handles compression, decopmression, and testing. + // coder_run() handles compression, decompression, and testing. // list_file() is for --list. void (*run)(const char *filename) = opt_mode == MODE_LIST ? &list_file : &coder_run; @@ -226,7 +226,7 @@ main(int argc, char **argv) args.arg_names[i] = (char *)stdin_filename; } - // Do the actual compression or uncompression. + // Do the actual compression or decompression. run(args.arg_names[i]); } diff --git a/src/xz/main.h b/src/xz/main.h index 5622cebb..323f2f7d 100644 --- a/src/xz/main.h +++ b/src/xz/main.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file main.h -/// \brief Miscellanous declarations +/// \brief Miscellaneous declarations // // Author: Lasse Collin // diff --git a/src/xz/message.c b/src/xz/message.c index b5244d44..88efb0c0 100644 --- a/src/xz/message.c +++ b/src/xz/message.c @@ -288,7 +288,7 @@ message_progress_start(lzma_stream *strm, uint64_t in_size) if (verbosity >= V_VERBOSE && progress_automatic) { // Start the timer to display the first progress message // after one second. An alternative would be to show the - // first message almost immediatelly, but delaying by one + // first message almost immediately, but delaying by one // second looks better to me, since extremely early // progress info is pretty much useless. #ifdef SIGALRM @@ -383,8 +383,8 @@ progress_sizes(uint64_t compressed_pos, uint64_t uncompressed_pos, bool final) static const char * progress_speed(uint64_t uncompressed_pos, uint64_t elapsed) { - // Don't print the speed immediatelly, since the early values look - // like somewhat random. + // Don't print the speed immediately, since the early values look + // somewhat random. if (elapsed < 3000000) return ""; @@ -870,8 +870,8 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage) uint64_to_str(memlimit, 1)); } else { // Round up just like with memusage. If this function is - // called for informational purporse (to just show the - // current usage and limit), we will never show that + // called for informational purposes (to just show the + // current usage and limit), we should never show that // the usage is higher than the limit, which would give // a false impression that the memory usage limit isn't // properly enforced. diff --git a/src/xz/message.h b/src/xz/message.h index b894bcf3..7d637dfe 100644 --- a/src/xz/message.h +++ b/src/xz/message.h @@ -116,7 +116,7 @@ extern void message_set_files(unsigned int files); /// \brief Set the name of the current file and possibly print it too /// -/// The name is printed immediatelly if --list was used or if --verbose +/// The name is printed immediately if --list was used or if --verbose /// was used and stderr is a terminal. Even when the filename isn't printed, /// it is stored so that it can be printed later if needed for progress /// messages. diff --git a/src/xz/xz.1 b/src/xz/xz.1 index 709fa556..9dc354a0 100644 --- a/src/xz/xz.1 +++ b/src/xz/xz.1 @@ -121,7 +121,7 @@ is not a regular file. Symbolic links are not followed, thus they are not considered to be regular files. .IP \(bu 3 .I File -has more than one hardlink. +has more than one hard link. .IP \(bu 3 .I File has setuid, setgid, or sticky bit set. @@ -223,7 +223,7 @@ The absolute value of the active memory usage limit can be seen with .B \-\-info-memory or near the bottom of the output of .BR \-\-long\-help . -The default limit can be overriden with +The default limit can be overridden with \fB\-\-memory=\fIlimit\fR. .SH OPTIONS .SS "Integer suffixes and special values" @@ -299,7 +299,7 @@ If the target file already exists, delete it before compressing or decompressing. .IP \(bu 3 Compress or decompress even if the input is a symbolic link to a regular file, -has more than one hardlink, or has setuid, setgid, or sticky bit set. +has more than one hard link, or has setuid, setgid, or sticky bit set. The setuid, setgid, and sticky bits are not copied to the target file. .IP \(bu 3 If combined with @@ -399,10 +399,10 @@ This is the default. When compressing, .B auto is equivalent to .BR xz . -When decompressing, the format of the input file is autodetected. Note that -raw streams (created with +When decompressing, the format of the input file is automatically detected. +Note that raw streams (created with .BR \-\-format=raw ) -cannot be autodetected. +cannot be auto-detected. .IP \(bu 3 .BR xz : Compress to the @@ -568,7 +568,7 @@ increase a little with presets \fB\-0\fR ... \fB\-2\fR). The downside is that the compression time will increase dramatically (it can easily double). .TP \fB\-M\fR \fIlimit\fR, \fB\-\-memory=\fIlimit -Set the memory usage limit. If this option is specied multiple times, +Set the memory usage limit. If this option is specified multiple times, the last one takes effect. The .I limit can be specified in multiple ways: @@ -1260,7 +1260,7 @@ files which have dictionary size of .RI "2^" n or .RI "2^" n " + 2^(" n "\-1)." -This is to decrease false positives when autodetecting +This is to decrease false positives when detecting .B .lzma files. .PP |