perror_nomsg: don't print extra colon

losetup: print name of loop device in error messages

diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index e510031342af62d9b67a6ed2c15088fe765f7a6a..dbd8323e43e132f5d179f55b170d809909d40be8 100644 (file)
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -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;
        }

diff --git a/scripts/defconfig b/scripts/defconfig
index 0550e43e408822a461d72d62758caddeacd82cae..3aacaac64ec83f135d09f9c681d58a0a017433ee 100644 (file)
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -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

diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index a9ecfd58b95ca556de737904469f284e187b61e0..d521b7b88c42443adf2f103496cf5e915fdb382b 100644 (file)
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -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);