Merge branch 'busybox' into merge

2 files changed, 13 insertions, 6 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 3224788c0..0b573a065 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2661,7 +2661,8 @@ static var *evaluate(node *op, var *res)
                         var *vbeg, *v;
                         const char *sv_progname;
 
-                        if (!op->r.f->body.first)
+                        /* The body might be empty, still has to eval the args */
+                        if (!op->r.n->info)
                                 syntax_error(EMSG_UNDEF_FUNC);
 
                         vbeg = v = nvalloc(op->r.f->nargs + 1);
diff --git a/editors/vi.c b/editors/vi.c
index 1fc66b931..63b984ea6 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -478,6 +478,7 @@ static void flash(int);		// flash the terminal screen
 static void show_status_line(void);     // put a message on the bottom line
 static void status_line(const char *, ...);     // print to status buf
 static void status_line_bold(const char *, ...);
+static void status_line_bold_errno(const char *fn);
 static void not_implemented(const char *); // display "Not implemented" message
 static int format_edit_status(void);    // format file status on status line
 static void redraw(int);        // force a full screen refresh
@@ -1321,7 +1322,7 @@ static void colon(char *buf)
                 }
                 if (l < 0) {
                         if (l == -1)
-                                status_line_bold("'%s' %s", fn, strerror(errno));
+                                status_line_bold_errno(fn);
                 } else {
                         status_line("'%s' %dL, %dC", fn, li, l);
                         if (q == text && r == end - 1 && l == ch) {
@@ -2512,7 +2513,7 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
 
         /* Validate file */
         if (stat(fn, &statbuf) < 0) {
-                status_line_bold("'%s' %s", fn, strerror(errno));
+                status_line_bold_errno(fn);
                 goto fi0;
         }
         if (!S_ISREG(statbuf.st_mode)) {
@@ -2528,18 +2529,18 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
         // read file to buffer
         fd = open(fn, O_RDONLY);
         if (fd < 0) {
-                status_line_bold("'%s' %s", fn, strerror(errno));
+                status_line_bold_errno(fn);
                 goto fi0;
         }
         size = (statbuf.st_size < INT_MAX ? (int)statbuf.st_size : INT_MAX);
         p += text_hole_make(p, size);
         cnt = safe_read(fd, p, size);
         if (cnt < 0) {
-                status_line_bold("'%s' %s", fn, strerror(errno));
+                status_line_bold_errno(fn);
                 p = text_hole_delete(p, p + size - 1);  // un-do buffer insert
         } else if (cnt < size) {
                 // There was a partial read, shrink unused space text[]
-                p = text_hole_delete(p + cnt, p + (size - cnt) - 1);    // un-do buffer insert
+                p = text_hole_delete(p + cnt, p + size - 1);    // un-do buffer insert
                 status_line_bold("can't read '%s'", fn);
         }
         if (cnt >= size)
@@ -2726,6 +2727,11 @@ static void status_line_bold(const char *format, ...)
         have_status_msg = 1 + sizeof(ESC_BOLD_TEXT) + sizeof(ESC_NORM_TEXT) - 2;
 }
 
+static void status_line_bold_errno(const char *fn)
+{
+        status_line_bold("'%s' %s", fn, strerror(errno));
+}
+
 // format status buffer
 static void status_line(const char *format, ...)
 {