summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2001-01-31 19:00:21 +0000
committerMatt Kraai <kraai@debian.org>2001-01-31 19:00:21 +0000
commitdd19c6990496023fe23fefef8f1798740f7d39c6 (patch)
tree3933adefa4171173db78fa2389146ac89f4edb86 /coreutils
parent63ec2732454a0c973305794e185e488106f6b282 (diff)
downloadbusybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.gz
busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.bz2
busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.zip
Removed trailing \n from error_msg{,_and_die} messages.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cut.c16
-rw-r--r--coreutils/dd.c2
-rw-r--r--coreutils/df.c2
-rw-r--r--coreutils/expr.c20
-rw-r--r--coreutils/id.c2
-rw-r--r--coreutils/logname.c2
-rw-r--r--coreutils/md5sum.c26
-rw-r--r--coreutils/mkdir.c4
-rw-r--r--coreutils/test.c10
-rw-r--r--coreutils/tr.c2
-rw-r--r--coreutils/uudecode.c20
-rw-r--r--coreutils/uuencode.c4
-rw-r--r--coreutils/whoami.c2
13 files changed, 56 insertions, 56 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c
index ed68657df..7e9a72e3f 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -54,12 +54,12 @@ static void decompose_list(const char *list)
54 /* the list must contain only digits and no more than one minus sign */ 54 /* the list must contain only digits and no more than one minus sign */
55 for (ptr = (char *)list; *ptr; ptr++) { 55 for (ptr = (char *)list; *ptr; ptr++) {
56 if (!isdigit(*ptr) && *ptr != '-') { 56 if (!isdigit(*ptr) && *ptr != '-') {
57 error_msg_and_die("invalid byte or field list\n"); 57 error_msg_and_die("invalid byte or field list");
58 } 58 }
59 if (*ptr == '-') { 59 if (*ptr == '-') {
60 nminus++; 60 nminus++;
61 if (nminus > 1) { 61 if (nminus > 1) {
62 error_msg_and_die("invalid byte or field list\n"); 62 error_msg_and_die("invalid byte or field list");
63 } 63 }
64 } 64 }
65 } 65 }
@@ -68,7 +68,7 @@ static void decompose_list(const char *list)
68 if (nminus == 0) { 68 if (nminus == 0) {
69 startpos = strtol(list, &ptr, 10); 69 startpos = strtol(list, &ptr, 10);
70 if (startpos == 0) { 70 if (startpos == 0) {
71 error_msg_and_die("missing list of fields\n"); 71 error_msg_and_die("missing list of fields");
72 } 72 }
73 endpos = startpos; 73 endpos = startpos;
74 } 74 }
@@ -188,14 +188,14 @@ extern int cut_main(int argc, char **argv)
188 case 'f': 188 case 'f':
189 /* make sure they didn't ask for two types of lists */ 189 /* make sure they didn't ask for two types of lists */
190 if (part != 0) { 190 if (part != 0) {
191 error_msg_and_die("only one type of list may be specified\n"); 191 error_msg_and_die("only one type of list may be specified");
192 } 192 }
193 part = (char)opt; 193 part = (char)opt;
194 decompose_list(optarg); 194 decompose_list(optarg);
195 break; 195 break;
196 case 'd': 196 case 'd':
197 if (strlen(optarg) > 1) { 197 if (strlen(optarg) > 1) {
198 error_msg_and_die("the delimiter must be a single character\n"); 198 error_msg_and_die("the delimiter must be a single character");
199 } 199 }
200 delim = optarg[0]; 200 delim = optarg[0];
201 break; 201 break;
@@ -209,17 +209,17 @@ extern int cut_main(int argc, char **argv)
209 } 209 }
210 210
211 if (part == 0) { 211 if (part == 0) {
212 error_msg_and_die("you must specify a list of bytes, characters, or fields\n"); 212 error_msg_and_die("you must specify a list of bytes, characters, or fields");
213 } 213 }
214 214
215 if (supress_non_delimited_lines && part != 'f') { 215 if (supress_non_delimited_lines && part != 'f') {
216 error_msg_and_die("suppressing non-delimited lines makes sense" 216 error_msg_and_die("suppressing non-delimited lines makes sense"
217 " only when operating on fields\n"); 217 " only when operating on fields");
218 218
219 } 219 }
220 220
221 if (delim != '\t' && part != 'f') { 221 if (delim != '\t' && part != 'f') {
222 error_msg_and_die("a delimiter may be specified only when operating on fields\n"); 222 error_msg_and_die("a delimiter may be specified only when operating on fields");
223 } 223 }
224 224
225 /* argv[(optind)..(argc-1)] should be names of file to process. If no 225 /* argv[(optind)..(argc-1)] should be names of file to process. If no
diff --git a/coreutils/dd.c b/coreutils/dd.c
index dac9ccdf3..582310681 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -76,7 +76,7 @@ int dd_main(int argc, char **argv)
76 sync = TRUE; 76 sync = TRUE;
77 buf += 4; 77 buf += 4;
78 } else { 78 } else {
79 error_msg_and_die("invalid conversion `%s'\n", argv[i]+5); 79 error_msg_and_die("invalid conversion `%s'", argv[i]+5);
80 } 80 }
81 if (buf[0] == '\0') 81 if (buf[0] == '\0')
82 break; 82 break;
diff --git a/coreutils/df.c b/coreutils/df.c
index 7a24fedd0..55919793c 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -118,7 +118,7 @@ extern int df_main(int argc, char **argv)
118 for(i = optind; i < argc; i++) 118 for(i = optind; i < argc; i++)
119 { 119 {
120 if ((mountEntry = find_mount_point(argv[i], mtab_file)) == 0) { 120 if ((mountEntry = find_mount_point(argv[i], mtab_file)) == 0) {
121 error_msg("%s: can't find mount point.\n", argv[i]); 121 error_msg("%s: can't find mount point.", argv[i]);
122 status = EXIT_FAILURE; 122 status = EXIT_FAILURE;
123 } else if (!df(mountEntry->mnt_fsname, mountEntry->mnt_dir)) 123 } else if (!df(mountEntry->mnt_fsname, mountEntry->mnt_dir))
124 status = EXIT_FAILURE; 124 status = EXIT_FAILURE;
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 71bd22417..8ef5293c1 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -76,14 +76,14 @@ int expr_main (int argc, char **argv)
76 VALUE *v; 76 VALUE *v;
77 77
78 if (argc == 1) { 78 if (argc == 1) {
79 error_msg_and_die("too few arguments\n"); 79 error_msg_and_die("too few arguments");
80 } 80 }
81 81
82 args = argv + 1; 82 args = argv + 1;
83 83
84 v = eval (); 84 v = eval ();
85 if (*args) 85 if (*args)
86 error_msg_and_die ("syntax error\n"); 86 error_msg_and_die ("syntax error");
87 87
88 if (v->type == integer) 88 if (v->type == integer)
89 printf ("%d\n", v->u.i); 89 printf ("%d\n", v->u.i);
@@ -218,7 +218,7 @@ static \
218int name (l, r) VALUE *l; VALUE *r; \ 218int name (l, r) VALUE *l; VALUE *r; \
219{ \ 219{ \
220 if (!toarith (l) || !toarith (r)) \ 220 if (!toarith (l) || !toarith (r)) \
221 error_msg_and_die ("non-numeric argument\n"); \ 221 error_msg_and_die ("non-numeric argument"); \
222 return l->u.i op r->u.i; \ 222 return l->u.i op r->u.i; \
223} 223}
224 224
@@ -226,9 +226,9 @@ int name (l, r) VALUE *l; VALUE *r; \
226int name (l, r) VALUE *l; VALUE *r; \ 226int name (l, r) VALUE *l; VALUE *r; \
227{ \ 227{ \
228 if (!toarith (l) || !toarith (r)) \ 228 if (!toarith (l) || !toarith (r)) \
229 error_msg_and_die ( "non-numeric argument\n"); \ 229 error_msg_and_die ( "non-numeric argument"); \
230 if (r->u.i == 0) \ 230 if (r->u.i == 0) \
231 error_msg_and_die ( "division by zero\n"); \ 231 error_msg_and_die ( "division by zero"); \
232 return l->u.i op r->u.i; \ 232 return l->u.i op r->u.i; \
233} 233}
234 234
@@ -272,7 +272,7 @@ of a basic regular expression is not portable; it is being ignored",
272 re_syntax_options = RE_SYNTAX_POSIX_BASIC; 272 re_syntax_options = RE_SYNTAX_POSIX_BASIC;
273 errmsg = re_compile_pattern (pv->u.s, len, &re_buffer); 273 errmsg = re_compile_pattern (pv->u.s, len, &re_buffer);
274 if (errmsg) { 274 if (errmsg) {
275 error_msg_and_die("%s\n", errmsg); 275 error_msg_and_die("%s", errmsg);
276 } 276 }
277 277
278 len = re_match (&re_buffer, sv->u.s, strlen (sv->u.s), 0, &re_regs); 278 len = re_match (&re_buffer, sv->u.s, strlen (sv->u.s), 0, &re_regs);
@@ -303,19 +303,19 @@ static VALUE *eval7 (void)
303 VALUE *v; 303 VALUE *v;
304 304
305 if (!*args) 305 if (!*args)
306 error_msg_and_die ( "syntax error\n"); 306 error_msg_and_die ( "syntax error");
307 307
308 if (nextarg ("(")) { 308 if (nextarg ("(")) {
309 args++; 309 args++;
310 v = eval (); 310 v = eval ();
311 if (!nextarg (")")) 311 if (!nextarg (")"))
312 error_msg_and_die ( "syntax error\n"); 312 error_msg_and_die ( "syntax error");
313 args++; 313 args++;
314 return v; 314 return v;
315 } 315 }
316 316
317 if (nextarg (")")) 317 if (nextarg (")"))
318 error_msg_and_die ( "syntax error\n"); 318 error_msg_and_die ( "syntax error");
319 319
320 return str_value (*args++); 320 return str_value (*args++);
321} 321}
@@ -329,7 +329,7 @@ static VALUE *eval6 (void)
329 if (nextarg ("quote")) { 329 if (nextarg ("quote")) {
330 args++; 330 args++;
331 if (!*args) 331 if (!*args)
332 error_msg_and_die ( "syntax error\n"); 332 error_msg_and_die ( "syntax error");
333 return str_value (*args++); 333 return str_value (*args++);
334 } 334 }
335 else if (nextarg ("length")) { 335 else if (nextarg ("length")) {
diff --git a/coreutils/id.c b/coreutils/id.c
index e91ac7585..650e3db20 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -77,7 +77,7 @@ extern int id_main(int argc, char **argv)
77 pwnam=my_getpwnam(user); 77 pwnam=my_getpwnam(user);
78 grnam=my_getgrnam(group); 78 grnam=my_getgrnam(group);
79 if (gid == -1 || pwnam==-1 || grnam==-1) { 79 if (gid == -1 || pwnam==-1 || grnam==-1) {
80 error_msg_and_die("%s: No such user\n", user); 80 error_msg_and_die("%s: No such user", user);
81 } 81 }
82 82
83 if (no_group) { 83 if (no_group) {
diff --git a/coreutils/logname.c b/coreutils/logname.c
index edec016e6..d9056c69d 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -37,5 +37,5 @@ extern int logname_main(int argc, char **argv)
37 puts(user); 37 puts(user);
38 return EXIT_SUCCESS; 38 return EXIT_SUCCESS;
39 } 39 }
40 error_msg_and_die("no login name\n"); 40 error_msg_and_die("no login name");
41} 41}
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c
index ad4078040..97a940059 100644
--- a/coreutils/md5sum.c
+++ b/coreutils/md5sum.c
@@ -719,7 +719,7 @@ static int md5_check(const char *checkfile_name)
719 if (split_3(line, line_length, &md5num, &binary, &filename) 719 if (split_3(line, line_length, &md5num, &binary, &filename)
720 || !hex_digits(md5num)) { 720 || !hex_digits(md5num)) {
721 if (warn) { 721 if (warn) {
722 error_msg("%s: %lu: improperly formatted MD5 checksum line\n", 722 error_msg("%s: %lu: improperly formatted MD5 checksum line",
723 checkfile_name, (unsigned long) line_number); 723 checkfile_name, (unsigned long) line_number);
724 } 724 }
725 } else { 725 } else {
@@ -764,7 +764,7 @@ static int md5_check(const char *checkfile_name)
764 while (!feof(checkfile_stream) && !ferror(checkfile_stream)); 764 while (!feof(checkfile_stream) && !ferror(checkfile_stream));
765 765
766 if (ferror(checkfile_stream)) { 766 if (ferror(checkfile_stream)) {
767 error_msg("%s: read error\n", checkfile_name); /* */ 767 error_msg("%s: read error", checkfile_name);
768 return FALSE; 768 return FALSE;
769 } 769 }
770 770
@@ -775,7 +775,7 @@ static int md5_check(const char *checkfile_name)
775 775
776 if (n_properly_formated_lines == 0) { 776 if (n_properly_formated_lines == 0) {
777 /* Warn if no tests are found. */ 777 /* Warn if no tests are found. */
778 error_msg("%s: no properly formatted MD5 checksum lines found\n", 778 error_msg("%s: no properly formatted MD5 checksum lines found",
779 checkfile_name); 779 checkfile_name);
780 return FALSE; 780 return FALSE;
781 } else { 781 } else {
@@ -784,13 +784,13 @@ static int md5_check(const char *checkfile_name)
784 - n_open_or_read_failures); 784 - n_open_or_read_failures);
785 785
786 if (n_open_or_read_failures > 0) { 786 if (n_open_or_read_failures > 0) {
787 error_msg("WARNING: %d of %d listed files could not be read\n", 787 error_msg("WARNING: %d of %d listed files could not be read",
788 n_open_or_read_failures, n_properly_formated_lines); 788 n_open_or_read_failures, n_properly_formated_lines);
789 return FALSE; 789 return FALSE;
790 } 790 }
791 791
792 if (n_mismatched_checksums > 0) { 792 if (n_mismatched_checksums > 0) {
793 error_msg("WARNING: %d of %d computed checksums did NOT match\n", 793 error_msg("WARNING: %d of %d computed checksums did NOT match",
794 n_mismatched_checksums, n_computed_checkums); 794 n_mismatched_checksums, n_computed_checkums);
795 return FALSE; 795 return FALSE;
796 } 796 }
@@ -855,26 +855,26 @@ int md5sum_main(int argc,
855 } 855 }
856 856
857 if (file_type_specified && do_check) { 857 if (file_type_specified && do_check) {
858 error_msg_and_die("the -b and -t options are meaningless when verifying checksums\n"); 858 error_msg_and_die("the -b and -t options are meaningless when verifying checksums");
859 } 859 }
860 860
861 if (n_strings > 0 && do_check) { 861 if (n_strings > 0 && do_check) {
862 error_msg_and_die("the -g and -c options are mutually exclusive\n"); 862 error_msg_and_die("the -g and -c options are mutually exclusive");
863 } 863 }
864 864
865 if (status_only && !do_check) { 865 if (status_only && !do_check) {
866 error_msg_and_die("the -s option is meaningful only when verifying checksums\n"); 866 error_msg_and_die("the -s option is meaningful only when verifying checksums");
867 } 867 }
868 868
869 if (warn && !do_check) { 869 if (warn && !do_check) {
870 error_msg_and_die("the -w option is meaningful only when verifying checksums\n"); 870 error_msg_and_die("the -w option is meaningful only when verifying checksums");
871 } 871 }
872 872
873 if (n_strings > 0) { 873 if (n_strings > 0) {
874 size_t i; 874 size_t i;
875 875
876 if (optind < argc) { 876 if (optind < argc) {
877 error_msg_and_die("no files may be specified when using -g\n"); 877 error_msg_and_die("no files may be specified when using -g");
878 } 878 }
879 for (i = 0; i < n_strings; ++i) { 879 for (i = 0; i < n_strings; ++i) {
880 size_t cnt; 880 size_t cnt;
@@ -887,7 +887,7 @@ int md5sum_main(int argc,
887 } 887 }
888 } else if (do_check) { 888 } else if (do_check) {
889 if (optind + 1 < argc) { 889 if (optind + 1 < argc) {
890 error_msg("only one argument may be specified when using -c\n"); 890 error_msg("only one argument may be specified when using -c");
891 } 891 }
892 892
893 err = md5_check ((optind == argc) ? "-" : argv[optind]); 893 err = md5_check ((optind == argc) ? "-" : argv[optind]);
@@ -940,11 +940,11 @@ int md5sum_main(int argc,
940 } 940 }
941 941
942 if (fclose (stdout) == EOF) { 942 if (fclose (stdout) == EOF) {
943 error_msg_and_die("write error\n"); 943 error_msg_and_die("write error");
944 } 944 }
945 945
946 if (have_read_stdin && fclose (stdin) == EOF) { 946 if (have_read_stdin && fclose (stdin) == EOF) {
947 error_msg_and_die("standard input\n"); 947 error_msg_and_die("standard input");
948 } 948 }
949 949
950 if (err == 0) 950 if (err == 0)
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 07b18713a..299f29806 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -52,7 +52,7 @@ extern int mkdir_main(int argc, char **argv)
52 /* Find the specified modes */ 52 /* Find the specified modes */
53 mode = 0; 53 mode = 0;
54 if (parse_mode(*(++argv), &mode) == FALSE) { 54 if (parse_mode(*(++argv), &mode) == FALSE) {
55 error_msg_and_die("Unknown mode: %s\n", *argv); 55 error_msg_and_die("Unknown mode: %s", *argv);
56 } 56 }
57 /* Set the umask for this process so it doesn't 57 /* Set the umask for this process so it doesn't
58 * screw up whatever the user just entered. */ 58 * screw up whatever the user just entered. */
@@ -85,7 +85,7 @@ extern int mkdir_main(int argc, char **argv)
85 strcpy(buf, *argv); 85 strcpy(buf, *argv);
86 status = stat(buf, &statBuf); 86 status = stat(buf, &statBuf);
87 if (parentFlag == FALSE && status != -1 && errno != ENOENT) { 87 if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
88 error_msg_and_die("%s: File exists\n", buf); 88 error_msg_and_die("%s: File exists", buf);
89 } 89 }
90 if (parentFlag == TRUE) { 90 if (parentFlag == TRUE) {
91 strcat(buf, "/"); 91 strcat(buf, "/");
diff --git a/coreutils/test.c b/coreutils/test.c
index ba6feb033..6439e3a8a 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -184,7 +184,7 @@ test_main(int argc, char** argv)
184 184
185 if (strcmp(applet_name, "[") == 0) { 185 if (strcmp(applet_name, "[") == 0) {
186 if (strcmp(argv[--argc], "]")) 186 if (strcmp(argv[--argc], "]"))
187 error_msg_and_die("missing ]\n"); 187 error_msg_and_die("missing ]");
188 argv[argc] = NULL; 188 argv[argc] = NULL;
189 } 189 }
190 /* Implement special cases from POSIX.2, section 4.62.4 */ 190 /* Implement special cases from POSIX.2, section 4.62.4 */
@@ -233,9 +233,9 @@ syntax(op, msg)
233 char *msg; 233 char *msg;
234{ 234{
235 if (op && *op) 235 if (op && *op)
236 error_msg_and_die("%s: %s\n", op, msg); 236 error_msg_and_die("%s: %s", op, msg);
237 else 237 else
238 error_msg_and_die("%s\n", msg); 238 error_msg_and_die("%s", msg);
239} 239}
240 240
241static int 241static int
@@ -470,13 +470,13 @@ getn(s)
470 r = strtol(s, &p, 10); 470 r = strtol(s, &p, 10);
471 471
472 if (errno != 0) 472 if (errno != 0)
473 error_msg_and_die("%s: out of range\n", s); 473 error_msg_and_die("%s: out of range", s);
474 474
475 while (isspace(*p)) 475 while (isspace(*p))
476 p++; 476 p++;
477 477
478 if (*p) 478 if (*p)
479 error_msg_and_die("%s: bad number\n", s); 479 error_msg_and_die("%s: bad number", s);
480 480
481 return (int) r; 481 return (int) r;
482} 482}
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 2717a92db..36f29de44 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -186,7 +186,7 @@ extern int tr_main(int argc, char **argv)
186 input_length = complement(input, input_length); 186 input_length = complement(input, input_length);
187 if (argv[index] != NULL) { 187 if (argv[index] != NULL) {
188 if (*argv[index] == '\0') 188 if (*argv[index] == '\0')
189 error_msg_and_die("STRING2 cannot be empty\n"); 189 error_msg_and_die("STRING2 cannot be empty");
190 output_length = expand(argv[index], output); 190 output_length = expand(argv[index], output);
191 map(input, input_length, output, output_length); 191 map(input, input_length, output, output_length);
192 } 192 }
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index fcfcfd903..cccc52872 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -46,7 +46,7 @@ static int read_stduu (const char *inname)
46 char *p; 46 char *p;
47 47
48 if (fgets (buf, sizeof(buf), stdin) == NULL) { 48 if (fgets (buf, sizeof(buf), stdin) == NULL) {
49 error_msg("%s: Short file\n", inname); 49 error_msg("%s: Short file", inname);
50 return FALSE; 50 return FALSE;
51 } 51 }
52 p = buf; 52 p = buf;
@@ -81,7 +81,7 @@ static int read_stduu (const char *inname)
81 81
82 if (fgets (buf, sizeof(buf), stdin) == NULL 82 if (fgets (buf, sizeof(buf), stdin) == NULL
83 || strcmp (buf, "end\n")) { 83 || strcmp (buf, "end\n")) {
84 error_msg("%s: No `end' line\n", inname); 84 error_msg("%s: No `end' line", inname);
85 return FALSE; 85 return FALSE;
86 } 86 }
87 87
@@ -131,7 +131,7 @@ static int read_base64 (const char *inname)
131 unsigned char *p; 131 unsigned char *p;
132 132
133 if (fgets (buf, sizeof(buf), stdin) == NULL) { 133 if (fgets (buf, sizeof(buf), stdin) == NULL) {
134 error_msg("%s: Short file\n", inname); 134 error_msg("%s: Short file", inname);
135 return FALSE; 135 return FALSE;
136 } 136 }
137 p = buf; 137 p = buf;
@@ -139,7 +139,7 @@ static int read_base64 (const char *inname)
139 if (memcmp (buf, "====", 4) == 0) 139 if (memcmp (buf, "====", 4) == 0)
140 break; 140 break;
141 if (last_data != 0) { 141 if (last_data != 0) {
142 error_msg("%s: data following `=' padding character\n", inname); 142 error_msg("%s: data following `=' padding character", inname);
143 return FALSE; 143 return FALSE;
144 } 144 }
145 145
@@ -161,14 +161,14 @@ static int read_base64 (const char *inname)
161 161
162 while ((b64_tab[*p] & '\100') != 0) 162 while ((b64_tab[*p] & '\100') != 0)
163 if (*p == '\n' || *p++ == '=') { 163 if (*p == '\n' || *p++ == '=') {
164 error_msg("%s: illegal line\n", inname); 164 error_msg("%s: illegal line", inname);
165 return FALSE; 165 return FALSE;
166 } 166 }
167 c2 = b64_tab[*p++]; 167 c2 = b64_tab[*p++];
168 168
169 while (b64_tab[*p] == '\177') 169 while (b64_tab[*p] == '\177')
170 if (*p++ == '\n') { 170 if (*p++ == '\n') {
171 error_msg("%s: illegal line\n", inname); 171 error_msg("%s: illegal line", inname);
172 return FALSE; 172 return FALSE;
173 } 173 }
174 if (*p == '=') { 174 if (*p == '=') {
@@ -180,7 +180,7 @@ static int read_base64 (const char *inname)
180 180
181 while (b64_tab[*p] == '\177') 181 while (b64_tab[*p] == '\177')
182 if (*p++ == '\n') { 182 if (*p++ == '\n') {
183 error_msg("%s: illegal line\n", inname); 183 error_msg("%s: illegal line", inname);
184 return FALSE; 184 return FALSE;
185 } 185 }
186 putchar (c1 << 2 | c2 >> 4); 186 putchar (c1 << 2 | c2 >> 4);
@@ -212,7 +212,7 @@ static int decode (const char *inname,
212 212
213 while (1) { 213 while (1) {
214 if (fgets (buf, sizeof (buf), stdin) == NULL) { 214 if (fgets (buf, sizeof (buf), stdin) == NULL) {
215 error_msg("%s: No `begin' line\n", inname); 215 error_msg("%s: No `begin' line", inname);
216 return FALSE; 216 return FALSE;
217 } 217 }
218 218
@@ -237,13 +237,13 @@ static int decode (const char *inname,
237 while (*p != '/') 237 while (*p != '/')
238 ++p; 238 ++p;
239 if (*p == '\0') { 239 if (*p == '\0') {
240 error_msg("%s: Illegal ~user\n", inname); 240 error_msg("%s: Illegal ~user", inname);
241 return FALSE; 241 return FALSE;
242 } 242 }
243 *p++ = '\0'; 243 *p++ = '\0';
244 pw = getpwnam (buf + 1); 244 pw = getpwnam (buf + 1);
245 if (pw == NULL) { 245 if (pw == NULL) {
246 error_msg("%s: No user `%s'\n", inname, buf + 1); 246 error_msg("%s: No user `%s'", inname, buf + 1);
247 return FALSE; 247 return FALSE;
248 } 248 }
249 n = strlen (pw->pw_dir); 249 n = strlen (pw->pw_dir);
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 5df49026b..73098ba26 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -142,7 +142,7 @@ static void encode()
142 } 142 }
143 143
144 if (ferror (stdin)) 144 if (ferror (stdin))
145 error_msg("Read error\n"); 145 error_msg("Read error");
146 146
147 if (trans_ptr == uu_std) { 147 if (trans_ptr == uu_std) {
148 putchar (ENC ('\0')); 148 putchar (ENC ('\0'));
@@ -196,7 +196,7 @@ int uuencode_main (int argc,
196 encode(); 196 encode();
197 printf(trans_ptr == uu_std ? "end\n" : "====\n"); 197 printf(trans_ptr == uu_std ? "end\n" : "====\n");
198 if (ferror (stdout)) { 198 if (ferror (stdout)) {
199 error_msg("Write error\n"); 199 error_msg("Write error");
200 return EXIT_FAILURE; 200 return EXIT_FAILURE;
201 } 201 }
202 return EXIT_SUCCESS; 202 return EXIT_SUCCESS;
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 870ede43e..398e37315 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -38,5 +38,5 @@ extern int whoami_main(int argc, char **argv)
38 puts(user); 38 puts(user);
39 return EXIT_SUCCESS; 39 return EXIT_SUCCESS;
40 } 40 }
41 error_msg_and_die("cannot find username for UID %u\n", (unsigned) uid); 41 error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
42} 42}