emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing newlines to error messages.

Browse Source
This commit is contained in:
Matt Kraai 2000-12-18 03:08:29 +00:00
parent bfa7967c4a
commit 0dab829977
9 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreutils/cut.c
View File

@ -188,7 +188,7 @@ extern int cut_main(int argc, char **argv)
case 'f': case 'f':
/* make sure they didn't ask for two types of lists */ /* make sure they didn't ask for two types of lists */
if (part != 0) { if (part != 0) {
error_msg_and_die("only one type of list may be specified"); error_msg_and_die("only one type of list may be specified\n");
} }
part = (char)opt; part = (char)opt;
decompose_list(optarg); decompose_list(optarg);
@ -213,8 +213,9 @@ extern int cut_main(int argc, char **argv)
} }
if (supress_non_delimited_lines && part != 'f') { if (supress_non_delimited_lines && part != 'f') {
error_msg_and_die("suppressing non-delimited lines makes sense error_msg_and_die("suppressing non-delimited lines makes sense"
only when operating on fields\n"); " only when operating on fields\n");
} }
if (delim != '\t' && part != 'f') { if (delim != '\t' && part != 'f') {

4
coreutils/touch.c
View File

@ -58,12 +58,12 @@ extern int touch_main(int argc, char **argv)
if (create == FALSE && errno == ENOENT) if (create == FALSE && errno == ENOENT)
return EXIT_SUCCESS; return EXIT_SUCCESS;
else { else {
error_msg_and_die("%s", strerror(errno)); perror_msg_and_die("%s", *argv);
} }
} }
close(fd); close(fd);
if (utime(*argv, NULL)) { if (utime(*argv, NULL)) {
error_msg_and_die("%s", strerror(errno)); perror_msg_and_die("%s", *argv);
} }
argc--; argc--;
argv++; argv++;

7
cut.c
View File

@ -188,7 +188,7 @@ extern int cut_main(int argc, char **argv)
case 'f': case 'f':
/* make sure they didn't ask for two types of lists */ /* make sure they didn't ask for two types of lists */
if (part != 0) { if (part != 0) {
error_msg_and_die("only one type of list may be specified"); error_msg_and_die("only one type of list may be specified\n");
} }
part = (char)opt; part = (char)opt;
decompose_list(optarg); decompose_list(optarg);
@ -213,8 +213,9 @@ extern int cut_main(int argc, char **argv)
} }
if (supress_non_delimited_lines && part != 'f') { if (supress_non_delimited_lines && part != 'f') {
error_msg_and_die("suppressing non-delimited lines makes sense error_msg_and_die("suppressing non-delimited lines makes sense"
only when operating on fields\n"); " only when operating on fields\n");
} }
if (delim != '\t' && part != 'f') { if (delim != '\t' && part != 'f') {

8
lsmod.c
View File

@ -83,7 +83,7 @@ extern int lsmod_main(int argc, char **argv)
module_names = xmalloc(bufsize = 256); module_names = xmalloc(bufsize = 256);
deps = xmalloc(bufsize); deps = xmalloc(bufsize);
if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) { if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) {
error_msg_and_die("QM_MODULES: %s\n", strerror(errno)); perror_msg_and_die("QM_MODULES");
} }
printf("Module Size Used by\n"); printf("Module Size Used by\n");
@ -94,7 +94,7 @@ extern int lsmod_main(int argc, char **argv)
continue; continue;
} }
/* else choke */ /* else choke */
error_msg_and_die("module %s: QM_INFO: %s\n", mn, strerror(errno)); perror_msg_and_die("module %s: QM_INFO", mn);
} }
while (query_module(mn, QM_REFS, deps, bufsize, &count)) { while (query_module(mn, QM_REFS, deps, bufsize, &count)) {
if (errno == ENOENT) { if (errno == ENOENT) {
@ -102,7 +102,7 @@ extern int lsmod_main(int argc, char **argv)
continue; continue;
} }
if (errno != ENOSPC) { if (errno != ENOSPC) {
error_msg_and_die("module %s: QM_REFS: %s", mn, strerror(errno)); error_msg_and_die("module %s: QM_REFS", mn);
} }
deps = xrealloc(deps, bufsize = count); deps = xrealloc(deps, bufsize = count);
} }
@ -153,7 +153,7 @@ extern int lsmod_main(int argc, char **argv)
close(fd); close(fd);
return 0; return 0;
} }
error_msg_and_die("/proc/modules: %s\n", strerror(errno)); perror_msg_and_die("/proc/modules");
return 1; return 1;
} }

8
modutils/lsmod.c
View File

@ -83,7 +83,7 @@ extern int lsmod_main(int argc, char **argv)
module_names = xmalloc(bufsize = 256); module_names = xmalloc(bufsize = 256);
deps = xmalloc(bufsize); deps = xmalloc(bufsize);
if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) { if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) {
error_msg_and_die("QM_MODULES: %s\n", strerror(errno)); perror_msg_and_die("QM_MODULES");
} }
printf("Module Size Used by\n"); printf("Module Size Used by\n");
@ -94,7 +94,7 @@ extern int lsmod_main(int argc, char **argv)
continue; continue;
} }
/* else choke */ /* else choke */
error_msg_and_die("module %s: QM_INFO: %s\n", mn, strerror(errno)); perror_msg_and_die("module %s: QM_INFO", mn);
} }
while (query_module(mn, QM_REFS, deps, bufsize, &count)) { while (query_module(mn, QM_REFS, deps, bufsize, &count)) {
if (errno == ENOENT) { if (errno == ENOENT) {
@ -102,7 +102,7 @@ extern int lsmod_main(int argc, char **argv)
continue; continue;
} }
if (errno != ENOSPC) { if (errno != ENOSPC) {
error_msg_and_die("module %s: QM_REFS: %s", mn, strerror(errno)); error_msg_and_die("module %s: QM_REFS", mn);
} }
deps = xrealloc(deps, bufsize = count); deps = xrealloc(deps, bufsize = count);
} }
@ -153,7 +153,7 @@ extern int lsmod_main(int argc, char **argv)
close(fd); close(fd);
return 0; return 0;
} }
error_msg_and_die("/proc/modules: %s\n", strerror(errno)); perror_msg_and_die("/proc/modules");
return 1; return 1;
} }

4
networking/wget.c
View File

@ -159,7 +159,7 @@ int wget_main(int argc, char **argv)
*/ */
if (do_continue) { if (do_continue) {
if (fstat(fileno(output), &sbuf) < 0) if (fstat(fileno(output), &sbuf) < 0)
error_msg_and_die("fstat()"); perror_msg_and_die("fstat()");
if (sbuf.st_size > 0) if (sbuf.st_size > 0)
beg_range = sbuf.st_size; beg_range = sbuf.st_size;
else else
@ -514,7 +514,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: wget.c,v 1.13 2000/12/09 16:55:35 andersen Exp $ * $Id: wget.c,v 1.14 2000/12/18 03:08:29 kraai Exp $
*/ */

4
touch.c
View File

@ -58,12 +58,12 @@ extern int touch_main(int argc, char **argv)
if (create == FALSE && errno == ENOENT) if (create == FALSE && errno == ENOENT)
return EXIT_SUCCESS; return EXIT_SUCCESS;
else { else {
error_msg_and_die("%s", strerror(errno)); perror_msg_and_die("%s", *argv);
} }
} }
close(fd); close(fd);
if (utime(*argv, NULL)) { if (utime(*argv, NULL)) {
error_msg_and_die("%s", strerror(errno)); perror_msg_and_die("%s", *argv);
} }
argc--; argc--;
argv++; argv++;

2
utility.c
View File

@ -1470,7 +1470,7 @@ extern char * xstrndup (const char *s, int n) {
char *t; char *t;
if (s == NULL) if (s == NULL)
error_msg_and_die("xstrndup bug"); error_msg_and_die("xstrndup bug\n");
t = xmalloc(n+1); t = xmalloc(n+1);
strncpy(t,s,n); strncpy(t,s,n);

4
wget.c
View File

@ -159,7 +159,7 @@ int wget_main(int argc, char **argv)
*/ */
if (do_continue) { if (do_continue) {
if (fstat(fileno(output), &sbuf) < 0) if (fstat(fileno(output), &sbuf) < 0)
error_msg_and_die("fstat()"); perror_msg_and_die("fstat()");
if (sbuf.st_size > 0) if (sbuf.st_size > 0)
beg_range = sbuf.st_size; beg_range = sbuf.st_size;
else else
@ -514,7 +514,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: wget.c,v 1.13 2000/12/09 16:55:35 andersen Exp $ * $Id: wget.c,v 1.14 2000/12/18 03:08:29 kraai Exp $
*/ */