94e3365b8
Denis Vlasenko
2007-12-22
Subject
perror_nomsg: don't print extra colon losetup: print name of loop device in error messages
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/verror_msg.c+4 -2
| @@ -45,8 +45,10 @@ void bb_verror_msg(const char *s, va_list p, const char* strerr) | |
| msg[applet_len - 2] = ':'; | |
| msg[applet_len - 1] = ' '; | |
| if (strerr) { | |
| - | msg[used++] = ':'; |
| - | msg[used++] = ' '; |
| + | if (s[0]) { /* not perror_nomsg? */ |
| + | msg[used++] = ':'; |
| + | msg[used++] = ' '; |
| + | } |
| strcpy(&msg[used], strerr); | |
| used += strerr_len; | |
| } | |
scripts/defconfig+1 -1
| @@ -305,7 +305,7 @@ CONFIG_ED=y | |
| CONFIG_PATCH=y | |
| CONFIG_SED=y | |
| CONFIG_VI=y | |
| - | CONFIG_FEATURE_VI_MAX_LEN=1024 |
| + | CONFIG_FEATURE_VI_MAX_LEN=4096 |
| CONFIG_FEATURE_VI_COLON=y | |
| CONFIG_FEATURE_VI_YANKMARK=y | |
| CONFIG_FEATURE_VI_SEARCH=y | |
util-linux/losetup.c+3 -3
| @@ -37,14 +37,14 @@ int losetup_main(int argc, char **argv) | |
| if (argc != 1) | |
| bb_show_usage(); | |
| if (del_loop(argv[0])) | |
| - | bb_perror_nomsg_and_die(); |
| + | bb_simple_perror_msg_and_die(argv[0]); |
| return EXIT_SUCCESS; | |
| } | |
| if (argc == 2) { | |
| /* -o or no option */ | |
| 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; | |
| } | |
| @@ -52,7 +52,7 @@ int losetup_main(int argc, char **argv) | |
| /* -o or no option */ | |
| s = query_loop(argv[0]); | |
| if (!s) | |
| - | bb_perror_nomsg_and_die(); |
| + | bb_simple_perror_msg_and_die(argv[0]); |
| printf("%s: %s\n", argv[0], s); | |
| if (ENABLE_FEATURE_CLEAN_UP) | |
| free(s); | |