1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
Description: Fix some grammatical and typographical errors.
Author: Peter Pentchev <roam@ringlet.net>
Forwarded: yes
Last-Update: 2025-09-25
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,7 +98,7 @@
- some cleanup work
20190127:
-- fix: erronous empty file generation on network connection failure
+- fix: erroneous empty file generation on network connection failure
20190119:
- enhanced default settings for better performance
@@ -197,7 +197,7 @@
- enhancement: adjust some messages to avoid line-wrapping
- enhancement: print status message to log if suppressed on console
- enhancement: also read config files in /etc and ${prefix}/etc
-- enhancement: simplified memory conifguration detection scheme
+- enhancement: simplified memory configuration detection scheme
- added an example config file, with documentation of all options
- added parameter StatusInterval
- fix for handling empty lines in config files
@@ -234,7 +234,7 @@
- fix: potential infinite loop on output error
20150412:
-- fix: watchdog cannot do its job if it is cleaned up to early
+- fix: watchdog cannot do its job if it is cleaned up too early
- fix: clear sa_flags and sa_mask before use, although ignored
20141227:
@@ -260,7 +260,7 @@
20130220:
- reverted incorrect fix for -P 100, which may lead to data corruption
-- reenable hash libraries (no correlation with data corruption)
+- re-enable hash libraries (no correlation with data corruption)
- bail out if any output fails to initialize
- refixed hang on -P 100
- reduced sending overhead
@@ -384,7 +384,7 @@
20081207:
- fixed some typos in man page
- TCP buffer tuning could be a little bit more intelligent
-- fixed formating of some info messages
+- fixed formatting of some info messages
- tuneable TCP buffer with option --tcpbuffer
20081113:
@@ -422,7 +422,7 @@
- docu update
20080910:
-- new feature: support for multiple ouptuts
+- new feature: support for multiple outputs
- new LICENSE: GPLv3
- fixed a race-condition in logging
- adjusted CFLAGS for gcc
@@ -535,7 +535,7 @@
changed all floats to double
20060421:
-- set exitcode to failure whenever an error occures
+- set exitcode to failure whenever an error occurs
- fixed a warning
20060324:
@@ -544,7 +544,7 @@
performance as it requires a higher number of I/O ops. On systems
without full synchronous data integrity support, no difference will
be observable concerning performance. Systems that support it, will
- gain increased performace without -c, but error reporting will be
+ gain increased performance without -c, but error reporting will be
more precise with -c.
- changed errormessages to include offset
- added support for Solaris' directio hinting
@@ -626,7 +626,7 @@
20050125:
- fixed operation of low watermark (-p)
-- made printf formating more standard conforming
+- made printf formatting more standard conforming
- start output before input thread
- more minor fixes
@@ -756,7 +756,7 @@
- experimental feature: output to multiple volumes
20010426:
-- Bugfix: fixed sleep, which limited the performace to 1MB/s
+- Bugfix: fixed sleep, which limited the performance to 1MB/s
(credits go to Padraig Brady <padraig@antefacto.com>)
- Bugfix: fixed incorrect display of total datatransfer for >2GB
- Cosmetic: on sighup print newline on stderr
@@ -770,7 +770,7 @@
20010124:
- Bugfix: outputThread terminated too early in certain cases
-- Fix for correct termination if an error occured
+- Fix for correct termination if an error occurred
- added install rule in Makefile
-- status messages are now indebendend of other messages
+- status messages are now independent of other messages
- a little bit more verbose debugging info
--- a/configure.in
+++ b/configure.in
@@ -125,7 +125,7 @@
AC_SEARCH_LIBS(hstrerror,resolv socket nsl,AC_DEFINE([HAVE_HSTRERROR], [1], [Define to 1 if you have the hstrerror() function]),)
AC_SEARCH_LIBS(getaddrinfo,resolv socket nsl ,AC_DEFINE([HAVE_GETADDRINFO], [1], [Define to 1 if you have the getaddrinfo() function]) ,AC_MSG_WARN(support for systems without getaddrinfo is deprecated and will be removed in the future))
AC_SEARCH_LIBS(socket,socket,,AC_MSG_ERROR(could not find the library containing network functions!))
-AC_SEARCH_LIBS(gethostbyname,nsl,,AC_MSG_ERROR(could not find the library containing name convertion functions!))
+AC_SEARCH_LIBS(gethostbyname,nsl,,AC_MSG_ERROR(could not find the library containing name conversion functions!))
AC_SEARCH_LIBS(sendfile,sendfile,AC_DEFINE([HAVE_SENDFILE],[1],[libsendfile is available]),)
AC_CHECK_HEADER(sys/sendfile.h,AC_DEFINE([HAVE_SENDFILE_H],[1],[sendfile in sendfile.h]),)
AC_FUNC_ALLOCA
--- a/globals.c
+++ b/globals.c
@@ -28,7 +28,7 @@
Hashers = 0, /* number of hashing threads */
In = -1,
OptMode = O_EXCL,
- Terminal = 0, /* do we have a controling terminal? */
+ Terminal = 0, /* do we have a controlling terminal? */
TermQ[2],
Tmp = -1;
--- a/mbconf.h
+++ b/mbconf.h
@@ -54,7 +54,7 @@
#ifndef S_SPLINT_S
#ifndef _POSIX_SEMAPHORES
-#error posix sempahores are required
+#error posix semaphores are required
#endif
#endif
--- a/mbuffer.c
+++ b/mbuffer.c
@@ -525,7 +525,7 @@
/* regular multi-volume handling */
if (!outfile) {
errormsg("End of volume, but not end of input:\n"
- "Output file must be given (option -o) for multi volume support!\n");
+ "Output file must be given (option -o) for multi-volume support!\n");
return -1;
}
infomsg("end of volume - last block on volume: %lld\n",Numout);
@@ -1213,7 +1213,7 @@
/* multi volume input consistency checking */
if ((NumVolumes != 1) && (!Infile))
- fatal("multi volume support for input needs an explicit given input device (option -i)\n");
+ fatal("multi-volume support for input needs an explicitly specified input device (option -i)\n");
/* SPW: Volsize consistency checking */
if (OutVolsize && !OutFile)
--- a/mbuffer.rc
+++ b/mbuffer.rc
@@ -45,7 +45,7 @@
# startread = 100
## high watermark value in percent [%]
-## writing starts when buffer fill percentage raises above this value
+## writing starts when buffer fill percentage rises above this value
# startwrite = 0
## watchdog timeout [sec]
--- a/settings.c
+++ b/settings.c
@@ -596,7 +596,7 @@
(void) fprintf(stderr,
"mbuffer version " VERSION "\n"\
"Copyright 2001-2025 - T. Maier-Komor\n"\
- "License: GPLv3 - see file LICENSE\n"\
+ "License: GPLv3 - see the LICENSE file\n"\
"This program comes with ABSOLUTELY NO WARRANTY!!!\n"
"Donations via PayPal to thomas@maier-komor.de are welcome and support this work!\n"
"\n"
@@ -625,7 +625,7 @@
"-m <size> : memory <size> of buffer in b,k,M,G,%% (default: %llu%c)\n"
#endif
#ifdef _POSIX_MEMLOCK_RANGE
- "-L : lock buffer in memory (unusable with file based buffers)\n"
+ "-L : lock buffer in memory (unusable with file-based buffers)\n"
#endif
"-d : use blocksize of device for output\n"
"-D <size> : assumed output device size (default: infinite/auto-detect)\n"
@@ -639,7 +639,7 @@
"-I <p> : use network port <port> as input\n"
"-O <h>:<p> : output data to host <h> and port <p> (MULTIPLE outputs supported)\n"
"-n <num> : <num> volumes for input, '0' to prompt interactively (requires -i)\n"
- "-t : use memory mapped temporary file (for huge buffer)\n"
+ "-t : use memory-mapped temporary file (for huge buffer)\n"
"-T <file> : as -t but uses <file> as buffer\n"
"-l <file> : use <file> for logging messages\n"
"-u <num> : pause <num> microseconds after each write\n"
@@ -722,9 +722,9 @@
return (unsigned long long) d;
default:
if (argv[c][-2] == '-')
- fatal("unrecognized size charakter \"%c\" for option \"%s\"\n",ch,&argv[c][-2]);
+ fatal("unrecognized size character \"%c\" for option \"%s\"\n",ch,&argv[c][-2]);
else
- fatal("unrecognized size charakter \"%c\" for option \"%s\"\n",ch,argv[c-1]);
+ fatal("unrecognized size character \"%c\" for option \"%s\"\n",ch,argv[c-1]);
return d;
}
case 1:
--- a/mbuffer.1.in
+++ b/mbuffer.1.in
@@ -219,7 +219,7 @@
- \fB$MBUFFERRC\fR
.br
.LP
-The default values given in the files above are overriden by options
+The default values given in the files above are overridden by options
passed on the command-line.
.SH "ENVIRONMENT VARIABLES"
|
