aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:02:31 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:02:31 +0000
commitd3d004dd3507f841745956a035fff68936378f9c (patch)
tree139fa79a102d11dbab9828d2649c119245b196b1
parent1340ca8c87d81bf00e604905f25bc04da22e980f (diff)
downloadbusybox-w32-d3d004dd3507f841745956a035fff68936378f9c.tar.gz
busybox-w32-d3d004dd3507f841745956a035fff68936378f9c.tar.bz2
busybox-w32-d3d004dd3507f841745956a035fff68936378f9c.zip
last nail into error_msg() (de)capitalization
Diffstat
-rw-r--r--archival/unzip.c16
-rw-r--r--console-tools/loadfont.c18
-rw-r--r--coreutils/sort.c8
-rw-r--r--coreutils/uudecode.c16
-rw-r--r--editors/ed.c66
-rw-r--r--editors/sed.c2
-rw-r--r--libbb/dump.c8
-rw-r--r--miscutils/mt.c2
-rw-r--r--modutils/modprobe.c4
-rw-r--r--networking/libiproute/libnetlink.c28
-rw-r--r--networking/libiproute/ll_addr.c6
-rw-r--r--util-linux/fdisk.c2
12 files changed, 88 insertions, 88 deletions
diff --git a/archival/unzip.c b/archival/unzip.c
index 2aa380dc8..8b1c281c4 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -222,7 +222,7 @@ int unzip_main(int argc, char **argv)
222 if (magic == ZIP_CDS_MAGIC) { 222 if (magic == ZIP_CDS_MAGIC) {
223 break; 223 break;
224 } else if (magic != ZIP_FILEHEADER_MAGIC) { 224 } else if (magic != ZIP_FILEHEADER_MAGIC) {
225 bb_error_msg_and_die("Invalid zip magic %08X", magic); 225 bb_error_msg_and_die("invalid zip magic %08X", magic);
226 } 226 }
227 227
228 /* Read the file header */ 228 /* Read the file header */
@@ -238,7 +238,7 @@ int unzip_main(int argc, char **argv)
238 zip_header.formatted.filename_len = SWAP_LE32(zip_header.formatted.filename_len); 238 zip_header.formatted.filename_len = SWAP_LE32(zip_header.formatted.filename_len);
239 zip_header.formatted.extra_len = SWAP_LE32(zip_header.formatted.extra_len); 239 zip_header.formatted.extra_len = SWAP_LE32(zip_header.formatted.extra_len);
240 if ((zip_header.formatted.method != 0) && (zip_header.formatted.method != 8)) { 240 if ((zip_header.formatted.method != 0) && (zip_header.formatted.method != 8)) {
241 bb_error_msg_and_die("Unsupported compression method %d", zip_header.formatted.method); 241 bb_error_msg_and_die("unsupported compression method %d", zip_header.formatted.method);
242 } 242 }
243 243
244 /* Read filename */ 244 /* Read filename */
@@ -251,7 +251,7 @@ int unzip_main(int argc, char **argv)
251 251
252 if ((verbosity == v_list) && !list_header_done){ 252 if ((verbosity == v_list) && !list_header_done){
253 printf(" Length Date Time Name\n" 253 printf(" Length Date Time Name\n"
254 " -------- ---- ---- ----\n"); 254 " -------- ---- ---- ----\n");
255 list_header_done = 1; 255 list_header_done = 1;
256 } 256 }
257 257
@@ -282,14 +282,14 @@ int unzip_main(int argc, char **argv)
282 } else if (last_char_is(dst_fn, '/')) { /* Extract directory */ 282 } else if (last_char_is(dst_fn, '/')) { /* Extract directory */
283 if (stat(dst_fn, &stat_buf) == -1) { 283 if (stat(dst_fn, &stat_buf) == -1) {
284 if (errno != ENOENT) { 284 if (errno != ENOENT) {
285 bb_perror_msg_and_die("Cannot stat '%s'",dst_fn); 285 bb_perror_msg_and_die("cannot stat '%s'",dst_fn);
286 } 286 }
287 if (verbosity == v_normal) { 287 if (verbosity == v_normal) {
288 printf(" creating: %s\n", dst_fn); 288 printf(" creating: %s\n", dst_fn);
289 } 289 }
290 unzip_create_leading_dirs(dst_fn); 290 unzip_create_leading_dirs(dst_fn);
291 if (bb_make_directory(dst_fn, 0777, 0)) { 291 if (bb_make_directory(dst_fn, 0777, 0)) {
292 bb_error_msg_and_die("Exiting"); 292 bb_error_msg_and_die("exiting");
293 } 293 }
294 } else { 294 } else {
295 if (!S_ISDIR(stat_buf.st_mode)) { 295 if (!S_ISDIR(stat_buf.st_mode)) {
@@ -302,7 +302,7 @@ int unzip_main(int argc, char **argv)
302 _check_file: 302 _check_file:
303 if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */ 303 if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */
304 if (errno != ENOENT) { 304 if (errno != ENOENT) {
305 bb_perror_msg_and_die("Cannot stat '%s'",dst_fn); 305 bb_perror_msg_and_die("cannot stat '%s'",dst_fn);
306 } 306 }
307 i = 'y'; 307 i = 'y';
308 308
@@ -316,7 +316,7 @@ int unzip_main(int argc, char **argv)
316 } else { 316 } else {
317 printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn); 317 printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
318 if (!fgets(key_buf, 512, stdin)) { 318 if (!fgets(key_buf, 512, stdin)) {
319 bb_perror_msg_and_die("Cannot read input"); 319 bb_perror_msg_and_die("cannot read input");
320 } 320 }
321 i = key_buf[0]; 321 i = key_buf[0];
322 } 322 }
@@ -358,7 +358,7 @@ int unzip_main(int argc, char **argv)
358 /* Prompt for new name */ 358 /* Prompt for new name */
359 printf("new name: "); 359 printf("new name: ");
360 if (!fgets(key_buf, 512, stdin)) { 360 if (!fgets(key_buf, 512, stdin)) {
361 bb_perror_msg_and_die("Cannot read input"); 361 bb_perror_msg_and_die("cannot read input");
362 } 362 }
363 free(dst_fn); 363 free(dst_fn);
364 dst_fn = xstrdup(key_buf); 364 dst_fn = xstrdup(key_buf);
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 3d8588565..513b3c170 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -51,7 +51,7 @@ static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize)
51 memset(buf, 0, sizeof(buf)); 51 memset(buf, 0, sizeof(buf));
52 52
53 if (unit < 1 || unit > 32) 53 if (unit < 1 || unit > 32)
54 bb_error_msg_and_die("Bad character size %d", unit); 54 bb_error_msg_and_die("bad character size %d", unit);
55 55
56 for (i = 0; i < fontsize; i++) 56 for (i = 0; i < fontsize; i++)
57 memcpy(buf + (32 * i), inbuf + (unit * i), unit); 57 memcpy(buf + (32 * i), inbuf + (unit * i), unit);
@@ -108,8 +108,8 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
108 if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { 108 if (ioctl(fd, PIO_UNIMAPCLR, &advice)) {
109#ifdef ENOIOCTLCMD 109#ifdef ENOIOCTLCMD
110 if (errno == ENOIOCTLCMD) { 110 if (errno == ENOIOCTLCMD) {
111 bb_error_msg("It seems this kernel is older than 1.1.92"); 111 bb_error_msg("it seems this kernel is older than 1.1.92");
112 bb_error_msg_and_die("No Unicode mapping table loaded."); 112 bb_error_msg_and_die("no Unicode mapping table loaded");
113 } else 113 } else
114#endif 114#endif
115 bb_perror_msg_and_die("PIO_UNIMAPCLR"); 115 bb_perror_msg_and_die("PIO_UNIMAPCLR");
@@ -134,13 +134,13 @@ static void loadnewfont(int fd)
134 */ 134 */
135 inputlth = fread(inbuf, 1, sizeof(inbuf), stdin); 135 inputlth = fread(inbuf, 1, sizeof(inbuf), stdin);
136 if (ferror(stdin)) 136 if (ferror(stdin))
137 bb_perror_msg_and_die("Error reading input font"); 137 bb_perror_msg_and_die("error reading input font");
138 /* use malloc/realloc in case of giant files; 138 /* use malloc/realloc in case of giant files;
139 maybe these do not occur: 16kB for the font, 139 maybe these do not occur: 16kB for the font,
140 and 16kB for the map leaves 32 unicode values 140 and 16kB for the map leaves 32 unicode values
141 for each font position */ 141 for each font position */
142 if (!feof(stdin)) 142 if (!feof(stdin))
143 bb_perror_msg_and_die("Font too large"); 143 bb_perror_msg_and_die("font too large");
144 144
145 /* test for psf first */ 145 /* test for psf first */
146 { 146 {
@@ -158,11 +158,11 @@ static void loadnewfont(int fd)
158 goto no_psf; 158 goto no_psf;
159 159
160 if (psfhdr.mode > PSF_MAXMODE) 160 if (psfhdr.mode > PSF_MAXMODE)
161 bb_error_msg_and_die("Unsupported psf file mode"); 161 bb_error_msg_and_die("unsupported psf file mode");
162 fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); 162 fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
163#if !defined( PIO_FONTX ) || defined( __sparc__ ) 163#if !defined( PIO_FONTX ) || defined( __sparc__ )
164 if (fontsize != 256) 164 if (fontsize != 256)
165 bb_error_msg_and_die("Only fontsize 256 supported"); 165 bb_error_msg_and_die("only fontsize 256 supported");
166#endif 166#endif
167 hastable = (psfhdr.mode & PSF_MODEHASTAB); 167 hastable = (psfhdr.mode & PSF_MODEHASTAB);
168 unit = psfhdr.charsize; 168 unit = psfhdr.charsize;
@@ -170,7 +170,7 @@ static void loadnewfont(int fd)
170 170
171 head = head0 + fontsize * unit; 171 head = head0 + fontsize * unit;
172 if (head > inputlth || (!hastable && head != inputlth)) 172 if (head > inputlth || (!hastable && head != inputlth))
173 bb_error_msg_and_die("Input file: bad length"); 173 bb_error_msg_and_die("input file: bad length");
174 do_loadfont(fd, inbuf + head0, unit, fontsize); 174 do_loadfont(fd, inbuf + head0, unit, fontsize);
175 if (hastable) 175 if (hastable)
176 do_loadtable(fd, inbuf + head, inputlth - head, fontsize); 176 do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
@@ -185,7 +185,7 @@ static void loadnewfont(int fd)
185 } else { 185 } else {
186 /* bare font */ 186 /* bare font */
187 if (inputlth & 0377) 187 if (inputlth & 0377)
188 bb_error_msg_and_die("Bad input file size"); 188 bb_error_msg_and_die("bad input file size");
189 offset = 0; 189 offset = 0;
190 unit = inputlth / 256; 190 unit = inputlth / 256;
191 } 191 }
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 972477bab..1ba05ecd7 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -153,7 +153,7 @@ static int compare_keys(const void *xarg, const void *yarg)
153 /* Perform actual comparison */ 153 /* Perform actual comparison */
154 switch(flags&7) { 154 switch(flags&7) {
155 default: 155 default:
156 bb_error_msg_and_die("Unknown sort type."); 156 bb_error_msg_and_die("unknown sort type");
157 break; 157 break;
158 /* Ascii sort */ 158 /* Ascii sort */
159 case 0: 159 case 0:
@@ -233,12 +233,12 @@ int sort_main(int argc, char **argv)
233 switch(*line) { 233 switch(*line) {
234#ifdef CONFIG_FEATURE_SORT_BIG 234#ifdef CONFIG_FEATURE_SORT_BIG
235 case 'o': 235 case 'o':
236 if(outfile) bb_error_msg_and_die("Too many -o."); 236 if(outfile) bb_error_msg_and_die("too many -o");
237 outfile=xfopen(optarg,"w"); 237 outfile=xfopen(optarg,"w");
238 break; 238 break;
239 case 't': 239 case 't':
240 if(key_separator || optarg[1]) 240 if(key_separator || optarg[1])
241 bb_error_msg_and_die("Too many -t."); 241 bb_error_msg_and_die("too many -t");
242 key_separator=*optarg; 242 key_separator=*optarg;
243 break; 243 break;
244 /* parse sort key */ 244 /* parse sort key */
@@ -262,7 +262,7 @@ int sort_main(int argc, char **argv)
262 temp2=strchr(optlist,*temp); 262 temp2=strchr(optlist,*temp);
263 flag=(1<<(temp2-optlist)); 263 flag=(1<<(temp2-optlist));
264 if(!temp2 || (flag>FLAG_M && flag<FLAG_b)) 264 if(!temp2 || (flag>FLAG_M && flag<FLAG_b))
265 bb_error_msg_and_die("Unknown key option."); 265 bb_error_msg_and_die("unknown key option");
266 /* b after , means strip _trailing_ space */ 266 /* b after , means strip _trailing_ space */
267 if(i && flag==FLAG_b) flag=FLAG_bb; 267 if(i && flag==FLAG_b) flag=FLAG_bb;
268 key->flags|=flag; 268 key->flags|=flag;
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index a08d985ac..8b7de74ff 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -23,7 +23,7 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream)
23 char *line_ptr = line; 23 char *line_ptr = line;
24 24
25 if (strcmp(line, "end") == 0) { 25 if (strcmp(line, "end") == 0) {
26 return(EXIT_SUCCESS); 26 return EXIT_SUCCESS;
27 } 27 }
28 length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3; 28 length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3;
29 29
@@ -32,13 +32,13 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream)
32 continue; 32 continue;
33 } 33 }
34 if (length > 60) { 34 if (length > 60) {
35 bb_error_msg_and_die("Line too long"); 35 bb_error_msg_and_die("line too long");
36 } 36 }
37 37
38 line_ptr++; 38 line_ptr++;
39 /* Tolerate an overly long line to accomodate a possible exta '`' */ 39 /* Tolerate an overly long line to accomodate a possible exta '`' */
40 if (strlen(line_ptr) < (size_t)length) { 40 if (strlen(line_ptr) < (size_t)length) {
41 bb_error_msg_and_die("Short file"); 41 bb_error_msg_and_die("short file");
42 } 42 }
43 43
44 while (length > 0) { 44 while (length > 0) {
@@ -63,7 +63,7 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream)
63 } 63 }
64 free(line); 64 free(line);
65 } 65 }
66 bb_error_msg_and_die("Short file"); 66 bb_error_msg_and_die("short file");
67} 67}
68 68
69static int read_base64(FILE *src_stream, FILE *dst_stream) 69static int read_base64(FILE *src_stream, FILE *dst_stream)
@@ -84,7 +84,7 @@ static int read_base64(FILE *src_stream, FILE *dst_stream)
84 do { 84 do {
85 ch = fgetc(src_stream); 85 ch = fgetc(src_stream);
86 if (ch == EOF) { 86 if (ch == EOF) {
87 bb_error_msg_and_die("Short file"); 87 bb_error_msg_and_die("short file");
88 } 88 }
89 } while ((table_ptr = strchr(base64_table, ch)) == NULL); 89 } while ((table_ptr = strchr(base64_table, ch)) == NULL);
90 90
@@ -101,7 +101,7 @@ static int read_base64(FILE *src_stream, FILE *dst_stream)
101 else if (*table_ptr == '\n') { 101 else if (*table_ptr == '\n') {
102 /* Check for terminating line */ 102 /* Check for terminating line */
103 if (term_count == 5) { 103 if (term_count == 5) {
104 return(EXIT_SUCCESS); 104 return EXIT_SUCCESS;
105 } 105 }
106 term_count = 1; 106 term_count = 1;
107 continue; 107 continue;
@@ -175,7 +175,7 @@ int uudecode_main(int argc, char **argv)
175 free(line); 175 free(line);
176 ret = decode_fn_ptr(src_stream, dst_stream); 176 ret = decode_fn_ptr(src_stream, dst_stream);
177 fclose_if_not_stdin(src_stream); 177 fclose_if_not_stdin(src_stream);
178 return(ret); 178 return ret;
179 } 179 }
180 bb_error_msg_and_die("No `begin' line"); 180 bb_error_msg_and_die("no 'begin' line");
181} 181}
diff --git a/editors/ed.c b/editors/ed.c
index 1ff93c2bb..190c547f4 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -57,7 +57,7 @@ int ed_main(int argc, char **argv)
57 fileName = strdup(argv[1]); 57 fileName = strdup(argv[1]);
58 58
59 if (fileName == NULL) { 59 if (fileName == NULL) {
60 bb_error_msg("No memory"); 60 bb_error_msg("no memory");
61 termEdit(); 61 termEdit();
62 return EXIT_SUCCESS; 62 return EXIT_SUCCESS;
63 } 63 }
@@ -105,7 +105,7 @@ static void doCommands(void)
105 105
106 if (*endbuf != '\n') 106 if (*endbuf != '\n')
107 { 107 {
108 bb_error_msg("Command line too long"); 108 bb_error_msg("command line too long");
109 109
110 do 110 do
111 { 111 {
@@ -182,7 +182,7 @@ static void doCommands(void)
182 case 'f': 182 case 'f':
183 if (*cp && !isblank(*cp)) 183 if (*cp && !isblank(*cp))
184 { 184 {
185 bb_error_msg("Bad file command"); 185 bb_error_msg("bad file command");
186 break; 186 break;
187 } 187 }
188 188
@@ -203,7 +203,7 @@ static void doCommands(void)
203 203
204 if (newname == NULL) 204 if (newname == NULL)
205 { 205 {
206 bb_error_msg("No memory for file name"); 206 bb_error_msg("no memory for file name");
207 break; 207 break;
208 } 208 }
209 209
@@ -223,7 +223,7 @@ static void doCommands(void)
223 223
224 if ((*cp < 'a') || (*cp > 'a') || cp[1]) 224 if ((*cp < 'a') || (*cp > 'a') || cp[1])
225 { 225 {
226 bb_error_msg("Bad mark name"); 226 bb_error_msg("bad mark name");
227 break; 227 break;
228 } 228 }
229 229
@@ -244,7 +244,7 @@ static void doCommands(void)
244 244
245 if (have1 || *cp) 245 if (have1 || *cp)
246 { 246 {
247 bb_error_msg("Bad quit command"); 247 bb_error_msg("bad quit command");
248 break; 248 break;
249 } 249 }
250 250
@@ -269,7 +269,7 @@ static void doCommands(void)
269 case 'r': 269 case 'r':
270 if (*cp && !isblank(*cp)) 270 if (*cp && !isblank(*cp))
271 { 271 {
272 bb_error_msg("Bad read command"); 272 bb_error_msg("bad read command");
273 break; 273 break;
274 } 274 }
275 275
@@ -278,7 +278,7 @@ static void doCommands(void)
278 278
279 if (*cp == '\0') 279 if (*cp == '\0')
280 { 280 {
281 bb_error_msg("No file name"); 281 bb_error_msg("no file name");
282 break; 282 break;
283 } 283 }
284 284
@@ -300,7 +300,7 @@ static void doCommands(void)
300 case 'w': 300 case 'w':
301 if (*cp && !isblank(*cp)) 301 if (*cp && !isblank(*cp))
302 { 302 {
303 bb_error_msg("Bad write command"); 303 bb_error_msg("bad write command");
304 break; 304 break;
305 } 305 }
306 306
@@ -317,7 +317,7 @@ static void doCommands(void)
317 317
318 if (cp == NULL) 318 if (cp == NULL)
319 { 319 {
320 bb_error_msg("No file name specified"); 320 bb_error_msg("no file name specified");
321 break; 321 break;
322 } 322 }
323 323
@@ -342,7 +342,7 @@ static void doCommands(void)
342 case '.': 342 case '.':
343 if (have1) 343 if (have1)
344 { 344 {
345 bb_error_msg("No arguments allowed"); 345 bb_error_msg("no arguments allowed");
346 break; 346 break;
347 } 347 }
348 348
@@ -372,7 +372,7 @@ static void doCommands(void)
372 break; 372 break;
373 373
374 default: 374 default:
375 bb_error_msg("Unimplemented command"); 375 bb_error_msg("unimplemented command");
376 break; 376 break;
377 } 377 }
378 } 378 }
@@ -392,7 +392,7 @@ static void subCommand(const char * cmd, int num1, int num2)
392 392
393 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) 393 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2))
394 { 394 {
395 bb_error_msg("Bad line range for substitute"); 395 bb_error_msg("bad line range for substitute");
396 396
397 return; 397 return;
398 } 398 }
@@ -410,7 +410,7 @@ static void subCommand(const char * cmd, int num1, int num2)
410 410
411 if (isblank(*cp) || (*cp == '\0')) 411 if (isblank(*cp) || (*cp == '\0'))
412 { 412 {
413 bb_error_msg("Bad delimiter for substitute"); 413 bb_error_msg("bad delimiter for substitute");
414 414
415 return; 415 return;
416 } 416 }
@@ -422,7 +422,7 @@ static void subCommand(const char * cmd, int num1, int num2)
422 422
423 if (cp == NULL) 423 if (cp == NULL)
424 { 424 {
425 bb_error_msg("Missing 2nd delimiter for substitute"); 425 bb_error_msg("missing 2nd delimiter for substitute");
426 426
427 return; 427 return;
428 } 428 }
@@ -448,7 +448,7 @@ static void subCommand(const char * cmd, int num1, int num2)
448 break; 448 break;
449 449
450 default: 450 default:
451 bb_error_msg("Unknown option for substitute"); 451 bb_error_msg("unknown option for substitute");
452 452
453 return; 453 return;
454 } 454 }
@@ -457,7 +457,7 @@ static void subCommand(const char * cmd, int num1, int num2)
457 { 457 {
458 if (searchString[0] == '\0') 458 if (searchString[0] == '\0')
459 { 459 {
460 bb_error_msg("No previous search string"); 460 bb_error_msg("no previous search string");
461 461
462 return; 462 return;
463 } 463 }
@@ -545,7 +545,7 @@ static void subCommand(const char * cmd, int num1, int num2)
545 545
546 if (nlp == NULL) 546 if (nlp == NULL)
547 { 547 {
548 bb_error_msg("Cannot get memory for line"); 548 bb_error_msg("cannot get memory for line");
549 549
550 return; 550 return;
551 } 551 }
@@ -587,7 +587,7 @@ static void subCommand(const char * cmd, int num1, int num2)
587 } 587 }
588 588
589 if (!didSub) 589 if (!didSub)
590 bb_error_msg("No substitutions found for \"%s\"", oldStr); 590 bb_error_msg("no substitutions found for \"%s\"", oldStr);
591} 591}
592 592
593 593
@@ -651,7 +651,7 @@ static void addLines(int num)
651 651
652 if (buf[len - 1] != '\n') 652 if (buf[len - 1] != '\n')
653 { 653 {
654 bb_error_msg("Line too long"); 654 bb_error_msg("line too long");
655 655
656 do 656 do
657 { 657 {
@@ -711,7 +711,7 @@ static int getNum(const char **retcp, int *retHaveNum, int *retNum)
711 711
712 if ((*cp < 'a') || (*cp > 'z')) 712 if ((*cp < 'a') || (*cp > 'z'))
713 { 713 {
714 bb_error_msg("Bad mark name"); 714 bb_error_msg("bad mark name");
715 715
716 return FALSE; 716 return FALSE;
717 } 717 }
@@ -799,7 +799,7 @@ static int initEdit(void)
799 799
800 if (bufBase == NULL) 800 if (bufBase == NULL)
801 { 801 {
802 bb_error_msg("No memory for buffer"); 802 bb_error_msg("no memory for buffer");
803 803
804 return FALSE; 804 return FALSE;
805 } 805 }
@@ -865,7 +865,7 @@ static int readLines(const char * file, int num)
865 865
866 if ((num < 1) || (num > lastNum + 1)) 866 if ((num < 1) || (num > lastNum + 1))
867 { 867 {
868 bb_error_msg("Bad line for read"); 868 bb_error_msg("bad line for read");
869 869
870 return FALSE; 870 return FALSE;
871 } 871 }
@@ -925,7 +925,7 @@ static int readLines(const char * file, int num)
925 925
926 if (cp == NULL) 926 if (cp == NULL)
927 { 927 {
928 bb_error_msg("No memory for buffer"); 928 bb_error_msg("no memory for buffer");
929 close(fd); 929 close(fd);
930 930
931 return FALSE; 931 return FALSE;
@@ -984,7 +984,7 @@ static int writeLines(const char * file, int num1, int num2)
984 984
985 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) 985 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2))
986 { 986 {
987 bb_error_msg("Bad line range for write"); 987 bb_error_msg("bad line range for write");
988 988
989 return FALSE; 989 return FALSE;
990 } 990 }
@@ -1054,7 +1054,7 @@ static int printLines(int num1, int num2, int expandFlag)
1054 1054
1055 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) 1055 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2))
1056 { 1056 {
1057 bb_error_msg("Bad line range for print"); 1057 bb_error_msg("bad line range for print");
1058 1058
1059 return FALSE; 1059 return FALSE;
1060 } 1060 }
@@ -1133,7 +1133,7 @@ static int insertLine(int num, const char * data, int len)
1133 1133
1134 if ((num < 1) || (num > lastNum + 1)) 1134 if ((num < 1) || (num > lastNum + 1))
1135 { 1135 {
1136 bb_error_msg("Inserting at bad line number"); 1136 bb_error_msg("inserting at bad line number");
1137 1137
1138 return FALSE; 1138 return FALSE;
1139 } 1139 }
@@ -1142,7 +1142,7 @@ static int insertLine(int num, const char * data, int len)
1142 1142
1143 if (newLp == NULL) 1143 if (newLp == NULL)
1144 { 1144 {
1145 bb_error_msg("Failed to allocate memory for line"); 1145 bb_error_msg("failed to allocate memory for line");
1146 1146
1147 return FALSE; 1147 return FALSE;
1148 } 1148 }
@@ -1186,7 +1186,7 @@ static int deleteLines(int num1, int num2)
1186 1186
1187 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) 1187 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2))
1188 { 1188 {
1189 bb_error_msg("Bad line numbers for delete"); 1189 bb_error_msg("bad line numbers for delete");
1190 1190
1191 return FALSE; 1191 return FALSE;
1192 } 1192 }
@@ -1246,7 +1246,7 @@ static int searchLines(const char *str, int num1, int num2)
1246 1246
1247 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) 1247 if ((num1 < 1) || (num2 > lastNum) || (num1 > num2))
1248 { 1248 {
1249 bb_error_msg("Bad line numbers for search"); 1249 bb_error_msg("bad line numbers for search");
1250 1250
1251 return 0; 1251 return 0;
1252 } 1252 }
@@ -1255,7 +1255,7 @@ static int searchLines(const char *str, int num1, int num2)
1255 { 1255 {
1256 if (searchString[0] == '\0') 1256 if (searchString[0] == '\0')
1257 { 1257 {
1258 bb_error_msg("No previous search string"); 1258 bb_error_msg("no previous search string");
1259 1259
1260 return 0; 1260 return 0;
1261 } 1261 }
@@ -1282,7 +1282,7 @@ static int searchLines(const char *str, int num1, int num2)
1282 lp = lp->next; 1282 lp = lp->next;
1283 } 1283 }
1284 1284
1285 bb_error_msg("Cannot find string \"%s\"", str); 1285 bb_error_msg("cannot find string \"%s\"", str);
1286 1286
1287 return 0; 1287 return 0;
1288} 1288}
@@ -1298,7 +1298,7 @@ static LINE *findLine(int num)
1298 1298
1299 if ((num < 1) || (num > lastNum)) 1299 if ((num < 1) || (num > lastNum))
1300 { 1300 {
1301 bb_error_msg("Line number %d does not exist", num); 1301 bb_error_msg("line number %d does not exist", num);
1302 1302
1303 return NULL; 1303 return NULL;
1304 } 1304 }
diff --git a/editors/sed.c b/editors/sed.c
index 65ca5606b..a16023945 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -610,7 +610,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line)
610 if (sed_cmd->sub_match == NULL) { 610 if (sed_cmd->sub_match == NULL) {
611 current_regex = bbg.previous_regex_ptr; 611 current_regex = bbg.previous_regex_ptr;
612 if (!current_regex) 612 if (!current_regex)
613 bb_error_msg_and_die("No previous regexp."); 613 bb_error_msg_and_die("no previous regexp");
614 } else 614 } else
615 bbg.previous_regex_ptr = current_regex = sed_cmd->sub_match; 615 bbg.previous_regex_ptr = current_regex = sed_cmd->sub_match;
616 616
diff --git a/libbb/dump.c b/libbb/dump.c
index d76cbc0b7..8be29efad 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -153,7 +153,7 @@ static void rewrite(FS * fs)
153 } 153 }
154 /* Unlike the original, output the remainder of the format string. */ 154 /* Unlike the original, output the remainder of the format string. */
155 if (!*byte_count_str) { 155 if (!*byte_count_str) {
156 bb_error_msg_and_die("bad byte count for conversion character %s.", p1); 156 bb_error_msg_and_die("bad byte count for conversion character %s", p1);
157 } 157 }
158 pr->bcnt = *byte_count_str; 158 pr->bcnt = *byte_count_str;
159 } else if (*p1 == 'l') { 159 } else if (*p1 == 'l') {
@@ -186,7 +186,7 @@ static void rewrite(FS * fs)
186 } else if (sokay == USEPREC) { 186 } else if (sokay == USEPREC) {
187 pr->bcnt = prec; 187 pr->bcnt = prec;
188 } else { /* NOTOKAY */ 188 } else { /* NOTOKAY */
189 bb_error_msg_and_die("%%s requires a precision or a byte count."); 189 bb_error_msg_and_die("%%s requires a precision or a byte count");
190 } 190 }
191 } else if (*p1 == '_') { 191 } else if (*p1 == '_') {
192 ++p2; 192 ++p2;
@@ -220,7 +220,7 @@ static void rewrite(FS * fs)
220 } 220 }
221 } else { 221 } else {
222 DO_BAD_CONV_CHAR: 222 DO_BAD_CONV_CHAR:
223 bb_error_msg_and_die("bad conversion character %%%s.", p1); 223 bb_error_msg_and_die("bad conversion character %%%s", p1);
224 } 224 }
225 225
226 /* 226 /*
@@ -253,7 +253,7 @@ static void rewrite(FS * fs)
253 253
254 /* only one conversion character if byte count */ 254 /* only one conversion character if byte count */
255 if (!(pr->flags & F_ADDRESS) && fu->bcnt && nconv++) { 255 if (!(pr->flags & F_ADDRESS) && fu->bcnt && nconv++) {
256 bb_error_msg_and_die("byte count with multiple conversion characters."); 256 bb_error_msg_and_die("byte count with multiple conversion characters");
257 } 257 }
258 } 258 }
259 /* 259 /*
diff --git a/miscutils/mt.c b/miscutils/mt.c
index a2bb6be91..f4a0e994c 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -78,7 +78,7 @@ int mt_main(int argc, char **argv)
78 } 78 }
79 79
80 if (code->name == 0) { 80 if (code->name == 0) {
81 bb_error_msg("unrecognized opcode %s.", argv[1]); 81 bb_error_msg("unrecognized opcode %s", argv[1]);
82 return EXIT_FAILURE; 82 return EXIT_FAILURE;
83 } 83 }
84 84
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 5d62ae5df..08f383c82 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -725,7 +725,7 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
725 } 725 }
726 726
727 if( !dt ) { 727 if( !dt ) {
728 bb_error_msg ("module %s not found.", mod); 728 bb_error_msg ("module %s not found", mod);
729 return; 729 return;
730 } 730 }
731 731
@@ -749,7 +749,7 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
749 dt = adt; 749 dt = adt;
750 } 750 }
751 else { 751 else {
752 bb_error_msg ("module %s not found.", mod); 752 bb_error_msg ("module %s not found", mod);
753 return; 753 return;
754 } 754 }
755 } 755 }
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index a595e967f..ec52cff73 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -36,7 +36,7 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
36 36
37 rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); 37 rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
38 if (rth->fd < 0) { 38 if (rth->fd < 0) {
39 bb_perror_msg("Cannot open netlink socket"); 39 bb_perror_msg("cannot open netlink socket");
40 return -1; 40 return -1;
41 } 41 }
42 42
@@ -45,20 +45,20 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
45 rth->local.nl_groups = subscriptions; 45 rth->local.nl_groups = subscriptions;
46 46
47 if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) { 47 if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
48 bb_perror_msg("Cannot bind netlink socket"); 48 bb_perror_msg("cannot bind netlink socket");
49 return -1; 49 return -1;
50 } 50 }
51 addr_len = sizeof(rth->local); 51 addr_len = sizeof(rth->local);
52 if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) { 52 if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
53 bb_perror_msg("Cannot getsockname"); 53 bb_perror_msg("cannot getsockname");
54 return -1; 54 return -1;
55 } 55 }
56 if (addr_len != sizeof(rth->local)) { 56 if (addr_len != sizeof(rth->local)) {
57 bb_error_msg("Wrong address length %d", addr_len); 57 bb_error_msg("wrong address length %d", addr_len);
58 return -1; 58 return -1;
59 } 59 }
60 if (rth->local.nl_family != AF_NETLINK) { 60 if (rth->local.nl_family != AF_NETLINK) {
61 bb_error_msg("Wrong address family %d", rth->local.nl_family); 61 bb_error_msg("wrong address family %d", rth->local.nl_family);
62 return -1; 62 return -1;
63 } 63 }
64 rth->seq = time(NULL); 64 rth->seq = time(NULL);
@@ -195,11 +195,11 @@ skip_it:
195 h = NLMSG_NEXT(h, status); 195 h = NLMSG_NEXT(h, status);
196 } 196 }
197 if (msg.msg_flags & MSG_TRUNC) { 197 if (msg.msg_flags & MSG_TRUNC) {
198 bb_error_msg("Message truncated"); 198 bb_error_msg("message truncated");
199 continue; 199 continue;
200 } 200 }
201 if (status) { 201 if (status) {
202 bb_error_msg_and_die("!!!Remnant of size %d", status); 202 bb_error_msg_and_die("remnant of size %d!", status);
203 } 203 }
204 } 204 }
205} 205}
@@ -234,7 +234,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
234 status = sendmsg(rtnl->fd, &msg, 0); 234 status = sendmsg(rtnl->fd, &msg, 0);
235 235
236 if (status < 0) { 236 if (status < 0) {
237 bb_perror_msg("Cannot talk to rtnetlink"); 237 bb_perror_msg("cannot talk to rtnetlink");
238 return -1; 238 return -1;
239 } 239 }
240 240
@@ -265,10 +265,10 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
265 265
266 if (l<0 || len>status) { 266 if (l<0 || len>status) {
267 if (msg.msg_flags & MSG_TRUNC) { 267 if (msg.msg_flags & MSG_TRUNC) {
268 bb_error_msg("Truncated message"); 268 bb_error_msg("truncated message");
269 return -1; 269 return -1;
270 } 270 }
271 bb_error_msg_and_die("!!!malformed message: len=%d", len); 271 bb_error_msg_and_die("malformed message: len=%d!", len);
272 } 272 }
273 273
274 if (nladdr.nl_pid != peer || 274 if (nladdr.nl_pid != peer ||
@@ -304,17 +304,17 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
304 return 0; 304 return 0;
305 } 305 }
306 306
307 bb_error_msg("Unexpected reply!!!"); 307 bb_error_msg("unexpected reply!");
308 308
309 status -= NLMSG_ALIGN(len); 309 status -= NLMSG_ALIGN(len);
310 h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); 310 h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
311 } 311 }
312 if (msg.msg_flags & MSG_TRUNC) { 312 if (msg.msg_flags & MSG_TRUNC) {
313 bb_error_msg("Message truncated"); 313 bb_error_msg("message truncated");
314 continue; 314 continue;
315 } 315 }
316 if (status) { 316 if (status) {
317 bb_error_msg_and_die("!!!Remnant of size %d", status); 317 bb_error_msg_and_die("remnant of size %d!", status);
318 } 318 }
319 } 319 }
320} 320}
@@ -390,7 +390,7 @@ int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
390 rta = RTA_NEXT(rta,len); 390 rta = RTA_NEXT(rta,len);
391 } 391 }
392 if (len) { 392 if (len) {
393 bb_error_msg("!!!Deficit %d, rta_len=%d", len, rta->rta_len); 393 bb_error_msg("deficit %d, rta_len=%d!", len, rta->rta_len);
394 } 394 }
395 return 0; 395 return 0;
396} 396}
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index 6c147deca..ba0a65a18 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -48,7 +48,7 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
48 if (strchr(arg, '.')) { 48 if (strchr(arg, '.')) {
49 inet_prefix pfx; 49 inet_prefix pfx;
50 if (get_addr_1(&pfx, arg, AF_INET)) { 50 if (get_addr_1(&pfx, arg, AF_INET)) {
51 bb_error_msg("\"%s\" is invalid lladdr.", arg); 51 bb_error_msg("\"%s\" is invalid lladdr", arg);
52 return -1; 52 return -1;
53 } 53 }
54 if (len < 4) { 54 if (len < 4) {
@@ -67,11 +67,11 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
67 cp++; 67 cp++;
68 } 68 }
69 if (sscanf(arg, "%x", &temp) != 1) { 69 if (sscanf(arg, "%x", &temp) != 1) {
70 bb_error_msg("\"%s\" is invalid lladdr.", arg); 70 bb_error_msg("\"%s\" is invalid lladdr", arg);
71 return -1; 71 return -1;
72 } 72 }
73 if (temp < 0 || temp > 255) { 73 if (temp < 0 || temp > 255) {
74 bb_error_msg("\"%s\" is invalid lladdr.", arg); 74 bb_error_msg("\"%s\" is invalid lladdr", arg);
75 return -1; 75 return -1;
76 } 76 }
77 lladdr[i] = temp; 77 lladdr[i] = temp;
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 6e4bf6418..adfd4d698 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -287,7 +287,7 @@ read_line(void)
287 line_ptr = line_buffer; 287 line_ptr = line_buffer;
288 if (!fgets(line_buffer, LINE_LENGTH, stdin)) { 288 if (!fgets(line_buffer, LINE_LENGTH, stdin)) {
289 /* error or eof */ 289 /* error or eof */
290 bb_error_msg_and_die("\ngot EOF - exiting..."); 290 bb_error_msg_and_die("\ngot EOF, exiting");
291 } 291 }
292 while (*line_ptr && !isgraph(*line_ptr)) 292 while (*line_ptr && !isgraph(*line_ptr))
293 line_ptr++; 293 line_ptr++;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 10:53:50 +0000