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

perror_nomsg: don't print extra colon

Browse Source 
losetup: print name of loop device in error messages
This commit is contained in:
Denis Vlasenko 2007-12-22 15:44:23 +00:00
parent 88adfcd178
commit 94e3365b8f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libbb/verror_msg.c
View File

@ -45,8 +45,10 @@ void bb_verror_msg(const char *s, va_list p, const char* strerr)
msg[applet_len - 2] = ':'; msg[applet_len - 2] = ':';
msg[applet_len - 1] = ' '; msg[applet_len - 1] = ' ';
if (strerr) { if (strerr) {
msg[used++] = ':'; if (s[0]) { /* not perror_nomsg? */
msg[used++] = ' '; msg[used++] = ':';
msg[used++] = ' ';
}
strcpy(&msg[used], strerr); strcpy(&msg[used], strerr);
used += strerr_len; used += strerr_len;
} }

2
scripts/defconfig
View File

@ -305,7 +305,7 @@ CONFIG_ED=y
CONFIG_PATCH=y CONFIG_PATCH=y
CONFIG_SED=y CONFIG_SED=y
CONFIG_VI=y CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=1024 CONFIG_FEATURE_VI_MAX_LEN=4096
CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y CONFIG_FEATURE_VI_SEARCH=y

6
util-linux/losetup.c
View File

@ -37,14 +37,14 @@ int losetup_main(int argc, char **argv)
if (argc != 1) if (argc != 1)
bb_show_usage(); bb_show_usage();
if (del_loop(argv[0])) if (del_loop(argv[0]))
bb_perror_nomsg_and_die(); bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
if (argc == 2) { if (argc == 2) {
/* -o or no option */ /* -o or no option */
if (set_loop(&argv[0], argv[1], offset) < 0) if (set_loop(&argv[0], argv[1], offset) < 0)
bb_perror_nomsg_and_die(); bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
@ -52,7 +52,7 @@ int losetup_main(int argc, char **argv)
/* -o or no option */ /* -o or no option */
s = query_loop(argv[0]); s = query_loop(argv[0]);
if (!s) if (!s)
bb_perror_nomsg_and_die(); bb_simple_perror_msg_and_die(argv[0]);
printf("%s: %s\n", argv[0], s); printf("%s: %s\n", argv[0], s);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(s); free(s);